archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8200256: java/nio/channels/AsynchronousChannelGroup/Basic.java fails intermittently

Browse source 
Reviewed-by: chegar
This commit is contained in:
Alan Bateman 2018-03-27 19:29:46 +01:00
parent debaf13f38
commit 704b2ccd93
8 changed files with 57 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/java.base/linux/classes/sun/nio/ch/EPollPort.java
View file

@ -164,7 +164,7 @@ final class EPollPort
if (nThreads == 0) {
implClose();
} else {
// send interrupt to each thread
// send wakeup to each thread
while (nThreads-- > 0) {
wakeup();
}
@ -182,11 +182,11 @@ final class EPollPort
throw new AssertionError(); // should not happen
}
/*
/**
* Task to process events from epoll and dispatch to the channel's
* onEvent handler.
*
* Events are retreived from epoll in batch and offered to a BlockingQueue
* Events are retrieved from epoll in batch and offered to a BlockingQueue
* where they are consumed by handler threads. A special "NEED_TO_POLL"
* event is used to signal one consumer to re-poll when all events have
* been consumed.
@ -200,7 +200,7 @@ final class EPollPort
n = EPoll.wait(epfd, address, MAX_EPOLL_EVENTS, -1);
} while (n == IOStatus.INTERRUPTED);
/*
/**
* 'n' events have been read. Here we map them to their
* corresponding channel in batch and queue n-1 so that
* they can be handled by other handler threads. The last
@ -215,8 +215,13 @@ final class EPollPort
// wakeup
if (fd == sp[0]) {
if (wakeupCount.decrementAndGet() == 0) {
// no more wakeups so drain pipe
IOUtil.drain(sp[0]);
// consume one wakeup byte, never more as this
// would interfere with shutdown when there is
// a wakeup byte queued to wake each thread
int nread;
do {
nread = IOUtil.drain1(sp[0]);
} while (nread == IOStatus.INTERRUPTED);
}
// queue special event if there are more events