From 81a1c32133c7194b7b032522675891208bb5bfc6 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Mon, 22 Jun 2015 15:47:44 +0200
Subject: [PATCH] removed logging code
---
.../basic/distributor/RoundRobinStrategy.java | 2 +-
.../distributor/RoundRobinStrategy2.java | 4 +---
.../distributor/dynamic/CreatePortAction.java | 10 ++++------
.../distributor/dynamic/RemovePortAction.java | 20 +++++++++----------
4 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy.java b/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy.java
index de7df449..77dae925 100644
--- a/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy.java
+++ b/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy.java
@@ -25,7 +25,7 @@ import teetime.framework.Stage;
*/
public final class RoundRobinStrategy implements IDistributorStrategy {
- private int index = 0;
+ private int index;
@Override
public <T> boolean distribute(final OutputPort<T>[] outputPorts, final T element) {
diff --git a/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java b/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java
index fb11cefc..54103cb2 100644
--- a/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java
+++ b/src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java
@@ -25,7 +25,7 @@ import teetime.framework.Stage;
*/
public final class RoundRobinStrategy2 implements IDistributorStrategy {
- private int index = 0;
+ private int index;
private int numWaits;
@Override
@@ -46,8 +46,6 @@ public final class RoundRobinStrategy2 implements IDistributorStrategy {
numLoops--;
} while (!success);
- System.out.println("Sent " + element + " via " + outputPort);
-
return true;
}
diff --git a/src/main/java/teetime/stage/basic/distributor/dynamic/CreatePortAction.java b/src/main/java/teetime/stage/basic/distributor/dynamic/CreatePortAction.java
index 7141ff95..5c1cf8fa 100644
--- a/src/main/java/teetime/stage/basic/distributor/dynamic/CreatePortAction.java
+++ b/src/main/java/teetime/stage/basic/distributor/dynamic/CreatePortAction.java
@@ -19,13 +19,8 @@ public class CreatePortAction<T> implements PortAction<T> {
this.inputPort = inputPort;
}
- public InputPort<T> getInputPort() {
- return inputPort;
- }
-
@Override
public void execute(final DynamicDistributor<T> dynamicDistributor) {
- System.out.println("Creating...");
OutputPort<? extends T> newOutputPort = dynamicDistributor.getNewOutputPort();
INTER_THREAD_PIPE_FACTORY.create(newOutputPort, inputPort);
@@ -38,6 +33,9 @@ public class CreatePortAction<T> implements PortAction<T> {
newOutputPort.sendSignal(new StartingSignal());
// FIXME pass the new thread to the analysis so that it can terminate the thread at the end
- System.out.println("Created.");
+ }
+
+ InputPort<T> getInputPort() { // for testing purposes only
+ return inputPort;
}
}
diff --git a/src/main/java/teetime/stage/basic/distributor/dynamic/RemovePortAction.java b/src/main/java/teetime/stage/basic/distributor/dynamic/RemovePortAction.java
index 848445ff..46d7f09f 100644
--- a/src/main/java/teetime/stage/basic/distributor/dynamic/RemovePortAction.java
+++ b/src/main/java/teetime/stage/basic/distributor/dynamic/RemovePortAction.java
@@ -13,22 +13,20 @@ public class RemovePortAction<T> implements PortAction<T> {
this.outputPort = outputPort;
}
- // public DynamicOutputPort<T> getOutputPort() {
- // return outputPort;
- // }
-
@Override
public void execute(final DynamicDistributor<T> dynamicDistributor) {
- System.out.println("Removing...");
+ OutputPort<?> outputPortToRemove;
+
if (dynamicDistributor instanceof ControlledDynamicDistributor) {
+ // for testing purposes only
OutputPort<?>[] outputPorts = ((ControlledDynamicDistributor<?>) dynamicDistributor).getOutputPorts();
- OutputPort<?> outputPortToRemove = outputPorts[outputPorts.length - 1];
- // outputPortToRemove = outputPort;
+ outputPortToRemove = outputPorts[outputPorts.length - 1];
+ } else {
+ outputPortToRemove = outputPort;
+ }
- outputPortToRemove.sendSignal(new TerminatingSignal());
+ outputPortToRemove.sendSignal(new TerminatingSignal());
- dynamicDistributor.removeDynamicPort((DynamicOutputPort<?>) outputPortToRemove);
- }
- System.out.println("Removed.");
+ dynamicDistributor.removeDynamicPort((DynamicOutputPort<?>) outputPortToRemove);
}
}
--
GitLab