[jboss-cvs] JBossAS SVN: r99375 - in trunk: connector/src/resources/jca-sar and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 13 17:57:19 EST 2010
Author: david.lloyd at jboss.com
Date: 2010-01-13 17:57:19 -0500 (Wed, 13 Jan 2010)
New Revision: 99375
Modified:
trunk/component-matrix/pom.xml
trunk/connector/src/resources/jca-sar/jca-jboss-beans.xml
trunk/server/src/etc/deploy/thread-pool-jboss-beans.xml
trunk/varia/src/resources/xnio/xnio-jboss-beans.xml
Log:
JBAS-7610 - update jboss-threads* to 2.0.0.CR1
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-01-13 22:26:15 UTC (rev 99374)
+++ trunk/component-matrix/pom.xml 2010-01-13 22:57:19 UTC (rev 99375)
@@ -124,7 +124,7 @@
<version.org.jboss.security>2.1.0.20091223</version.org.jboss.security>
<version.org.jboss.service.binding>1.0.0.GA</version.org.jboss.service.binding>
<version.org.jboss.stdio>1.0.0.CR1</version.org.jboss.stdio>
- <version.org.jboss.threads>1.0.0.GA</version.org.jboss.threads>
+ <version.org.jboss.threads>2.0.0.CR1</version.org.jboss.threads>
<version.org.jboss.vfs>2.2.0.Alpha2</version.org.jboss.vfs>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
<version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
Modified: trunk/connector/src/resources/jca-sar/jca-jboss-beans.xml
===================================================================
--- trunk/connector/src/resources/jca-sar/jca-jboss-beans.xml 2010-01-13 22:26:15 UTC (rev 99374)
+++ trunk/connector/src/resources/jca-sar/jca-jboss-beans.xml 2010-01-13 22:57:19 UTC (rev 99375)
@@ -5,15 +5,20 @@
<!-- ==================================================================== -->
<!-- THREAD POOL -->
- <threads xmlns="urn:jboss:threads:1.0">
+ <threads xmlns="urn:jboss:threads:2.0">
<thread-group name="WorkManagerThreadGroup" group-name="workmanager-threads"/>
- <thread-factory name="WorkManagerThreadFactory" group="WorkManagerThreadGroup"/>
- <thread-pool-executor name="WorkManagerThreadPool" thread-factory="WorkManagerThreadFactory" queue-length="1024">
- <core-pool-size count="20"/>
- <max-pool-size count="100"/>
+
+ <thread-factory name="WorkManagerThreadFactory">
+ <thread-group name="WorkManagerThreadGroup"/>
+ </thread-factory>
+
+ <bounded-queue-thread-pool-executor name="WorkManagerThreadPool" blocking="true">
+ <thread-factory name="WorkManagerThreadFactory"/>
+ <queue-length count="1024"/>
+ <core-threads count="20"/>
+ <max-threads count="100"/>
<keepalive-time time="60" unit="seconds"/>
- <reject-policy name="block"/>
- </thread-pool-executor>
+ </bounded-queue-thread-pool-executor>
</threads>
<!-- WORK MANAGER -->
Modified: trunk/server/src/etc/deploy/thread-pool-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/thread-pool-jboss-beans.xml 2010-01-13 22:26:15 UTC (rev 99374)
+++ trunk/server/src/etc/deploy/thread-pool-jboss-beans.xml 2010-01-13 22:57:19 UTC (rev 99375)
@@ -25,26 +25,56 @@
<!-- Basic system thread pool deployment -->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <threads xmlns="urn:jboss:threads:1.0">
- <thread-group name="SystemThreadFactoryGroup" group-name="System Threads"/>
- <thread-factory name="SystemThreadFactory" group="SystemThreadFactoryGroup"/>
+ <threads xmlns="urn:jboss:threads:2.0">
- <!--
- ~ This thread pool is for SHORT-RUNNING tasks that block very little or not at all. Long-running
- ~ tasks submitted to this pool may cause starvation and extended blocking.
- -->
- <thread-pool-executor name="ThreadPool" thread-factory="SystemThreadFactory" queue-length="1000">
- <core-pool-size count="5" per-cpu="2"/>
- <max-pool-size count="10" per-cpu="3"/>
- <keepalive-time time="30" unit="seconds"/>
- <reject-policy name="block"/>
- </thread-pool-executor>
- </threads>
+ <!-- The system thread group for all JBoss threads. -->
+ <thread-group name="SystemThreadGroup" group-name="System Threads" daemon="true"/>
- <bean name="LongRunningTasksThreadPool" class="java.util.concurrent.Executor">
- <constructor factoryClass="org.jboss.threads.JBossExecutors" factoryMethod="threadFactoryExecutor">
- <parameter><inject bean="SystemThreadFactory"/></parameter>
- </constructor>
- </bean>
+ <!--
+ ~ This thread pool is for SHORT-RUNNING tasks that block very little or not at all. Long-running
+ ~ tasks submitted to this pool may cause starvation and extended blocking.
+ -->
+ <thread-group name="ShortTasksThreadGroup" group-name="Short Tasks Threads">
+ <parent-thread-group name="SystemThreadGroup"/>
+ </thread-group>
+ <thread-factory name="ShortTasksThreadFactory">
+ <thread-group name="ShortTasksThreadGroup"/>
+ </thread-factory>
+
+ <bounded-queue-thread-pool-executor name="ThreadPool" blocking="true">
+ <thread-factory name="ShortTasksThreadFactory"/>
+ <queue-length count="500" per-cpu="200"/>
+ <core-threads count="5" per-cpu="2"/>
+ <max-threads count="10" per-cpu="3"/>
+ <keepalive-time time="30" unit="seconds"/>
+ <task-filter>
+ <clear-context-classloader/>
+ <clear-tls/>
+ </task-filter>
+ </bounded-queue-thread-pool-executor>
+
+ <!--
+ ~ This thread pool is for LONG-RUNNING tasks that may block for extended periods, such as
+ ~ blocking I/O network connection threads. Short-running tasks submitted to this pool may
+ ~ cause excessive lock contention and performance degradation.
+ -->
+ <thread-group name="LongTasksThreadGroup" group-name="Long Tasks Threads">
+ <parent-thread-group name="SystemThreadGroup"/>
+ </thread-group>
+
+ <thread-factory name="LongTasksThreadFactory">
+ <thread-group name="LongTasksThreadGroup"/>
+ </thread-factory>
+
+ <queueless-thread-pool-executor name="LongRunningTasksThreadPool" blocking="true">
+ <max-threads count="200" per-cpu="500"/>
+ <thread-factory name="LongTasksThreadFactory"/>
+ <task-filter>
+ <clear-context-classloader/>
+ <clear-tls/>
+ </task-filter>
+ </queueless-thread-pool-executor>
+ </threads>
+
</deployment>
\ No newline at end of file
Modified: trunk/varia/src/resources/xnio/xnio-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/xnio/xnio-jboss-beans.xml 2010-01-13 22:26:15 UTC (rev 99374)
+++ trunk/varia/src/resources/xnio/xnio-jboss-beans.xml 2010-01-13 22:57:19 UTC (rev 99375)
@@ -2,12 +2,18 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-<threads xmlns="urn:jboss:threads:1.0">
- <thread-group name="XnioThreadGroup" group-name="xnio"/>
+<threads xmlns="urn:jboss:threads:2.0">
+ <thread-group name="XnioThreadGroup" group-name="xnio">
+ <parent-thread-group name="SystemThreadGroup"/>
+ </thread-group>
- <thread-group name="XnioSelectorThreadGroup" group-name="selector" parent="XnioThreadGroup"/>
+ <thread-group name="XnioSelectorThreadGroup" group-name="xnio selector">
+ <parent-thread-group name="XnioThreadGroup"/>
+ </thread-group>
- <thread-factory name="XnioThreadFactory" group="XnioThreadGroup" thread-name-pattern="xnio-pool%f-%t"/>
+ <thread-factory name="XnioThreadFactory" thread-name-pattern="xnio-pool%f-%t">
+ <thread-group name="XnioSelectorThreadGroup"/>
+ </thread-factory>
<direct-executor name="XnioHandlerExecutor"/>
</threads>
More information about the jboss-cvs-commits
mailing list