< prev index next >
src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
Print this page
rev 49242 : [mq]: selector-cleanup
*** 1,7 ****
/*
! * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
--- 1,7 ----
/*
! * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
*** 24,66 ****
*/
/*
* KQueueSelectorImpl.java
* Implementation of Selector using FreeBSD / Mac OS X kqueues
- * Derived from Sun's DevPollSelectorImpl
*/
package sun.nio.ch;
import java.io.IOException;
! import java.io.FileDescriptor;
! import java.nio.channels.*;
! import java.nio.channels.spi.*;
! import java.util.*;
class KQueueSelectorImpl
extends SelectorImpl
{
// File descriptors used for interrupt
! protected int fd0;
! protected int fd1;
// The kqueue manipulator
! KQueueArrayWrapper kqueueWrapper;
!
! // Count of registered descriptors (including interrupt)
! private int totalChannels;
// Map from a file descriptor to an entry containing the selection key
! private HashMap<Integer,MapEntry> fdMap;
// True if this Selector has been closed
! private boolean closed = false;
// Lock for interrupt triggering and clearing
! private Object interruptLock = new Object();
! private boolean interruptTriggered = false;
// used by updateSelectedKeys to handle cases where the same file
// descriptor is polled by more than one filter
private long updateCount;
--- 24,65 ----
*/
/*
* KQueueSelectorImpl.java
* Implementation of Selector using FreeBSD / Mac OS X kqueues
*/
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.HashMap;
! import java.util.Iterator;
class KQueueSelectorImpl
extends SelectorImpl
{
// File descriptors used for interrupt
! private final int fd0;
! private final int fd1;
// The kqueue manipulator
! private final KQueueArrayWrapper kqueueWrapper;
// Map from a file descriptor to an entry containing the selection key
! private final HashMap<Integer, MapEntry> fdMap;
// True if this Selector has been closed
! private boolean closed;
// Lock for interrupt triggering and clearing
! private final Object interruptLock = new Object();
! private boolean interruptTriggered;
// used by updateSelectedKeys to handle cases where the same file
// descriptor is polled by more than one filter
private long updateCount;
*** 76,95 ****
/**
* Package private constructor called by factory method in
* the abstract superclass Selector.
*/
! KQueueSelectorImpl(SelectorProvider sp) {
super(sp);
long fds = IOUtil.makePipe(false);
fd0 = (int)(fds >>> 32);
fd1 = (int)fds;
try {
! kqueueWrapper = new KQueueArrayWrapper();
! kqueueWrapper.initInterrupt(fd0, fd1);
fdMap = new HashMap<>();
- totalChannels = 1;
} catch (Throwable t) {
try {
FileDispatcherImpl.closeIntFD(fd0);
} catch (IOException ioe0) {
t.addSuppressed(ioe0);
--- 75,92 ----
/**
* Package private constructor called by factory method in
* the abstract superclass Selector.
*/
! KQueueSelectorImpl(SelectorProvider sp) throws IOException {
super(sp);
long fds = IOUtil.makePipe(false);
fd0 = (int)(fds >>> 32);
fd1 = (int)fds;
try {
! kqueueWrapper = new KQueueArrayWrapper(fd0, fd1);
fdMap = new HashMap<>();
} catch (Throwable t) {
try {
FileDispatcherImpl.closeIntFD(fd0);
} catch (IOException ioe0) {
t.addSuppressed(ioe0);
*** 101,134 ****
}
throw t;
}
}
protected int doSelect(long timeout)
throws IOException
{
! int entries = 0;
! if (closed)
! throw new ClosedSelectorException();
processDeregisterQueue();
try {
begin();
! entries = kqueueWrapper.poll(timeout);
} finally {
end();
}
processDeregisterQueue();
! return updateSelectedKeys(entries);
}
/**
* Update the keys whose fd's have been selected by kqueue.
* Add the ready keys to the selected key set.
* If the interrupt fd has been selected, drain it and clear the interrupt.
*/
! private int updateSelectedKeys(int entries)
throws IOException
{
int numKeysUpdated = 0;
boolean interrupted = false;
--- 98,135 ----
}
throw t;
}
}
+ private void ensureOpen() {
+ if (closed)
+ throw new ClosedSelectorException();
+ }
+ @Override
protected int doSelect(long timeout)
throws IOException
{
! ensureOpen();
! int numEntries;
processDeregisterQueue();
try {
begin();
! numEntries = kqueueWrapper.poll(timeout);
} finally {
end();
}
processDeregisterQueue();
! return updateSelectedKeys(numEntries);
}
/**
* Update the keys whose fd's have been selected by kqueue.
* Add the ready keys to the selected key set.
* If the interrupt fd has been selected, drain it and clear the interrupt.
*/
! private int updateSelectedKeys(int numEntries)
throws IOException
{
int numKeysUpdated = 0;
boolean interrupted = false;
*** 137,154 ****
// count in the MapEntry tracks when the fd was last updated and this
// ensures that the ready ops are updated rather than replaced by a
// second or subsequent event.
updateCount++;
! for (int i = 0; i < entries; i++) {
int nextFD = kqueueWrapper.getDescriptor(i);
if (nextFD == fd0) {
interrupted = true;
} else {
MapEntry me = fdMap.get(Integer.valueOf(nextFD));
-
- // entry is null in the case of an interrupt
if (me != null) {
int rOps = kqueueWrapper.getReventOps(i);
SelectionKeyImpl ski = me.ski;
if (selectedKeys.contains(ski)) {
// first time this file descriptor has been encountered on this
--- 138,153 ----
// count in the MapEntry tracks when the fd was last updated and this
// ensures that the ready ops are updated rather than replaced by a
// second or subsequent event.
updateCount++;
! for (int i = 0; i < numEntries; i++) {
int nextFD = kqueueWrapper.getDescriptor(i);
if (nextFD == fd0) {
interrupted = true;
} else {
MapEntry me = fdMap.get(Integer.valueOf(nextFD));
if (me != null) {
int rOps = kqueueWrapper.getReventOps(i);
SelectionKeyImpl ski = me.ski;
if (selectedKeys.contains(ski)) {
// first time this file descriptor has been encountered on this
*** 173,207 ****
}
}
}
if (interrupted) {
! // Clear the wakeup pipe
! synchronized (interruptLock) {
! IOUtil.drain(fd0);
! interruptTriggered = false;
! }
}
return numKeysUpdated;
}
!
protected void implClose() throws IOException {
if (!closed) {
closed = true;
// prevent further wakeup
synchronized (interruptLock) {
interruptTriggered = true;
}
FileDispatcherImpl.closeIntFD(fd0);
FileDispatcherImpl.closeIntFD(fd1);
- if (kqueueWrapper != null) {
- kqueueWrapper.close();
- kqueueWrapper = null;
- selectedKeys = null;
// Deregister channels
Iterator<SelectionKey> i = keys.iterator();
while (i.hasNext()) {
SelectionKeyImpl ski = (SelectionKeyImpl)i.next();
--- 172,199 ----
}
}
}
if (interrupted) {
! clearInterrupt();
}
return numKeysUpdated;
}
! @Override
protected void implClose() throws IOException {
if (!closed) {
closed = true;
// prevent further wakeup
synchronized (interruptLock) {
interruptTriggered = true;
}
+ kqueueWrapper.close();
FileDispatcherImpl.closeIntFD(fd0);
FileDispatcherImpl.closeIntFD(fd1);
// Deregister channels
Iterator<SelectionKey> i = keys.iterator();
while (i.hasNext()) {
SelectionKeyImpl ski = (SelectionKeyImpl)i.next();
*** 209,262 ****
SelectableChannel selch = ski.channel();
if (!selch.isOpen() && !selch.isRegistered())
((SelChImpl)selch).kill();
i.remove();
}
- totalChannels = 0;
- }
- fd0 = -1;
- fd1 = -1;
}
}
!
protected void implRegister(SelectionKeyImpl ski) {
! if (closed)
! throw new ClosedSelectorException();
int fd = IOUtil.fdVal(ski.channel.getFD());
fdMap.put(Integer.valueOf(fd), new MapEntry(ski));
- totalChannels++;
keys.add(ski);
}
!
protected void implDereg(SelectionKeyImpl ski) throws IOException {
int fd = ski.channel.getFDVal();
fdMap.remove(Integer.valueOf(fd));
kqueueWrapper.release(ski.channel);
- totalChannels--;
keys.remove(ski);
selectedKeys.remove(ski);
! deregister((AbstractSelectionKey)ski);
SelectableChannel selch = ski.channel();
if (!selch.isOpen() && !selch.isRegistered())
((SelChImpl)selch).kill();
}
!
public void putEventOps(SelectionKeyImpl ski, int ops) {
! if (closed)
! throw new ClosedSelectorException();
kqueueWrapper.setInterest(ski.channel, ops);
}
!
public Selector wakeup() {
synchronized (interruptLock) {
if (!interruptTriggered) {
kqueueWrapper.interrupt();
interruptTriggered = true;
}
}
return this;
}
}
--- 201,253 ----
SelectableChannel selch = ski.channel();
if (!selch.isOpen() && !selch.isRegistered())
((SelChImpl)selch).kill();
i.remove();
}
}
}
! @Override
protected void implRegister(SelectionKeyImpl ski) {
! ensureOpen();
int fd = IOUtil.fdVal(ski.channel.getFD());
fdMap.put(Integer.valueOf(fd), new MapEntry(ski));
keys.add(ski);
}
! @Override
protected void implDereg(SelectionKeyImpl ski) throws IOException {
int fd = ski.channel.getFDVal();
fdMap.remove(Integer.valueOf(fd));
kqueueWrapper.release(ski.channel);
keys.remove(ski);
selectedKeys.remove(ski);
! deregister(ski);
SelectableChannel selch = ski.channel();
if (!selch.isOpen() && !selch.isRegistered())
((SelChImpl)selch).kill();
}
! @Override
public void putEventOps(SelectionKeyImpl ski, int ops) {
! ensureOpen();
kqueueWrapper.setInterest(ski.channel, ops);
}
! @Override
public Selector wakeup() {
synchronized (interruptLock) {
if (!interruptTriggered) {
kqueueWrapper.interrupt();
interruptTriggered = true;
}
}
return this;
}
+
+ private void clearInterrupt() throws IOException {
+ synchronized (interruptLock) {
+ IOUtil.drain(fd0);
+ interruptTriggered = false;
+ }
+ }
}
< prev index next >