Commit 4b4d971
committed
Update shaded JCTools queue due to live-lock (fixes #127)
In #127, a live-lock occurs in the write buffer due to a race when the
consumer tries to transition to the last buffer. This is a shaded copy
of JCTools' MpscGrowableLinkedArrayQueue and fixed in 2.0 (see
JCTools/JCTools#135). This is a difficult to
reproduce bug, except for the reporter due to having thousands of
instances on a loaded system.
The shaded copy is more verbose than the previous one, but that is to
minimize the divergency and introducing bugs by cutting too deep.
Updating to Guava 20 required minor changes due to that cache now
supporting write-through entries. The adapter now mirrors the new
behavior.
Thanks to everyones patience and help in fixing the bug.1 parent 260ec05 commit 4b4d971
File tree
16 files changed
+1067
-423
lines changed- caffeine
- src
- javaPoet/java/com/github/benmanes/caffeine/cache
- main/java/com/github/benmanes/caffeine
- base
- cache
- test/java/com/github/benmanes/caffeine/cache
- config/findbugs
- gradle
- wrapper
- guava
- src
- main/java/com/github/benmanes/caffeine/guava
- test/java/com
- github/benmanes/caffeine/cache
- google/common/cache
16 files changed
+1067
-423
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | 44 | | |
46 | 45 | | |
47 | 46 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
102 | | - | |
| 102 | + | |
| 103 | + | |
103 | 104 | | |
104 | 105 | | |
105 | 106 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
235 | 235 | | |
236 | 236 | | |
237 | 237 | | |
238 | | - | |
| 238 | + | |
239 | 239 | | |
240 | 240 | | |
241 | 241 | | |
| |||
634 | 634 | | |
635 | 635 | | |
636 | 636 | | |
| 637 | + | |
637 | 638 | | |
638 | 639 | | |
639 | 640 | | |
| |||
0 commit comments