Author: rgodfrey
Date: Tue Mar 17 21:13:42 2015
New Revision: 1667404
URL: http://svn.apache.org/r1667404
Log:
QPID-6429 : Remove dead code, add name to (idle) pooled IO threads
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1667404&r1=1667403&r2=1667404&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Tue Mar 17 21:13:42 2015
@@ -2417,74 +2417,6 @@ public abstract class AbstractConfigured
}
}
- private static class CloseResult implements FutureResult
- {
- private volatile FutureResult _childFutureResult;
-
- @Override
- public boolean isComplete()
- {
- return _childFutureResult != null &&
_childFutureResult.isComplete();
- }
-
- @Override
- public void waitForCompletion()
- {
- synchronized (this)
- {
- while (_childFutureResult == null)
- {
- try
- {
- wait();
- }
- catch (InterruptedException e)
- {
-
- }
- }
- }
- _childFutureResult.waitForCompletion();
-
- }
-
- @Override
- public void waitForCompletion(final long timeout) throws
TimeoutException
- {
- long startTime = System.currentTimeMillis();
- long remaining = timeout;
-
- synchronized (this)
- {
- while (_childFutureResult == null && remaining > 0)
- {
- try
- {
- wait(remaining);
- }
- catch (InterruptedException e)
- {
-
- }
- remaining = startTime + timeout -
System.currentTimeMillis();
-
- if(remaining <= 0)
- {
- throw new TimeoutException("Completion did not occur
within given timeout: " + timeout);
- }
- }
- }
- _childFutureResult.waitForCompletion(remaining);
-
- }
-
- public synchronized void setChildFutureResult(final FutureResult
childFutureResult)
- {
- _childFutureResult = childFutureResult;
- notifyAll();
- }
- }
-
private static class AttributeGettingHandler implements InvocationHandler
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java?rev=1667404&r1=1667403&r2=1667404&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NetworkConnectionScheduler.java
Tue Mar 17 21:13:42 2015
@@ -20,7 +20,9 @@
*/
package org.apache.qpid.server.transport;
+import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
@@ -39,7 +41,17 @@ class NetworkConnectionScheduler
{
_selectorThread = selectorThread;
_poolSize = Runtime.getRuntime().availableProcessors();
- _executor = new ScheduledThreadPoolExecutor(_poolSize);
+ _executor = new ScheduledThreadPoolExecutor(_poolSize, new
ThreadFactory()
+ {
+ final AtomicInteger _count = new AtomicInteger();
+ @Override
+ public Thread newThread(final Runnable r)
+ {
+ Thread t = Executors.defaultThreadFactory().newThread(r);
+
t.setName("IO-pool-"+selectorThread.getName()+"-"+_count.incrementAndGet());
+ return t;
+ }
+ });
_executor.prestartAllCoreThreads();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
