jdk-sandbox: comparison src/java.base/share/classes/java/nio/channels/Selector.java

equal deleted inserted replaced

-:466d4df248a6
+:8ac08fa69f00
 /*
-* Copyright (c) 2000, 2013, 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
 *
 * <a id="sks"></a><p> Keys are added to the selected-key set by selection
 * operations.  A key may be removed directly from the selected-key set by
 * invoking the set's {@link java.util.Set#remove(java.lang.Object) remove}
 * method or by invoking the {@link java.util.Iterator#remove() remove} method
-* of an {@link java.util.Iterator iterator} obtained from the
+* of an {@link java.util.Iterator iterator} obtained from the set.
-* set.  Keys are never removed from the selected-key set in any other way;
+* All keys may be removed from the selected-key set by invoking the set's
-* they are not, in particular, removed as a side effect of selection
+* {@link java.util.Set#clear() clear} method.  Keys may not be added directly
-* operations.  Keys may not be added directly to the selected-key set. </p>
+* to the selected-key set. </p>
-*
 *
 * <a id="selop"></a>
 * <h2>Selection</h2>
 *
 * <p> During each selection operation, keys may be added to and removed from a
 * difference between the three selection methods. </p>
 *
 *
 * <h2>Concurrency</h2>
 *
-* <p> Selectors are themselves safe for use by multiple concurrent threads;
+* <p> A Selector and its key set are safe for use by multiple concurrent
-* their key sets, however, are not.
+* threads.  Its selected-key set and cancelled-key set, however, are not.
 *
-* <p> The selection operations synchronize on the selector itself, on the key
+* <p> The selection operations synchronize on the selector itself, on the
-* set, and on the selected-key set, in that order.  They also synchronize on
+* selected-key set, in that order.  They also synchronize on the cancelled-key
-* the cancelled-key set during steps (1) and (3) above.
+* set during steps (1) and (3) above.
 *
 * <p> Changes made to the interest sets of a selector's keys while a
 * selection operation is in progress have no effect upon that operation; they
 * will be seen by the next selection operation.
 *
 *   interrupt status will be set and the selector's {@link #wakeup wakeup}
 *   method will be invoked. </p></li>
 *
 * </ul>
 *
-* <p> The {@link #close close} method synchronizes on the selector and all
+* <p> The {@link #close close} method synchronizes on the selector and its
-* three key sets in the same order as in a selection operation.
+* selected-key set in the same order as in a selection operation.
 *
 * <a id="ksc"></a>
-*
+* <p> A Selector's key set is safe for use by multiple concurrent threads.
-* <p> A selector's key and selected-key sets are not, in general, safe for use
+* Retrieval operations from the key set do not generally block and so may
-* by multiple concurrent threads.  If such a thread might modify one of these
+* overlap with new registrations that add to the set, or with the cancellation
-* sets directly then access should be controlled by synchronizing on the set
+* steps of selection operations that remove keys from the set.  Iterators and
-* itself.  The iterators returned by these sets' {@link
+* spliterators return elements reflecting the state of the set at some point at
-* java.util.Set#iterator() iterator} methods are <i>fail-fast:</i> If the set
+* or since the creation of the iterator/spliterator.  They do not throw
-* is modified after the iterator is created, in any way except by invoking the
+* {@link java.util.ConcurrentModificationException ConcurrentModificationException}.
-* iterator's own {@link java.util.Iterator#remove() remove} method, then a
+*
-* {@link java.util.ConcurrentModificationException} will be thrown. </p>
+* <a id="sksc"></a>
-*
+* <p> A selector's selected-key set is not, in general, safe for use by
+* multiple concurrent threads.  If such a thread might modify the set directly
+* then access should be controlled by synchronizing on the set itself.  The
+* iterators returned by the set's {@link java.util.Set#iterator() iterator}
+* methods are <i>fail-fast:</i> If the set is modified after the iterator is
+* created, in any way except by invoking the iterator's own {@link
+* java.util.Iterator#remove() remove} method, then a {@link
+* java.util.ConcurrentModificationException} will be thrown. </p>
 *
 * @author Mark Reinhold
 * @author JSR-51 Expert Group
 * @since 1.4
 *
 * <p> The key set is not directly modifiable.  A key is removed only after
 * it has been cancelled and its channel has been deregistered.  Any
 * attempt to modify the key set will cause an {@link
 * UnsupportedOperationException} to be thrown.
 *
-* <p> The key set is <a href="#ksc">not thread-safe</a>. </p>
+* <p> The set is <a href="#ksc">safe</a> for use by multiple concurrent
+* threads.  </p>
 *
 * @return  This selector's key set
 *
 * @throws  ClosedSelectorException
 *          If this selector is closed
 *
 * <p> Keys may be removed from, but not directly added to, the
 * selected-key set.  Any attempt to add an object to the key set will
 * cause an {@link UnsupportedOperationException} to be thrown.
 *
-* <p> The selected-key set is <a href="#ksc">not thread-safe</a>. </p>
+* <p> The selected-key set is <a href="#sksc">not thread-safe</a>.  </p>
 *
 * @return  This selector's selected-key set
 *
 * @throws  ClosedSelectorException
 *          If this selector is closed
 *          If this selector is closed
 *
 * @throws  IllegalArgumentException
 *          If the value of the timeout argument is negative
 */
-public abstract int select(long timeout)
+public abstract int select(long timeout) throws IOException;
-throws IOException;
 /**
 * Selects a set of keys whose corresponding channels are ready for I/O
 * operations.
 *

changeset 49802	8ac08fa69f00
parent 47216	71c04702a3d5
child 50602	ed8de3d0cd28