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

7191587: (se) SelectionKey.interestOps does not defer changing the interest set to the next select [macosx]

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Jason T Greene 2012-08-23 13:07:08 +01:00 committed by Alan Bateman
parent cd118009c8
commit 3800b44b13
2 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java
View File

@ -34,7 +34,8 @@ package sun.nio.ch;
import sun.misc.*;
import java.io.IOException;
import java.io.FileDescriptor;
import java.util.Iterator;
import java.util.LinkedList;
/*
* struct kevent { // 32-bit 64-bit
@ -100,6 +101,18 @@ class KQueueArrayWrapper {
kq = init();
}
// Used to update file description registrations
private static class Update {
SelChImpl channel;
int events;
Update(SelChImpl channel, int events) {
this.channel = channel;
this.events = events;
}
}
private LinkedList<Update> updateList = new LinkedList<Update>();
void initInterrupt(int fd0, int fd1) {
outgoingInterruptFD = fd1;
incomingInterruptFD = fd0;
@ -137,14 +150,41 @@ class KQueueArrayWrapper {
}
}
void setInterest(int fd, int events) {
register0(kq, fd, events & POLLIN, events & POLLOUT);
void setInterest(SelChImpl channel, int events) {
synchronized (updateList) {
// update existing registration
updateList.add(new Update(channel, events));
}
}
void release(int fd) {
register0(kq, fd, 0, 0);
void release(SelChImpl channel) {
synchronized (updateList) {
// flush any pending updates
for (Iterator<Update> it = updateList.iterator(); it.hasNext();) {
if (it.next().channel == channel) {
it.remove();
}
}
// remove
register0(kq, channel.getFDVal(), 0, 0);
}
}
void updateRegistrations() {
synchronized (updateList) {
Update u = null;
while ((u = updateList.poll()) != null) {
SelChImpl ch = u.channel;
if (!ch.isOpen())
continue;
register0(kq, ch.getFDVal(), u.events & POLLIN, u.events & POLLOUT);
}
}
}
void close() throws IOException {
if (keventArray != null) {
keventArray.free();
@ -157,6 +197,7 @@ class KQueueArrayWrapper {
}
int poll(long timeout) {
updateRegistrations();
int updated = kevent0(kq, keventArrayAddress, NUM_KEVENTS, timeout);
return updated;
}
@ -173,4 +214,3 @@ class KQueueArrayWrapper {
long timeout);
private static native void interrupt(int fd);
}

7
jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
View File

@ -184,7 +184,6 @@ class KQueueSelectorImpl
FileDispatcherImpl.closeIntFD(fd0);
FileDispatcherImpl.closeIntFD(fd1);
if (kqueueWrapper != null) {
kqueueWrapper.release(fd0);
kqueueWrapper.close();
kqueueWrapper = null;
selectedKeys = null;
@ -220,7 +219,7 @@ class KQueueSelectorImpl
protected void implDereg(SelectionKeyImpl ski) throws IOException {
int fd = ski.channel.getFDVal();
fdMap.remove(Integer.valueOf(fd));
kqueueWrapper.release(fd);
kqueueWrapper.release(ski.channel);
totalChannels--;
keys.remove(ski);
selectedKeys.remove(ski);
@ -234,8 +233,7 @@ class KQueueSelectorImpl
public void putEventOps(SelectionKeyImpl ski, int ops) {
if (closed)
throw new ClosedSelectorException();
int fd = IOUtil.fdVal(ski.channel.getFD());
kqueueWrapper.setInterest(fd, ops);
kqueueWrapper.setInterest(ski.channel, ops);
}
@ -254,4 +252,3 @@ class KQueueSelectorImpl
Util.load();
}
}