You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2024/11/30 16:46:25 UTC

(httpcomponents-core) branch HTTPCORE-773 created (now e66c4f5e7)

This is an automated email from the ASF dual-hosted git repository.

olegk pushed a change to branch HTTPCORE-773
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git


      at e66c4f5e7 HTTPCORE-773: introduced customizable strategy to select i/o dispatch worker for new i/o channels

This branch includes the following new commits:

     new e66c4f5e7 HTTPCORE-773: introduced customizable strategy to select i/o dispatch worker for new i/o channels

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(httpcomponents-core) 01/01: HTTPCORE-773: introduced customizable strategy to select i/o dispatch worker for new i/o channels

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olegk pushed a commit to branch HTTPCORE-773
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git

commit e66c4f5e71b7f7238ad7158c05abb66d6c76c1b9
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sat Nov 30 16:26:06 2024 +0100

    HTTPCORE-773: introduced customizable strategy to select i/o dispatch worker for new i/o channels
---
 .../hc/core5/testing/nio/AsyncRequester.java       |  3 +-
 .../apache/hc/core5/testing/nio/AsyncServer.java   |  3 +-
 .../core5/http/impl/bootstrap/AsyncRequester.java  |  6 +-
 .../hc/core5/http/impl/bootstrap/AsyncServer.java  |  3 +-
 .../hc/core5/reactor/AbstractIOReactorBase.java    |  8 +-
 .../core5/reactor/DefaultConnectingIOReactor.java  | 20 +++--
 .../core5/reactor/DefaultListeningIOReactor.java   | 69 ++++++++---------
 .../apache/hc/core5/reactor/IOWorkerSelectors.java | 76 ++++++++++++++++++
 .../apache/hc/core5/reactor/IOWorkerStats.java}    | 17 ++---
 .../org/apache/hc/core5/reactor/IOWorkers.java     | 89 ----------------------
 .../hc/core5/reactor/SingleCoreIOReactor.java      | 12 ++-
 ...WorkersTest.java => IOWorkerSelectorsTest.java} | 27 ++++---
 12 files changed, 173 insertions(+), 160 deletions(-)

diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/AsyncRequester.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/AsyncRequester.java
index 7d06a0899..25e65e0f9 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/AsyncRequester.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/AsyncRequester.java
@@ -66,7 +66,8 @@ public class AsyncRequester extends IOReactorExecutor<DefaultConnectingIOReactor
                 LoggingExceptionCallback.INSTANCE,
                 LoggingIOSessionListener.INSTANCE,
                 LoggingReactorMetricsListener.INSTANCE,
-                sessionShutdownCallback);
+                sessionShutdownCallback,
+                null);
     }
 
     private InetSocketAddress toSocketAddress(final HttpHost host) {
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/AsyncServer.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/AsyncServer.java
index 3149de2eb..b33482704 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/AsyncServer.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/AsyncServer.java
@@ -61,7 +61,8 @@ public class AsyncServer extends IOReactorExecutor<DefaultListeningIOReactor> {
                 LoggingExceptionCallback.INSTANCE,
                 LoggingIOSessionListener.INSTANCE,
                 LoggingReactorMetricsListener.INSTANCE,
-                sessionShutdownCallback);
+                sessionShutdownCallback,
+                null);
     }
 
     public Future<ListenerEndpoint> listen(final InetSocketAddress address) {
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncRequester.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncRequester.java
index 399ca923c..b158bedb2 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncRequester.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncRequester.java
@@ -75,8 +75,7 @@ public class AsyncRequester extends AbstractConnectionInitiatorBase implements I
             final IOSessionListener sessionListener,
             final Callback<IOSession> sessionShutdownCallback,
             final Resolver<HttpHost, InetSocketAddress> addressResolver,
-            final IOReactorMetricsListener threadPoolListener
-            ) {
+            final IOReactorMetricsListener threadPoolListener) {
         this.ioReactor = new DefaultConnectingIOReactor(
                 eventHandlerFactory,
                 ioReactorConfig,
@@ -85,7 +84,8 @@ public class AsyncRequester extends AbstractConnectionInitiatorBase implements I
                 exceptionCallback,
                 sessionListener,
                 threadPoolListener,
-                sessionShutdownCallback);
+                sessionShutdownCallback,
+                null);
         this.addressResolver = addressResolver != null ? addressResolver : DefaultAddressResolver.INSTANCE;
     }
 
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncServer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncServer.java
index f4c34b45f..9b462055d 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncServer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncServer.java
@@ -76,7 +76,8 @@ public class AsyncServer extends AbstractConnectionInitiatorBase implements IORe
                 exceptionCallback,
                 sessionListener,
                 threadPoolListener,
-                sessionShutdownCallback);
+                sessionShutdownCallback,
+                null);
     }
 
     @Override
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactorBase.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactorBase.java
index 706b6a3c7..e3914f80e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactorBase.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactorBase.java
@@ -50,13 +50,17 @@ abstract class AbstractIOReactorBase implements ConnectionInitiator, IOReactorSe
             throw new IOReactorShutdownException("I/O reactor has been shut down");
         }
         try {
-            return getWorkerSelector().next().connect(remoteEndpoint, remoteAddress, localAddress, timeout, attachment, callback);
+            final SingleCoreIOReactor dispatcher = selectWorker();
+            if (dispatcher.getStatus() == IOReactorStatus.SHUT_DOWN) {
+                throw new IOReactorShutdownException("I/O reactor has been shut down");
+            }
+            return dispatcher.connect(remoteEndpoint, remoteAddress, localAddress, timeout, attachment, callback);
         } catch (final IOReactorShutdownException ex) {
             initiateShutdown();
             throw ex;
         }
     }
 
-    abstract IOWorkers.Selector getWorkerSelector();
+    abstract SingleCoreIOReactor selectWorker();
 
 }
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.java
index 4d89dc200..f8a372892 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/DefaultConnectingIOReactor.java
@@ -29,7 +29,9 @@ package org.apache.hc.core5.reactor;
 
 import java.io.IOException;
 import java.util.concurrent.ThreadFactory;
+import java.util.function.Function;
 
+import org.apache.hc.core5.annotation.Internal;
 import org.apache.hc.core5.concurrent.DefaultThreadFactory;
 import org.apache.hc.core5.function.Callback;
 import org.apache.hc.core5.function.Decorator;
@@ -48,16 +50,16 @@ import org.apache.hc.core5.util.TimeValue;
  */
 public class DefaultConnectingIOReactor extends AbstractIOReactorBase {
 
-    private final int workerCount;
     private final SingleCoreIOReactor[] workers;
     private final MultiCoreIOReactor ioReactor;
-    private final IOWorkers.Selector workerSelector;
+    private final Function<IOWorkerStats[], Integer> workerSelector;
 
     private final static ThreadFactory THREAD_FACTORY = new DefaultThreadFactory("I/O client dispatch", true);
 
     /**
      * @since 5.4
      */
+    @Internal
     public DefaultConnectingIOReactor(
             final IOEventHandlerFactory eventHandlerFactory,
             final IOReactorConfig ioReactorConfig,
@@ -66,9 +68,10 @@ public class DefaultConnectingIOReactor extends AbstractIOReactorBase {
             final Callback<Exception> exceptionCallback,
             final IOSessionListener sessionListener,
             final IOReactorMetricsListener threadPoolListener,
-            final Callback<IOSession> sessionShutdownCallback) {
+            final Callback<IOSession> sessionShutdownCallback,
+            final Function<IOWorkerStats[], Integer> workerSelector) {
         Args.notNull(eventHandlerFactory, "Event handler factory");
-        this.workerCount = ioReactorConfig != null ? ioReactorConfig.getIoThreadCount() : IOReactorConfig.DEFAULT.getIoThreadCount();
+        final int workerCount = ioReactorConfig != null ? ioReactorConfig.getIoThreadCount() : IOReactorConfig.DEFAULT.getIoThreadCount();
         this.workers = new SingleCoreIOReactor[workerCount];
         final Thread[] threads = new Thread[workerCount];
         for (int i = 0; i < this.workers.length; i++) {
@@ -84,7 +87,7 @@ public class DefaultConnectingIOReactor extends AbstractIOReactorBase {
             threads[i] = (threadFactory != null ? threadFactory : THREAD_FACTORY).newThread(new IOReactorWorker(dispatcher));
         }
         this.ioReactor = new MultiCoreIOReactor(this.workers, threads);
-        this.workerSelector = IOWorkers.newSelector(workers);
+        this.workerSelector = workerSelector != null ? workerSelector : IOWorkerSelectors.newSelector(workerCount);
     }
 
     public DefaultConnectingIOReactor(
@@ -95,7 +98,8 @@ public class DefaultConnectingIOReactor extends AbstractIOReactorBase {
             final Callback<Exception> exceptionCallback,
             final IOSessionListener sessionListener,
             final Callback<IOSession> sessionShutdownCallback) {
-        this(eventHandlerFactory,ioReactorConfig, threadFactory,ioSessionDecorator, exceptionCallback, sessionListener, null, sessionShutdownCallback);
+        this(eventHandlerFactory,ioReactorConfig, threadFactory,ioSessionDecorator, exceptionCallback, sessionListener,
+                null, sessionShutdownCallback, null);
     }
 
     public DefaultConnectingIOReactor(
@@ -125,8 +129,8 @@ public class DefaultConnectingIOReactor extends AbstractIOReactorBase {
     }
 
     @Override
-    IOWorkers.Selector getWorkerSelector() {
-        return workerSelector;
+    SingleCoreIOReactor selectWorker() {
+        return workers[workerSelector.apply(workers)];
     }
 
     @Override
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.java
index feb6b662a..2e71d649e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/DefaultListeningIOReactor.java
@@ -32,7 +32,9 @@ import java.net.SocketAddress;
 import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
+import java.util.function.Function;
 
+import org.apache.hc.core5.annotation.Internal;
 import org.apache.hc.core5.concurrent.DefaultThreadFactory;
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.function.Callback;
@@ -55,37 +57,15 @@ public class DefaultListeningIOReactor extends AbstractIOReactorBase implements
     private final static ThreadFactory DISPATCH_THREAD_FACTORY = new DefaultThreadFactory("I/O server dispatch", true);
     private final static ThreadFactory LISTENER_THREAD_FACTORY = new DefaultThreadFactory("I/O listener", true);
 
-    private final int workerCount;
     private final SingleCoreIOReactor[] workers;
     private final SingleCoreListeningIOReactor listener;
     private final MultiCoreIOReactor ioReactor;
-    private final IOWorkers.Selector workerSelector;
-
-    /**
-     * Creates an instance of DefaultListeningIOReactor with the given configuration.
-     *
-     * @param eventHandlerFactory the factory to create I/O event handlers.
-     * @param ioReactorConfig I/O reactor configuration.
-     * @param listenerThreadFactory the factory to create listener thread.
-     *   Can be {@code null}.
-     *
-     * @since 5.0
-     */
-    public DefaultListeningIOReactor(
-            final IOEventHandlerFactory eventHandlerFactory,
-            final IOReactorConfig ioReactorConfig,
-            final ThreadFactory dispatchThreadFactory,
-            final ThreadFactory listenerThreadFactory,
-            final Decorator<IOSession> ioSessionDecorator,
-            final Callback<Exception> exceptionCallback,
-            final IOSessionListener sessionListener,
-            final Callback<IOSession> sessionShutdownCallback) {
-        this(eventHandlerFactory, ioReactorConfig, dispatchThreadFactory, listenerThreadFactory, ioSessionDecorator, exceptionCallback, sessionListener, null, sessionShutdownCallback);
-    }
+    private final Function<IOWorkerStats[], Integer> workerSelector;
 
     /**
      * @since 5.4
      */
+    @Internal
     public DefaultListeningIOReactor(
             final IOEventHandlerFactory eventHandlerFactory,
             final IOReactorConfig ioReactorConfig,
@@ -95,9 +75,10 @@ public class DefaultListeningIOReactor extends AbstractIOReactorBase implements
             final Callback<Exception> exceptionCallback,
             final IOSessionListener sessionListener,
             final IOReactorMetricsListener threadPoolListener,
-            final Callback<IOSession> sessionShutdownCallback) {
+            final Callback<IOSession> sessionShutdownCallback,
+            final Function<IOWorkerStats[], Integer> workerSelector) {
         Args.notNull(eventHandlerFactory, "Event handler factory");
-        this.workerCount = ioReactorConfig != null ? ioReactorConfig.getIoThreadCount() : IOReactorConfig.DEFAULT.getIoThreadCount();
+        final int workerCount = ioReactorConfig != null ? ioReactorConfig.getIoThreadCount() : IOReactorConfig.DEFAULT.getIoThreadCount();
         this.workers = new SingleCoreIOReactor[workerCount];
         final Thread[] threads = new Thread[workerCount + 1];
         for (int i = 0; i < this.workers.length; i++) {
@@ -112,15 +93,36 @@ public class DefaultListeningIOReactor extends AbstractIOReactorBase implements
             this.workers[i] = dispatcher;
             threads[i + 1] = (dispatchThreadFactory != null ? dispatchThreadFactory : DISPATCH_THREAD_FACTORY).newThread(new IOReactorWorker(dispatcher));
         }
-        final IOReactor[] ioReactors = new IOReactor[this.workerCount + 1];
-        System.arraycopy(this.workers, 0, ioReactors, 1, this.workerCount);
+        final IOReactor[] ioReactors = new IOReactor[workerCount + 1];
+        System.arraycopy(this.workers, 0, ioReactors, 1, workerCount);
         this.listener = new SingleCoreListeningIOReactor(exceptionCallback, ioReactorConfig, this::enqueueChannel);
         ioReactors[0] = this.listener;
         threads[0] = (listenerThreadFactory != null ? listenerThreadFactory : LISTENER_THREAD_FACTORY).newThread(new IOReactorWorker(listener));
-
         this.ioReactor = new MultiCoreIOReactor(ioReactors, threads);
+        this.workerSelector = workerSelector != null ? workerSelector : IOWorkerSelectors.newSelector(workerCount);
+    }
 
-        workerSelector = IOWorkers.newSelector(workers);
+    /**
+     * Creates an instance of DefaultListeningIOReactor with the given configuration.
+     *
+     * @param eventHandlerFactory the factory to create I/O event handlers.
+     * @param ioReactorConfig I/O reactor configuration.
+     * @param listenerThreadFactory the factory to create listener thread.
+     *   Can be {@code null}.
+     *
+     * @since 5.0
+     */
+    public DefaultListeningIOReactor(
+            final IOEventHandlerFactory eventHandlerFactory,
+            final IOReactorConfig ioReactorConfig,
+            final ThreadFactory dispatchThreadFactory,
+            final ThreadFactory listenerThreadFactory,
+            final Decorator<IOSession> ioSessionDecorator,
+            final Callback<Exception> exceptionCallback,
+            final IOSessionListener sessionListener,
+            final Callback<IOSession> sessionShutdownCallback) {
+        this(eventHandlerFactory, ioReactorConfig, dispatchThreadFactory, listenerThreadFactory, ioSessionDecorator,
+                exceptionCallback, sessionListener, null, sessionShutdownCallback, null);
     }
 
     /**
@@ -191,19 +193,18 @@ public class DefaultListeningIOReactor extends AbstractIOReactorBase implements
     }
 
     @Override
-    IOWorkers.Selector getWorkerSelector() {
-        return workerSelector;
+    SingleCoreIOReactor selectWorker() {
+        return workers[workerSelector.apply(workers)];
     }
 
     private void enqueueChannel(final ChannelEntry entry) {
         try {
-            workerSelector.next().enqueueChannel(entry);
+            selectWorker().enqueueChannel(entry);
         } catch (final IOReactorShutdownException ex) {
             initiateShutdown();
         }
     }
 
-
     @Override
     public void initiateShutdown() {
         ioReactor.initiateShutdown();
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkerSelectors.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkerSelectors.java
new file mode 100644
index 000000000..56d06df02
--- /dev/null
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkerSelectors.java
@@ -0,0 +1,76 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.hc.core5.reactor;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+
+final class IOWorkerSelectors {
+
+    static Function<IOWorkerStats[], Integer> newSelector(final int workerCount, final int start) {
+        return isPowerOfTwo(workerCount) ? new PowerOfTwoSelector(start) : new GenericSelector(start);
+    }
+
+    static Function<IOWorkerStats[], Integer> newSelector(final int workerCount) {
+        return newSelector(workerCount, 0);
+    }
+
+    static boolean isPowerOfTwo(final int n) {
+        return (n & -n) == n;
+    }
+
+    static final class PowerOfTwoSelector implements Function<IOWorkerStats[], Integer> {
+
+        private final AtomicInteger idx;
+
+        PowerOfTwoSelector(final int n) {
+            this.idx = new AtomicInteger(n);
+        }
+
+        @Override
+        public Integer apply(final IOWorkerStats[] dispatchers) {
+            return idx.getAndIncrement() & (dispatchers.length - 1);
+        }
+
+    }
+
+    static final class GenericSelector implements Function<IOWorkerStats[], Integer> {
+
+        private final AtomicInteger idx;
+
+        GenericSelector(final int n) {
+            this.idx = new AtomicInteger(n);
+        }
+
+        @Override
+        public Integer apply(final IOWorkerStats[] dispatchers) {
+            return (idx.getAndIncrement() & Integer.MAX_VALUE) % dispatchers.length;
+        }
+
+    }
+
+}
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkersTest.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkerStats.java
similarity index 69%
copy from httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkersTest.java
copy to httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkerStats.java
index c087af432..e5c1a7573 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkersTest.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkerStats.java
@@ -24,21 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
+
 package org.apache.hc.core5.reactor;
 
-import static org.mockito.Mockito.mock;
+import org.apache.hc.core5.annotation.Internal;
 
-import org.junit.jupiter.api.Test;
+@Internal
+public interface IOWorkerStats {
 
-class IOWorkersTest {
+    int totalChannelCount();
 
-    @Test
-    void testIndexOverflow() {
-        final SingleCoreIOReactor reactor = new SingleCoreIOReactor(null, mock(IOEventHandlerFactory.class), IOReactorConfig.DEFAULT, null, null, null, null);
-        final IOWorkers.Selector selector = IOWorkers.newSelector(new SingleCoreIOReactor[]{reactor, reactor, reactor});
-        for (long i = Integer.MAX_VALUE - 10; i < (long) Integer.MAX_VALUE + 10; i++) {
-            selector.next();
-        }
-    }
+    int pendingChannelCount();
 
 }
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
deleted file mode 100644
index c7cadac33..000000000
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-package org.apache.hc.core5.reactor;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-final class IOWorkers {
-
-    interface Selector {
-
-        SingleCoreIOReactor next();
-
-    }
-
-    static Selector newSelector(final SingleCoreIOReactor[] dispatchers) {
-        return isPowerOfTwo(dispatchers.length)
-                        ? new PowerOfTwoSelector(dispatchers)
-                        : new GenericSelector(dispatchers);
-    }
-
-    private static boolean isPowerOfTwo(final int val) {
-        return (val & -val) == val;
-    }
-
-    private static void validate(final SingleCoreIOReactor dispatcher) {
-        if (dispatcher.getStatus() == IOReactorStatus.SHUT_DOWN) {
-            throw new IOReactorShutdownException("I/O reactor has been shut down");
-        }
-    }
-
-    private static final class PowerOfTwoSelector implements Selector {
-
-        private final AtomicInteger idx = new AtomicInteger(0);
-        private final SingleCoreIOReactor[] dispatchers;
-
-        PowerOfTwoSelector(final SingleCoreIOReactor[] dispatchers) {
-            this.dispatchers = dispatchers;
-        }
-
-        @Override
-        public SingleCoreIOReactor next() {
-            final SingleCoreIOReactor dispatcher = dispatchers[idx.getAndIncrement() & (dispatchers.length - 1)];
-            validate(dispatcher);
-            return dispatcher;
-        }
-    }
-
-    private static final class GenericSelector implements Selector {
-
-        private final AtomicInteger idx = new AtomicInteger(0);
-        private final SingleCoreIOReactor[] dispatchers;
-
-        GenericSelector(final SingleCoreIOReactor[] dispatchers) {
-            this.dispatchers = dispatchers;
-        }
-
-        @Override
-        public SingleCoreIOReactor next() {
-            final SingleCoreIOReactor dispatcher = dispatchers[(idx.getAndIncrement() & Integer.MAX_VALUE) % dispatchers.length];
-            validate(dispatcher);
-            return dispatcher;
-        }
-    }
-
-}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
index 2d4f4f903..e334f2a10 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
@@ -55,7 +55,7 @@ import org.apache.hc.core5.net.NamedEndpoint;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Timeout;
 
-class SingleCoreIOReactor extends AbstractSingleCoreIOReactor implements ConnectionInitiator {
+class SingleCoreIOReactor extends AbstractSingleCoreIOReactor implements ConnectionInitiator, IOWorkerStats {
 
     private static final int MAX_CHANNEL_REQUESTS = 10000;
 
@@ -465,4 +465,14 @@ class SingleCoreIOReactor extends AbstractSingleCoreIOReactor implements Connect
         }
     }
 
+    @Override
+    public int totalChannelCount() {
+        return selector.keys().size();
+    }
+
+    @Override
+    public int pendingChannelCount() {
+        return channelQueue.size() + requestQueue.size();
+    }
+
 }
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkersTest.java b/httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkerSelectorsTest.java
similarity index 56%
rename from httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkersTest.java
rename to httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkerSelectorsTest.java
index c087af432..34ade84ba 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkersTest.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/reactor/IOWorkerSelectorsTest.java
@@ -26,18 +26,27 @@
  */
 package org.apache.hc.core5.reactor;
 
-import static org.mockito.Mockito.mock;
+import java.util.function.Function;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.Mockito;
 
-class IOWorkersTest {
+class IOWorkerSelectorsTest {
 
-    @Test
-    void testIndexOverflow() {
-        final SingleCoreIOReactor reactor = new SingleCoreIOReactor(null, mock(IOEventHandlerFactory.class), IOReactorConfig.DEFAULT, null, null, null, null);
-        final IOWorkers.Selector selector = IOWorkers.newSelector(new SingleCoreIOReactor[]{reactor, reactor, reactor});
-        for (long i = Integer.MAX_VALUE - 10; i < (long) Integer.MAX_VALUE + 10; i++) {
-            selector.next();
+    @ParameterizedTest(name = "worker count = {0}")
+    @ValueSource(ints = {1, 2, 3, 4, 5, 10, 15, 16, 32})
+    void testIndexOverflow(final int workerCount) {
+        final long start = (long) Integer.MAX_VALUE - 10;
+        final long end = (long) Integer.MAX_VALUE + 10;
+        final IOWorkerStats[] workers = new IOWorkerStats[workerCount];
+        for (int i = 0; i < workerCount; i++) {
+            workers[i] = Mockito.mock(IOWorkerStats.class);
+        }
+        final Function<IOWorkerStats[], Integer> selector = IOWorkerSelectors.newSelector(workerCount, (int) start);
+        for (long i = start; i < end; i++) {
+            Assertions.assertTrue(selector.apply(workers) < workerCount);
         }
     }