src/java.base/share/classes/sun/nio/ch/SelectorImpl.java

rev 49242 : [mq]: selector-cleanup

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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

@@ -28,11 +28,10 @@
 import java.io.IOException;
 import java.net.SocketException;
 import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.IllegalSelectorException;
 import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
 import java.nio.channels.spi.AbstractSelectableChannel;
 import java.nio.channels.spi.AbstractSelector;
 import java.nio.channels.spi.SelectorProvider;
 import java.util.Collections;
 import java.util.HashSet;

@@ -45,36 +44,37 @@
  */
 
 public abstract class SelectorImpl
     extends AbstractSelector
 {
+    // The set of keys registered with this Selector
+    protected final HashSet<SelectionKey> keys;
 
     // The set of keys with data ready for an operation
-    protected Set<SelectionKey> selectedKeys;
-
-    // The set of keys registered with this Selector
-    protected HashSet<SelectionKey> keys;
+    protected final Set<SelectionKey> selectedKeys;
 
     // Public views of the key sets
-    private Set<SelectionKey> publicKeys;             // Immutable
-    private Set<SelectionKey> publicSelectedKeys;     // Removal allowed, but not addition
+    private final Set<SelectionKey> publicKeys;             // Immutable
+    private final Set<SelectionKey> publicSelectedKeys;     // Removal allowed, but not addition
 
     protected SelectorImpl(SelectorProvider sp) {
         super(sp);
         keys = new HashSet<>();
         selectedKeys = new HashSet<>();
         publicKeys = Collections.unmodifiableSet(keys);
         publicSelectedKeys = Util.ungrowableSet(selectedKeys);
     }
 
-    public Set<SelectionKey> keys() {
+    @Override
+    public final Set<SelectionKey> keys() {
         if (!isOpen())
             throw new ClosedSelectorException();
         return publicKeys;
     }
 
-    public Set<SelectionKey> selectedKeys() {
+    @Override
+    public final Set<SelectionKey> selectedKeys() {
         if (!isOpen())
             throw new ClosedSelectorException();
         return publicSelectedKeys;
     }
 

@@ -90,27 +90,31 @@
                 }
             }
         }
     }
 
-    public int select(long timeout)
+    @Override
+    public final int select(long timeout)
         throws IOException
     {
         if (timeout < 0)
             throw new IllegalArgumentException("Negative timeout");
         return lockAndDoSelect((timeout == 0) ? -1 : timeout);
     }
 
-    public int select() throws IOException {
+    @Override
+    public final int select() throws IOException {
         return select(0);
     }
 
-    public int selectNow() throws IOException {
+    @Override
+    public final int selectNow() throws IOException {
         return lockAndDoSelect(0);
     }
 
-    public void implCloseSelector() throws IOException {
+    @Override
+    public final void implCloseSelector() throws IOException {
         wakeup();
         synchronized (this) {
             synchronized (publicKeys) {
                 synchronized (publicSelectedKeys) {
                     implClose();

@@ -119,12 +123,13 @@
         }
     }
 
     protected abstract void implClose() throws IOException;
 
-    public void putEventOps(SelectionKeyImpl sk, int ops) { }
+    public abstract void putEventOps(SelectionKeyImpl sk, int ops);
 
+    @Override
     protected final SelectionKey register(AbstractSelectableChannel ch,
                                           int ops,
                                           Object attachment)
     {
         if (!(ch instanceof SelChImpl))

@@ -138,11 +143,13 @@
         return k;
     }
 
     protected abstract void implRegister(SelectionKeyImpl ski);
 
-    void processDeregisterQueue() throws IOException {
+    protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
+
+    protected final void processDeregisterQueue() throws IOException {
         // Precondition: Synchronized on this, keys, and selectedKeys
         Set<SelectionKey> cks = cancelledKeys();
         synchronized (cks) {
             if (!cks.isEmpty()) {
                 Iterator<SelectionKey> i = cks.iterator();

@@ -157,11 +164,6 @@
                     }
                 }
             }
         }
     }
-
-    protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
-
-    public abstract Selector wakeup();
-
 }