jdk-sandbox: comparison src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java

equal deleted inserted replaced

-:f1a8ec1a6972
+:814bd31f8da0
 package sun.nio.ch;
 import java.io.IOException;
 import java.nio.channels.ClosedSelectorException;
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.spi.SelectorProvider;
 import java.util.ArrayDeque;
-import java.util.BitSet;
 import java.util.Deque;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import static sun.nio.ch.EPoll.EPOLLIN;
 import static sun.nio.ch.EPoll.EPOLL_CTL_ADD;
 private final int fd1;
 // maps file descriptor to selection key, synchronize on selector
 private final Map<Integer, SelectionKeyImpl> fdToKey = new HashMap<>();
-// file descriptors registered with epoll, synchronize on selector
+// pending new registrations/updates, queued by implRegister and putEventOpos
-private final BitSet registered = new BitSet();
-// pending new registrations/updates, queued by implRegister and putEventOps
 private final Object updateLock = new Object();
 private final Deque<SelectionKeyImpl> newKeys = new ArrayDeque<>();
 private final Deque<SelectionKeyImpl> updateKeys = new ArrayDeque<>();
-private final Deque<Integer> updateOps = new ArrayDeque<>();
+private final Deque<Integer> updateEvents = new ArrayDeque<>();
 // interrupt triggering and clearing
 private final Object interruptLock = new Object();
 private boolean interruptTriggered;
 @Override
 protected int doSelect(long timeout) throws IOException {
 assert Thread.holdsLock(this);
+// epoll_wait timeout is int
+int to = (int) Math.min(timeout, Integer.MAX_VALUE);
+boolean blocking = (to != 0);
+boolean timedPoll = (to > 0);
 int numEntries;
 processUpdateQueue();
 processDeregisterQueue();
 try {
-begin();
+begin(blocking);
-// epoll_wait timeout is int
-int to = (int) Math.min(timeout, Integer.MAX_VALUE);
-boolean timedPoll = (to > 0);
 do {
 long startTime = timedPoll ? System.nanoTime() : 0;
 numEntries = EPoll.wait(epfd, pollArrayAddress, NUM_EPOLLEVENTS, to);
 if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
 // timed poll interrupted so need to adjust timeout
 }
 } while (numEntries == IOStatus.INTERRUPTED);
 assert IOStatus.check(numEntries);
 } finally {
-end();
+end(blocking);
 }
 processDeregisterQueue();
 return updateSelectedKeys(numEntries);
 }
 SelectionKeyImpl ski;
 // new registrations
 while ((ski = newKeys.pollFirst()) != null) {
 if (ski.isValid()) {
-SelChImpl ch = ski.channel;
+int fd = ski.channel.getFDVal();
-int fd = ch.getFDVal();
 SelectionKeyImpl previous = fdToKey.put(fd, ski);
 assert previous == null;
-assert registered.get(fd) == false;
+assert ski.registeredEvents() == 0;
 }
 }
 // changes to interest ops
-assert updateKeys.size() == updateOps.size();
+assert updateKeys.size() == updateEvents.size();
 while ((ski = updateKeys.pollFirst()) != null) {
-int ops = updateOps.pollFirst();
+int newEvents = updateEvents.pollFirst();
 int fd = ski.channel.getFDVal();
 if (ski.isValid() && fdToKey.containsKey(fd)) {
-if (registered.get(fd)) {
+int registeredEvents = ski.registeredEvents();
-if (ops == 0) {
+if (newEvents != registeredEvents) {
+if (newEvents == 0) {
 // remove from epoll
 EPoll.ctl(epfd, EPOLL_CTL_DEL, fd, 0);
-registered.clear(fd);
 } else {
-// modify events
+if (registeredEvents == 0) {
-EPoll.ctl(epfd, EPOLL_CTL_MOD, fd, ops);
+// add to epoll
+EPoll.ctl(epfd, EPOLL_CTL_ADD, fd, newEvents);
+} else {
+// modify events
+EPoll.ctl(epfd, EPOLL_CTL_MOD, fd, newEvents);
+}
 }
-} else if (ops != 0) {
+ski.registeredEvents(newEvents);
-// add to epoll
-EPoll.ctl(epfd, EPOLL_CTL_ADD, fd, ops);
-registered.set(fd);
 }
 }
 }
 }
 }
 /**
-* Update the keys whose fd's have been selected by the epoll.
+* Update the keys of file descriptors that were polled and add them to
-* Add the ready keys to the ready queue.
+* the selected-key set.
+* If the interrupt fd has been selected, drain it and clear the interrupt.
 */
 private int updateSelectedKeys(int numEntries) throws IOException {
 assert Thread.holdsLock(this);
 assert Thread.holdsLock(nioSelectedKeys());
 }
 @Override
 protected void implClose() throws IOException {
 assert Thread.holdsLock(this);
-assert Thread.holdsLock(nioKeys());
 // prevent further wakeup
 synchronized (interruptLock) {
 interruptTriggered = true;
 }
 FileDispatcherImpl.closeIntFD(epfd);
 EPoll.freePollArray(pollArrayAddress);
 FileDispatcherImpl.closeIntFD(fd0);
 FileDispatcherImpl.closeIntFD(fd1);
-// Deregister channels
-Iterator<SelectionKey> i = keys.iterator();
-while (i.hasNext()) {
-SelectionKeyImpl ski = (SelectionKeyImpl)i.next();
-deregister(ski);
-SelectableChannel selch = ski.channel();
-if (!selch.isOpen() && !selch.isRegistered())
-((SelChImpl)selch).kill();
-i.remove();
-}
 }
 @Override
 protected void implRegister(SelectionKeyImpl ski) {
-assert Thread.holdsLock(nioKeys());
 ensureOpen();
 synchronized (updateLock) {
 newKeys.addLast(ski);
 }
-keys.add(ski);
 }
 @Override
 protected void implDereg(SelectionKeyImpl ski) throws IOException {
 assert !ski.isValid();
 assert Thread.holdsLock(this);
-assert Thread.holdsLock(nioKeys());
-assert Thread.holdsLock(nioSelectedKeys());
 int fd = ski.channel.getFDVal();
-fdToKey.remove(fd);
+if (fdToKey.remove(fd) != null) {
-if (registered.get(fd)) {
+if (ski.registeredEvents() != 0) {
 EPoll.ctl(epfd, EPOLL_CTL_DEL, fd, 0);
-registered.clear(fd);
+ski.registeredEvents(0);
 }
+} else {
-selectedKeys.remove(ski);
+assert ski.registeredEvents() == 0;
-keys.remove(ski);
+}
+}
-// remove from channel's key set
-deregister(ski);
+@Override
+public void putEventOps(SelectionKeyImpl ski, int events) {
-SelectableChannel selch = ski.channel();
-if (!selch.isOpen() && !selch.isRegistered())
-((SelChImpl) selch).kill();
-}
-@Override
-public void putEventOps(SelectionKeyImpl ski, int ops) {
 ensureOpen();
 synchronized (updateLock) {
-updateOps.addLast(ops);   // ops first in case adding the key fails
+updateEvents.addLast(events);  // events first in case adding key fails
 updateKeys.addLast(ski);
 }
 }
 @Override

changeset 49493	814bd31f8da0
parent 49290	07779973cbe2
child 49526	cad4c844902a