stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8187947: A race condition in SubmissionPublisher

Browse Source 
Reviewed-by: martin, psandoz
This commit is contained in:
Doug Lea 2017-12-02 10:08:55 -08:00
parent eac77274e8
commit 850b92fa04
2 changed files with 614 additions and 681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1263
src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
View File

File diff suppressed because it is too large Load Diff

32
test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java
View File

@ -33,6 +33,7 @@
*/
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.Flow;
@ -429,7 +430,8 @@ public class SubmissionPublisherTest extends JSR166TestCase {
* Cancelling a subscription eventually causes no more onNexts to be issued
*/
public void testCancel() {
SubmissionPublisher<Integer> p = basicPublisher();
SubmissionPublisher<Integer> p =
new SubmissionPublisher<Integer>(basicExecutor, 4); // must be < 20
TestSubscriber s1 = new TestSubscriber();
TestSubscriber s2 = new TestSubscriber();
p.subscribe(s1);
@ -666,7 +668,6 @@ public class SubmissionPublisherTest extends JSR166TestCase {
p.subscribe(s1);
p.subscribe(s2);
for (int i = 1; i <= 20; ++i) {
assertTrue(p.estimateMinimumDemand() <= 1);
assertTrue(p.submit(i) >= 0);
}
p.close();
@ -1005,4 +1006,31 @@ public class SubmissionPublisherTest extends JSR166TestCase {
assertTrue(count.get() < n);
}
/**
* Tests scenario for
* JDK-8187947: A race condition in SubmissionPublisher
* cvs update -D '2017-11-25' src/main/java/util/concurrent/SubmissionPublisher.java && ant -Djsr166.expensiveTests=true -Djsr166.tckTestClass=SubmissionPublisherTest -Djsr166.methodFilter=testMissedSignal tck; cvs update -A src/main/java/util/concurrent/SubmissionPublisher.java
*/
public void testMissedSignal_8187947() throws Exception {
final int N = expensiveTests ? (1 << 20) : (1 << 10);
final CountDownLatch finished = new CountDownLatch(1);
final SubmissionPublisher<Boolean> pub = new SubmissionPublisher<>();
class Sub implements Subscriber<Boolean> {
int received;
public void onSubscribe(Subscription s) {
s.request(N);
}
public void onNext(Boolean item) {
if (++received == N)
finished.countDown();
else
CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE));
}
public void onError(Throwable t) { throw new AssertionError(t); }
public void onComplete() {}
}
pub.subscribe(new Sub());
CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE));
await(finished);
}
}