From 628a087bac86dd8418ab2241955827b03bb462e2 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Tue, 3 Mar 2015 19:17:39 +0100
Subject: [PATCH] removed YieldStrategy
---
.../teetime/framework/AbstractConsumerStage.java | 12 ------------
src/main/java/teetime/framework/Analysis.java | 8 +-------
.../framework/YieldStrategyConfiguration.java | 3 +--
3 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/src/main/java/teetime/framework/AbstractConsumerStage.java b/src/main/java/teetime/framework/AbstractConsumerStage.java
index 546ad69b..73286f9d 100644
--- a/src/main/java/teetime/framework/AbstractConsumerStage.java
+++ b/src/main/java/teetime/framework/AbstractConsumerStage.java
@@ -15,15 +15,10 @@
*/
package teetime.framework;
-import teetime.framework.idle.IdleStrategy;
-import teetime.framework.idle.YieldStrategy;
-
public abstract class AbstractConsumerStage<I> extends AbstractStage {
protected final InputPort<I> inputPort = this.createInputPort();
- private IdleStrategy idleStrategy = new YieldStrategy(); // FIXME remove this word-around
-
public final InputPort<I> getInputPort() {
return this.inputPort;
}
@@ -40,11 +35,4 @@ public abstract class AbstractConsumerStage<I> extends AbstractStage {
protected abstract void execute(I element);
- public IdleStrategy getIdleStrategy() {
- return idleStrategy;
- }
-
- public void setIdleStrategy(final IdleStrategy idleStrategy) {
- this.idleStrategy = idleStrategy;
- }
}
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index fc143e1b..63688607 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -100,13 +100,7 @@ public final class Analysis implements UncaughtExceptionHandler {
for (Stage stage : threadableStageJobs) {
switch (stage.getTerminationStrategy()) {
case BY_SIGNAL: {
- RunnableConsumerStage runnable;
- if (stage instanceof AbstractConsumerStage<?>) {
- runnable = new RunnableConsumerStage(stage, ((AbstractConsumerStage<?>) stage).getIdleStrategy()); // FIXME remove this word-around
- } else {
- runnable = new RunnableConsumerStage(stage);
- }
- final Thread thread = new Thread(runnable);
+ final Thread thread = new Thread(new RunnableConsumerStage(stage));
stage.setOwningThread(thread);
this.consumerThreads.add(thread);
break;
diff --git a/src/test/java/teetime/framework/YieldStrategyConfiguration.java b/src/test/java/teetime/framework/YieldStrategyConfiguration.java
index 5db4365a..4047b9a9 100644
--- a/src/test/java/teetime/framework/YieldStrategyConfiguration.java
+++ b/src/test/java/teetime/framework/YieldStrategyConfiguration.java
@@ -15,7 +15,6 @@
*/
package teetime.framework;
-import teetime.framework.idle.YieldStrategy;
import teetime.framework.pipe.IPipeFactory;
import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering;
import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication;
@@ -50,7 +49,7 @@ class YieldStrategyConfiguration extends AnalysisConfiguration {
Relay<Object> relay = new Relay<Object>();
CollectorSink<Object> collectorSink = new CollectorSink<Object>();
- relay.setIdleStrategy(new YieldStrategy());
+ // relay.setIdleStrategy(new YieldStrategy());
interThreadPipeFactory.create(producer.getOutputPort(), relay.getInputPort());
intraThreadPipeFactory.create(relay.getOutputPort(), collectorSink.getInputPort());
--
GitLab