Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4631D19164 for ; Thu, 14 Apr 2016 22:19:27 +0000 (UTC) Received: (qmail 80250 invoked by uid 500); 14 Apr 2016 22:19:27 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 80216 invoked by uid 500); 14 Apr 2016 22:19:27 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 80161 invoked by uid 99); 14 Apr 2016 22:19:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2016 22:19:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2E4FDFB95; Thu, 14 Apr 2016 22:19:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Thu, 14 Apr 2016 22:19:26 -0000 Message-Id: <98c7b193932e488d873acb55a9e2b140@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: ARTEMIS-482 Assign dedicated ThreadPool for InVMTransport Repository: activemq-artemis Updated Branches: refs/heads/master 5678d1ad2 -> 914d93f63 ARTEMIS-482 Assign dedicated ThreadPool for InVMTransport Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fc8a1eff Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fc8a1eff Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fc8a1eff Branch: refs/heads/master Commit: fc8a1eff43525a51fef4bc53a23df9f6f9cdaeae Parents: 5678d1a Author: Martyn Taylor Authored: Thu Apr 14 12:46:57 2016 +0100 Committer: Martyn Taylor Committed: Thu Apr 14 15:49:07 2016 +0100 ---------------------------------------------------------------------- .../core/remoting/impl/invm/InVMConnector.java | 24 ++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fc8a1eff/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java index c1fab77..0783d7c 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java @@ -22,11 +22,17 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.api.core.ActiveMQException; +import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.core.server.ActiveMQComponent; -import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import org.apache.activemq.artemis.spi.core.remoting.AbstractConnector; import org.apache.activemq.artemis.spi.core.remoting.Acceptor; import org.apache.activemq.artemis.spi.core.remoting.BaseConnectionLifeCycleListener; @@ -86,6 +92,20 @@ public class InVMConnector extends AbstractConnector { private final Executor closeExecutor; + private static ExecutorService threadPoolExecutor; + + private static ExecutorService getInVMExecutor() { + if (threadPoolExecutor == null) { + if (ActiveMQClient.globalThreadMaxPoolSize <= -1) { + threadPoolExecutor = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue(), Executors.defaultThreadFactory()); + } + else { + threadPoolExecutor = Executors.newFixedThreadPool(ActiveMQClient.globalThreadMaxPoolSize); + } + } + return threadPoolExecutor; + } + public InVMConnector(final Map configuration, final BufferHandler handler, final ClientConnectionLifeCycleListener listener, @@ -101,7 +121,7 @@ public class InVMConnector extends AbstractConnector { this.closeExecutor = closeExecutor; - executorFactory = new OrderedExecutorFactory(threadPool); + executorFactory = new OrderedExecutorFactory(getInVMExecutor()); InVMRegistry registry = InVMRegistry.instance;