You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/10/03 22:29:39 UTC
svn commit: r1629312 - in
/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest:
ServiceRaceParallelTest.java ServiceRaceTest.java
Author: pderop
Date: Fri Oct 3 20:29:39 2014
New Revision: 1629312
URL: http://svn.apache.org/r1629312
Log:
cleanup.
Modified:
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceParallelTest.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceParallelTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceParallelTest.java?rev=1629312&r1=1629311&r2=1629312&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceParallelTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceParallelTest.java Fri Oct 3 20:29:39 2014
@@ -2,7 +2,6 @@ package org.apache.felix.dm.itest;
public class ServiceRaceParallelTest extends ServiceRaceTest {
public ServiceRaceParallelTest() {
- super(false); // Don't use a custom thread pool, since we'll use a parallel Dependency Manager
setParallel(); // Configure DM to use a threadpool
}
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java?rev=1629312&r1=1629311&r2=1629312&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/ServiceRaceTest.java Fri Oct 3 20:29:39 2014
@@ -35,23 +35,12 @@ public class ServiceRaceTest extends Tes
// Timestamp used to log the time consumed to execute 100 tests.
long m_timeStamp;
- // Tells whether we should use a custmo threadpool.
- final private boolean m_useCustomThreadPool;
-
public interface Dep {
}
public class DepImpl implements Dep {
}
- public ServiceRaceTest() {
- this (true);
- }
-
- public ServiceRaceTest(boolean useCustomThreadPool) {
- m_useCustomThreadPool = useCustomThreadPool;
- }
-
/**
* Creates many service dependencies, and activate/deactivate them concurrently.
*/
@@ -77,7 +66,8 @@ public class ServiceRaceTest extends Tes
int cores = Math.max(16, Runtime.getRuntime().availableProcessors());
info("using " + cores + " cores.");
- if (m_useCustomThreadPool) {
+ if (! m_parallel) {
+ // We are not using a parallel DM, so we create a custom threadpool in order to add components concurrently.
m_threadpool = Executors.newFixedThreadPool(Math.max(cores, DEPENDENCIES + 3 /* start/stop/configure */));
}
@@ -97,7 +87,7 @@ public class ServiceRaceTest extends Tes
}
void shutdown(ExecutorService exec) {
- if (m_useCustomThreadPool) {
+ if (! m_parallel && exec != null) {
exec.shutdown();
try {
exec.awaitTermination(5, TimeUnit.SECONDS);
@@ -224,7 +214,8 @@ public class ServiceRaceTest extends Tes
}
private void schedule(Runnable task) {
- if (m_useCustomThreadPool) {
+ if (! m_parallel) {
+ // not using parallel DM, so use our custom threadpool.
m_threadpool.execute(task);
} else {
task.run();