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

8200458: (se) Readiness information previously recorded in the ready set not preserved

Browse source 
Reviewed-by: bpb, chegar
This commit is contained in:
Alan Bateman 2018-04-05 15:04:09 +01:00
parent d185d65b69
commit 97d7cfb14e
8 changed files with 193 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
View file

@ -98,7 +98,6 @@ class WindowsSelectorImpl extends SelectorImpl {
private static final class MapEntry {
final SelectionKeyImpl ski;
long updateCount = 0;
long clearedCount = 0;
MapEntry(SelectionKeyImpl ski) {
this.ski = ski;
}
@ -368,12 +367,10 @@ class WindowsSelectorImpl extends SelectorImpl {
}
/**
* Note, clearedCount is used to determine if the readyOps have
* been reset in this select operation. updateCount is used to
* tell if a key has been counted as updated in this select
* operation.
* updateCount is used to tell if a key has been counted as updated
* in this select operation.
*
* me.updateCount <= me.clearedCount <= updateCount
* me.updateCount <= updateCount
*/
private int processFDSet(long updateCount, int[] fds, int rOps,
boolean isExceptFds)
@ -405,37 +402,19 @@ class WindowsSelectorImpl extends SelectorImpl {
}
if (selectedKeys.contains(sk)) { // Key in selected set
if (me.clearedCount != updateCount) {
if (sk.translateAndSetReadyOps(rOps) &&
(me.updateCount != updateCount)) {
me.updateCount = updateCount;
numKeysUpdated++;
}
} else { // The readyOps have been set; now add
if (sk.translateAndUpdateReadyOps(rOps) &&
(me.updateCount != updateCount)) {
if (sk.translateAndUpdateReadyOps(rOps)) {
if (me.updateCount != updateCount) {
me.updateCount = updateCount;
numKeysUpdated++;
}
}
me.clearedCount = updateCount;
} else { // Key is not in selected set yet
if (me.clearedCount != updateCount) {
sk.translateAndSetReadyOps(rOps);
if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
selectedKeys.add(sk);
me.updateCount = updateCount;
numKeysUpdated++;
}
} else { // The readyOps have been set; now add
sk.translateAndUpdateReadyOps(rOps);
if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
selectedKeys.add(sk);
me.updateCount = updateCount;
numKeysUpdated++;
}
sk.translateAndSetReadyOps(rOps);
if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0) {
selectedKeys.add(sk);
me.updateCount = updateCount;
numKeysUpdated++;
}
me.clearedCount = updateCount;
}
}
return numKeysUpdated;