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

@@ -29,13 +29,13 @@
  
  class NativeThreadSet {
      private static final int OTHER_THREAD_INDEX = -99;
  
      private final int initialCapacity;
-     private long[] threads;             // array of thread handles, created lazily
-     private int used;                   // number of thread handles in threads array
-     private int otherThreads;           // count of threads without a native thread handle
+     private Thread[] threads;     // array of platform threads, created lazily
+     private int used;             // number of elements in threads array
+     private int otherThreads;     // additional threads that can't be signalled
      private boolean waitingToEmpty;
  
      NativeThreadSet(int n) {
          initialCapacity = n;
      }

@@ -43,32 +43,32 @@
      /**
       * Adds the current thread handle to this set, returning an index so that
       * it can efficiently be removed later.
       */
      int add() {
-         long th = NativeThread.current();
          synchronized (this) {
-             if (!NativeThread.isNativeThread(th)) {
+             final Thread t = NativeThread.threadToSignal();
+             if (t == null || t.isVirtual()) {
                  otherThreads++;
                  return OTHER_THREAD_INDEX;
              }
  
-             // add native thread handle to array, creating or growing array if needed
+             // add platform threads to array, creating or growing array if needed
              int start = 0;
              if (threads == null) {
-                 threads = new long[initialCapacity];
+                 threads = new Thread[initialCapacity];
              } else if (used >= threads.length) {
                  int on = threads.length;
                  int nn = on * 2;
-                 long[] nthreads = new long[nn];
+                 Thread[] nthreads = new Thread[nn];
                  System.arraycopy(threads, 0, nthreads, 0, on);
                  threads = nthreads;
                  start = on;
              }
              for (int i = start; i < threads.length; i++) {
-                 if (threads[i] == 0) {
-                     threads[i] = th;
+                 if (threads[i] == null) {
+                     threads[i] = t;
                      used++;
                      return i;
                  }
              }
              throw new InternalError();

@@ -79,12 +79,11 @@
       * Removes the thread at the given index. A no-op if index is -1.
       */
      void remove(int i) {
          synchronized (this) {
              if (i >= 0) {
-                 assert threads[i] == NativeThread.current();
-                 threads[i] = 0;
+                 threads[i] = null;
                  used--;
              } else if (i == OTHER_THREAD_INDEX) {
                  otherThreads--;
              } else {
                  assert i == -1;

@@ -102,13 +101,13 @@
      synchronized void signalAndWait() {
          boolean interrupted = false;
          while (used > 0 || otherThreads > 0) {
              int u = used, i = 0;
              while (u > 0 && i < threads.length) {
-                 long th = threads[i];
-                 if (th != 0) {
-                     NativeThread.signal(th);
+                 Thread t = threads[i];
+                 if (t != null) {
+                     NativeThread.signal(t);
                      u--;
                  }
                  i++;
              }
              waitingToEmpty = true;