From b0b816614eb27381f7ae36c8f0ca379fe350000e Mon Sep 17 00:00:00 2001 From: Christian Wulf <chw@informatik.uni-kiel.de> Date: Tue, 24 Jun 2014 18:38:26 +0200 Subject: [PATCH] added abstract PerformanceTest; changed package structure --- ...odCallThoughputTimestampAnalysis5Test.java | 14 ++------ .../MethodCallThroughputAnalysis13.java | 4 +-- .../MethodCallThroughputAnalysis9.java | 16 +++++----- .../MethodCallThroughputAnalysis10.java | 16 +++++----- ...dCallThoughputTimestampAnalysis14Test.java | 2 +- .../MethodCallThroughputAnalysis14.java | 18 +++++------ ...dCallThoughputTimestampAnalysis15Test.java | 2 +- .../MethodCallThroughputAnalysis15.java | 26 +++++++-------- ...dCallThoughputTimestampAnalysis16Test.java | 2 +- .../MethodCallThroughputAnalysis16.java | 26 +++++++-------- ...dCallThoughputTimestampAnalysis17Test.java | 2 +- .../MethodCallThroughputAnalysis17.java | 32 +++++++++---------- .../MethodCallThroughputAnalysis18.java | 26 +++++++-------- src/test/java/test/PerformanceTest.java | 16 ++++++++++ 14 files changed, 104 insertions(+), 98 deletions(-) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java (97%) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment14/MethodCallThroughputAnalysis14.java (85%) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java (97%) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment15/MethodCallThroughputAnalysis15.java (84%) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java (97%) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment16/MethodCallThroughputAnalysis16.java (87%) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java (97%) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment17/MethodCallThroughputAnalysis17.java (87%) rename src/test/java/teetime/variant/{methodcall => methodcallWithPorts}/examples/experiment18/MethodCallThroughputAnalysis18.java (86%) create mode 100644 src/test/java/test/PerformanceTest.java diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment05/MethodCallThoughputTimestampAnalysis5Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment05/MethodCallThoughputTimestampAnalysis5Test.java index bc13f68..63e5c16 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment05/MethodCallThoughputTimestampAnalysis5Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment05/MethodCallThoughputTimestampAnalysis5Test.java @@ -18,30 +18,20 @@ package teetime.variant.methodcall.examples.experiment05; import java.util.ArrayList; import java.util.List; -import org.junit.Before; import org.junit.Test; import teetime.util.ConstructorClosure; import teetime.util.StatisticsUtil; import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; - -import kieker.common.logging.LogFactory; +import test.PerformanceTest; /** * @author Christian Wulf * * @since 1.10 */ -public class MethodCallThoughputTimestampAnalysis5Test { - - private static final int NUM_OBJECTS_TO_CREATE = 100000; - private static final int NUM_NOOP_FILTERS = 800; - - @Before - public void before() { - System.setProperty(LogFactory.CUSTOM_LOGGER_JVM, "NONE"); - } +public class MethodCallThoughputTimestampAnalysis5Test extends PerformanceTest { // 500 times faster than our new framework // TODO check why diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment13/MethodCallThroughputAnalysis13.java b/src/test/java/teetime/variant/methodcall/examples/experiment13/MethodCallThroughputAnalysis13.java index ba11203..2795e3b 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment13/MethodCallThroughputAnalysis13.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment13/MethodCallThroughputAnalysis13.java @@ -23,7 +23,7 @@ import teetime.util.ConstructorClosure; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import teetime.variant.explicitScheduling.framework.core.Analysis; import teetime.variant.methodcall.framework.core.AbstractStage; -import teetime.variant.methodcall.framework.core.StageWithPort; +import teetime.variant.methodcall.framework.core.Stage; import teetime.variant.methodcall.stage.CollectorSink; import teetime.variant.methodcall.stage.EndStage; import teetime.variant.methodcall.stage.NoopFilter; @@ -83,7 +83,7 @@ public class MethodCallThroughputAnalysis13 extends Analysis { final AbstractStage[] stages = stageList.toArray(new AbstractStage[0]); for (int i = 0; i < stages.length - 1; i++) { - StageWithPort<?, ?> stage = stages[i]; + Stage<?, ?> stage = stages[i]; stage.setSuccessor(stages[i + 1]); } stages[stages.length - 1].setSuccessor(new EndStage<Object>()); diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment09/MethodCallThroughputAnalysis9.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment09/MethodCallThroughputAnalysis9.java index 058b0b3..68d259f 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment09/MethodCallThroughputAnalysis9.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment09/MethodCallThroughputAnalysis9.java @@ -20,14 +20,14 @@ import java.util.List; import teetime.util.ConstructorClosure; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import teetime.variant.explicitScheduling.framework.core.Analysis; -import teetime.variant.methodcall.framework.core.Pipeline; -import teetime.variant.methodcall.framework.core.RunnableStage; -import teetime.variant.methodcall.framework.core.pipe.Pipe; -import teetime.variant.methodcall.stage.CollectorSink; -import teetime.variant.methodcall.stage.NoopFilter; -import teetime.variant.methodcall.stage.ObjectProducer; -import teetime.variant.methodcall.stage.StartTimestampFilter; -import teetime.variant.methodcall.stage.StopTimestampFilter; +import teetime.variant.methodcallWithPorts.framework.core.Pipeline; +import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; +import teetime.variant.methodcallWithPorts.framework.core.pipe.Pipe; +import teetime.variant.methodcallWithPorts.stage.CollectorSink; +import teetime.variant.methodcallWithPorts.stage.NoopFilter; +import teetime.variant.methodcallWithPorts.stage.ObjectProducer; +import teetime.variant.methodcallWithPorts.stage.StartTimestampFilter; +import teetime.variant.methodcallWithPorts.stage.StopTimestampFilter; /** * @author Christian Wulf diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment10/MethodCallThroughputAnalysis10.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment10/MethodCallThroughputAnalysis10.java index b5c7149..55d6017 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment10/MethodCallThroughputAnalysis10.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment10/MethodCallThroughputAnalysis10.java @@ -20,14 +20,14 @@ import java.util.List; import teetime.util.ConstructorClosure; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import teetime.variant.explicitScheduling.framework.core.Analysis; -import teetime.variant.methodcall.framework.core.Pipeline; -import teetime.variant.methodcall.framework.core.RunnableStage; -import teetime.variant.methodcall.framework.core.pipe.SingleElementPipe; -import teetime.variant.methodcall.stage.CollectorSink; -import teetime.variant.methodcall.stage.NoopFilter; -import teetime.variant.methodcall.stage.ObjectProducer; -import teetime.variant.methodcall.stage.StartTimestampFilter; -import teetime.variant.methodcall.stage.StopTimestampFilter; +import teetime.variant.methodcallWithPorts.framework.core.Pipeline; +import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; +import teetime.variant.methodcallWithPorts.framework.core.pipe.SingleElementPipe; +import teetime.variant.methodcallWithPorts.stage.CollectorSink; +import teetime.variant.methodcallWithPorts.stage.NoopFilter; +import teetime.variant.methodcallWithPorts.stage.ObjectProducer; +import teetime.variant.methodcallWithPorts.stage.StartTimestampFilter; +import teetime.variant.methodcallWithPorts.stage.StopTimestampFilter; /** * @author Christian Wulf diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java similarity index 97% rename from src/test/java/teetime/variant/methodcall/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java index 59b6372..3a8cced 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment14; +package teetime.variant.methodcallWithPorts.examples.experiment14; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment14/MethodCallThroughputAnalysis14.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThroughputAnalysis14.java similarity index 85% rename from src/test/java/teetime/variant/methodcall/examples/experiment14/MethodCallThroughputAnalysis14.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThroughputAnalysis14.java index bc08ec9..69b48f8 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment14/MethodCallThroughputAnalysis14.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThroughputAnalysis14.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment14; +package teetime.variant.methodcallWithPorts.examples.experiment14; import java.util.List; import teetime.util.ConstructorClosure; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import teetime.variant.explicitScheduling.framework.core.Analysis; -import teetime.variant.methodcall.framework.core.Pipeline; -import teetime.variant.methodcall.framework.core.RunnableStage; -import teetime.variant.methodcall.framework.core.pipe.SpScPipe; -import teetime.variant.methodcall.stage.CollectorSink; -import teetime.variant.methodcall.stage.NoopFilter; -import teetime.variant.methodcall.stage.ObjectProducer; -import teetime.variant.methodcall.stage.StartTimestampFilter; -import teetime.variant.methodcall.stage.StopTimestampFilter; +import teetime.variant.methodcallWithPorts.framework.core.Pipeline; +import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; +import teetime.variant.methodcallWithPorts.framework.core.pipe.SpScPipe; +import teetime.variant.methodcallWithPorts.stage.CollectorSink; +import teetime.variant.methodcallWithPorts.stage.NoopFilter; +import teetime.variant.methodcallWithPorts.stage.ObjectProducer; +import teetime.variant.methodcallWithPorts.stage.StartTimestampFilter; +import teetime.variant.methodcallWithPorts.stage.StopTimestampFilter; /** * @author Christian Wulf diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java similarity index 97% rename from src/test/java/teetime/variant/methodcall/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java index 1c72d39..9e7c230 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment15; +package teetime.variant.methodcallWithPorts.examples.experiment15; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment15/MethodCallThroughputAnalysis15.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThroughputAnalysis15.java similarity index 84% rename from src/test/java/teetime/variant/methodcall/examples/experiment15/MethodCallThroughputAnalysis15.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThroughputAnalysis15.java index f3bc700..9eed7af 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment15/MethodCallThroughputAnalysis15.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThroughputAnalysis15.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment15; +package teetime.variant.methodcallWithPorts.examples.experiment15; import java.util.List; import teetime.util.ConstructorClosure; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import teetime.variant.explicitScheduling.framework.core.Analysis; -import teetime.variant.methodcall.framework.core.Pipeline; -import teetime.variant.methodcall.framework.core.RunnableStage; -import teetime.variant.methodcall.framework.core.pipe.SpScPipe; -import teetime.variant.methodcall.framework.core.pipe.UnorderedGrowablePipe; -import teetime.variant.methodcall.stage.Clock; -import teetime.variant.methodcall.stage.CollectorSink; -import teetime.variant.methodcall.stage.Delay; -import teetime.variant.methodcall.stage.EndStage; -import teetime.variant.methodcall.stage.NoopFilter; -import teetime.variant.methodcall.stage.ObjectProducer; -import teetime.variant.methodcall.stage.StartTimestampFilter; -import teetime.variant.methodcall.stage.StopTimestampFilter; +import teetime.variant.methodcallWithPorts.framework.core.Pipeline; +import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; +import teetime.variant.methodcallWithPorts.framework.core.pipe.SpScPipe; +import teetime.variant.methodcallWithPorts.framework.core.pipe.UnorderedGrowablePipe; +import teetime.variant.methodcallWithPorts.stage.Clock; +import teetime.variant.methodcallWithPorts.stage.CollectorSink; +import teetime.variant.methodcallWithPorts.stage.Delay; +import teetime.variant.methodcallWithPorts.stage.EndStage; +import teetime.variant.methodcallWithPorts.stage.NoopFilter; +import teetime.variant.methodcallWithPorts.stage.ObjectProducer; +import teetime.variant.methodcallWithPorts.stage.StartTimestampFilter; +import teetime.variant.methodcallWithPorts.stage.StopTimestampFilter; /** * @author Christian Wulf diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java similarity index 97% rename from src/test/java/teetime/variant/methodcall/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java index 942ce6c..e3afce1 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment16; +package teetime.variant.methodcallWithPorts.examples.experiment16; import java.util.List; diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment16/MethodCallThroughputAnalysis16.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThroughputAnalysis16.java similarity index 87% rename from src/test/java/teetime/variant/methodcall/examples/experiment16/MethodCallThroughputAnalysis16.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThroughputAnalysis16.java index af0ac36..6343ff5 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment16/MethodCallThroughputAnalysis16.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThroughputAnalysis16.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment16; +package teetime.variant.methodcallWithPorts.examples.experiment16; import java.util.ArrayList; import java.util.LinkedList; @@ -22,18 +22,18 @@ import java.util.List; import teetime.util.ConstructorClosure; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import teetime.variant.explicitScheduling.framework.core.Analysis; -import teetime.variant.methodcall.framework.core.Pipeline; -import teetime.variant.methodcall.framework.core.RunnableStage; -import teetime.variant.methodcall.framework.core.StageWithPort; -import teetime.variant.methodcall.framework.core.pipe.SpScPipe; -import teetime.variant.methodcall.framework.core.pipe.UnorderedGrowablePipe; -import teetime.variant.methodcall.stage.CollectorSink; -import teetime.variant.methodcall.stage.Distributor; -import teetime.variant.methodcall.stage.NoopFilter; -import teetime.variant.methodcall.stage.ObjectProducer; -import teetime.variant.methodcall.stage.Relay; -import teetime.variant.methodcall.stage.StartTimestampFilter; -import teetime.variant.methodcall.stage.StopTimestampFilter; +import teetime.variant.methodcallWithPorts.framework.core.Pipeline; +import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; +import teetime.variant.methodcallWithPorts.framework.core.StageWithPort; +import teetime.variant.methodcallWithPorts.framework.core.pipe.SpScPipe; +import teetime.variant.methodcallWithPorts.framework.core.pipe.UnorderedGrowablePipe; +import teetime.variant.methodcallWithPorts.stage.CollectorSink; +import teetime.variant.methodcallWithPorts.stage.Distributor; +import teetime.variant.methodcallWithPorts.stage.NoopFilter; +import teetime.variant.methodcallWithPorts.stage.ObjectProducer; +import teetime.variant.methodcallWithPorts.stage.Relay; +import teetime.variant.methodcallWithPorts.stage.StartTimestampFilter; +import teetime.variant.methodcallWithPorts.stage.StopTimestampFilter; /** * @author Christian Wulf diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java similarity index 97% rename from src/test/java/teetime/variant/methodcall/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java index 47703ca..c5f9ac1 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment17; +package teetime.variant.methodcallWithPorts.examples.experiment17; import java.util.List; diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment17/MethodCallThroughputAnalysis17.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThroughputAnalysis17.java similarity index 87% rename from src/test/java/teetime/variant/methodcall/examples/experiment17/MethodCallThroughputAnalysis17.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThroughputAnalysis17.java index fb8c850..4a6a81e 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment17/MethodCallThroughputAnalysis17.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThroughputAnalysis17.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment17; +package teetime.variant.methodcallWithPorts.examples.experiment17; import java.util.ArrayList; import java.util.LinkedList; @@ -22,21 +22,21 @@ import java.util.List; import teetime.util.ConstructorClosure; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import teetime.variant.explicitScheduling.framework.core.Analysis; -import teetime.variant.methodcall.framework.core.Pipeline; -import teetime.variant.methodcall.framework.core.RunnableStage; -import teetime.variant.methodcall.framework.core.StageWithPort; -import teetime.variant.methodcall.framework.core.pipe.IPipe; -import teetime.variant.methodcall.framework.core.pipe.SpScPipe; -import teetime.variant.methodcall.framework.core.pipe.UnorderedGrowablePipe; -import teetime.variant.methodcall.stage.CollectorSink; -import teetime.variant.methodcall.stage.Distributor; -import teetime.variant.methodcall.stage.EndStage; -import teetime.variant.methodcall.stage.NoopFilter; -import teetime.variant.methodcall.stage.ObjectProducer; -import teetime.variant.methodcall.stage.Relay; -import teetime.variant.methodcall.stage.Sink; -import teetime.variant.methodcall.stage.StartTimestampFilter; -import teetime.variant.methodcall.stage.StopTimestampFilter; +import teetime.variant.methodcallWithPorts.framework.core.Pipeline; +import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; +import teetime.variant.methodcallWithPorts.framework.core.StageWithPort; +import teetime.variant.methodcallWithPorts.framework.core.pipe.IPipe; +import teetime.variant.methodcallWithPorts.framework.core.pipe.SpScPipe; +import teetime.variant.methodcallWithPorts.framework.core.pipe.UnorderedGrowablePipe; +import teetime.variant.methodcallWithPorts.stage.CollectorSink; +import teetime.variant.methodcallWithPorts.stage.Distributor; +import teetime.variant.methodcallWithPorts.stage.EndStage; +import teetime.variant.methodcallWithPorts.stage.NoopFilter; +import teetime.variant.methodcallWithPorts.stage.ObjectProducer; +import teetime.variant.methodcallWithPorts.stage.Relay; +import teetime.variant.methodcallWithPorts.stage.Sink; +import teetime.variant.methodcallWithPorts.stage.StartTimestampFilter; +import teetime.variant.methodcallWithPorts.stage.StopTimestampFilter; /** * @author Christian Wulf diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment18/MethodCallThroughputAnalysis18.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment18/MethodCallThroughputAnalysis18.java similarity index 86% rename from src/test/java/teetime/variant/methodcall/examples/experiment18/MethodCallThroughputAnalysis18.java rename to src/test/java/teetime/variant/methodcallWithPorts/examples/experiment18/MethodCallThroughputAnalysis18.java index a54abdd..fb00155 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment18/MethodCallThroughputAnalysis18.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment18/MethodCallThroughputAnalysis18.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. ***************************************************************************/ -package teetime.variant.methodcall.examples.experiment18; +package teetime.variant.methodcallWithPorts.examples.experiment18; import java.util.ArrayList; import java.util.LinkedList; @@ -22,18 +22,18 @@ import java.util.List; import teetime.util.ConstructorClosure; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import teetime.variant.explicitScheduling.framework.core.Analysis; -import teetime.variant.methodcall.framework.core.Pipeline; -import teetime.variant.methodcall.framework.core.RunnableStage; -import teetime.variant.methodcall.framework.core.StageWithPort; -import teetime.variant.methodcall.framework.core.pipe.SpScPipe; -import teetime.variant.methodcall.framework.core.pipe.UnorderedGrowablePipe; -import teetime.variant.methodcall.stage.CollectorSink; -import teetime.variant.methodcall.stage.Distributor; -import teetime.variant.methodcall.stage.NoopFilter; -import teetime.variant.methodcall.stage.ObjectProducer; -import teetime.variant.methodcall.stage.Relay; -import teetime.variant.methodcall.stage.StartTimestampFilter; -import teetime.variant.methodcall.stage.StopTimestampFilter; +import teetime.variant.methodcallWithPorts.framework.core.Pipeline; +import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; +import teetime.variant.methodcallWithPorts.framework.core.StageWithPort; +import teetime.variant.methodcallWithPorts.framework.core.pipe.SpScPipe; +import teetime.variant.methodcallWithPorts.framework.core.pipe.UnorderedGrowablePipe; +import teetime.variant.methodcallWithPorts.stage.CollectorSink; +import teetime.variant.methodcallWithPorts.stage.Distributor; +import teetime.variant.methodcallWithPorts.stage.NoopFilter; +import teetime.variant.methodcallWithPorts.stage.ObjectProducer; +import teetime.variant.methodcallWithPorts.stage.Relay; +import teetime.variant.methodcallWithPorts.stage.StartTimestampFilter; +import teetime.variant.methodcallWithPorts.stage.StopTimestampFilter; /** * @author Christian Wulf diff --git a/src/test/java/test/PerformanceTest.java b/src/test/java/test/PerformanceTest.java new file mode 100644 index 0000000..c843102 --- /dev/null +++ b/src/test/java/test/PerformanceTest.java @@ -0,0 +1,16 @@ +package test; + +import org.junit.Before; + +import kieker.common.logging.LogFactory; + +public abstract class PerformanceTest { + + protected static final int NUM_OBJECTS_TO_CREATE = 100000; + protected static final int NUM_NOOP_FILTERS = 800; + + @Before + public void before() { + System.setProperty(LogFactory.CUSTOM_LOGGER_JVM, "NONE"); + } +} -- GitLab