Skip to content

las3_pub / jester

Go to a project
Commit 75bfd331 by Michael Schmid
Options

Minor changes and comments

parent db00ddd1
Inline Side-by-side
Showing with 210 additions and 76 deletions
src/main/java/mvd/jester/App.java
...@@ -5,6 +5,7 @@ import java.util.List; ...@@ -5,6 +5,7 @@ import java.util.List;
import mvd.jester.model.DagTask; import mvd.jester.model.DagTask;
import mvd.jester.model.SystemManager; import mvd.jester.model.SystemManager;
import mvd.jester.model.SystemManager.DagTaskBuilder; import mvd.jester.model.SystemManager.DagTaskBuilder;
import mvd.jester.model.SystemManager.DeadlineType;
import mvd.jester.tests.AbstractTest; import mvd.jester.tests.AbstractTest;
import mvd.jester.tests.JiangYi; import mvd.jester.tests.JiangYi;
import mvd.jester.tests.SchmidMottok; import mvd.jester.tests.SchmidMottok;
...@@ -26,7 +27,6 @@ public class App { ...@@ -26,7 +27,6 @@ public class App {
List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList(
new SchmidMottok(new UnknownStructure(), manager), // new SchmidMottok(new UnknownStructure(), manager), //
// new Tester(new UnknownStructure(),manager),
// new MelaniButtazzo(manager),, // new MelaniButtazzo(manager),,
// new FonsecaNelis(manager), // // new FonsecaNelis(manager), //
// new DongLiu(manager), // // new DongLiu(manager), //
...@@ -34,77 +34,38 @@ public class App { ...@@ -34,77 +34,38 @@ public class App {
new JiangYi(manager)// new JiangYi(manager)//
)); ));
te.varyRenyiUtilization(manager, tests, 200); te.varyRenyiUtilization(manager, tests, 200, DeadlineType.IMPLICIT);
} }
{ {
SystemManager<DagTaskBuilder> manager = SystemManager<DagTaskBuilder> manager =
new SystemManager<>(DagTaskBuilder.class); new SystemManager<>(DagTaskBuilder.class);
manager.setNumberOfProcessors(16); manager.setNumberOfProcessors(8);
TestEnvironment te = new TestEnvironment(); TestEnvironment te = new TestEnvironment();
List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( //
new SchmidMottok(new UnknownStructure(), manager), // new SchmidMottok(new UnknownStructure(), manager), //
// new Tester(new UnknownStructure(),manager), // new Tester(new UnknownStructure(), manager), //
// new MelaniButtazzo(manager),, // new MelaniButtazzo(manager), //
// new FonsecaNelis(manager), // // new FonsecaNelis(manager), //
// new DongLiu(manager), //
new UeterAgrawal(manager), // new UeterAgrawal(manager), //
new JiangYi(manager)// new JiangYi(manager)));
));
te.varyRenyiUtilization(manager, tests, 200); te.varyNumberOfProcessors(manager, tests, 200);
} }
{ {
SystemManager<DagTaskBuilder> manager = SystemManager<DagTaskBuilder> manager =
new SystemManager<>(DagTaskBuilder.class); new SystemManager<>(DagTaskBuilder.class);
manager.setNumberOfProcessors(32); manager.setNumberOfProcessors(8);
TestEnvironment te = new TestEnvironment(); TestEnvironment te = new TestEnvironment();
List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( //
new SchmidMottok(new UnknownStructure(), manager), // new SchmidMottok(new UnknownStructure(), manager), //
// new Tester(new UnknownStructure(),manager), // new MelaniButtazzo(manager), //
// new MelaniButtazzo(manager),,
// new FonsecaNelis(manager), // // new FonsecaNelis(manager), //
// new DongLiu(manager), //
new UeterAgrawal(manager), // new UeterAgrawal(manager), //
new JiangYi(manager)// new JiangYi(manager)));
));
te.varyRenyiUtilization(manager, tests, 200); te.varyNumberOfTasks(manager, tests, 200);
} }
// {
// SystemManager<DagTaskBuilder> manager = new
// SystemManager<>(DagTaskBuilder.class);
// manager.setNumberOfProcessors(8);
// TestEnvironment te = new TestEnvironment();
// List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( //
// // new SchmidMottok(new KnownStructure(), manager), //
// new SchmidMottok(new UnknownStructure(), manager), //
// // new Tester(new UnknownStructure(), manager), //
// // new MelaniButtazzo(manager), //
// new FonsecaNelis(manager), //
// new UeterAgrawal(manager), //
// new JiangYi(manager)));
// te.varyNumberOfProcessors(manager, tests, 200);
// }
// {
// SystemManager<DagTaskBuilder> manager = new
// SystemManager<>(DagTaskBuilder.class);
// manager.setNumberOfProcessors(8);
// TestEnvironment te = new TestEnvironment();
// List<AbstractTest<DagTask>> tests = te.registerTests(Arrays.asList( //
// // new SchmidMottok(new KnownStructure(), manager), //
// new SchmidMottok(new UnknownStructure(), manager), //
// // new Tester(new UnknownStructure(), manager), //
// // new MelaniButtazzo(manager), //
// new FonsecaNelis(manager), //
// new UeterAgrawal(manager), //
// new JiangYi(manager)));
// te.varyNumberOfTasks(manager, tests, 200);
// }
} }
} }
src/main/java/mvd/jester/TestEnvironment.java
...@@ -16,12 +16,14 @@ import mvd.jester.model.SynchronousTask; ...@@ -16,12 +16,14 @@ import mvd.jester.model.SynchronousTask;
import mvd.jester.model.SystemManager; import mvd.jester.model.SystemManager;
import mvd.jester.model.Task; import mvd.jester.model.Task;
import mvd.jester.model.SystemManager.DagTaskBuilder; import mvd.jester.model.SystemManager.DagTaskBuilder;
import mvd.jester.model.SystemManager.DeadlineType;
import mvd.jester.model.SystemManager.SynchronousTaskBuilder; import mvd.jester.model.SystemManager.SynchronousTaskBuilder;
import mvd.jester.priority.PriorityManager; import mvd.jester.priority.PriorityManager;
import mvd.jester.tests.AbstractTest; import mvd.jester.tests.AbstractTest;
/** /**
* TestEnvironment * TestEnvironment
* This class is responsible for running the evaluations on multiple task sets
*/ */
public class TestEnvironment { public class TestEnvironment {
...@@ -33,7 +35,13 @@ public class TestEnvironment { ...@@ -33,7 +35,13 @@ public class TestEnvironment {
return new ArrayList<>(tests); return new ArrayList<>(tests);
} }
/***
* OUTDATED: For Parallel Synchronous Task model
* @param builder
* @param abstractTestInstances
* @param numberOfProcessors
* @param numberOfTaskSets
*/
public void runExperiments(final SynchronousTaskBuilder builder, public void runExperiments(final SynchronousTaskBuilder builder,
final Set<ResultCollector<AbstractTest<SynchronousTask>>> abstractTestInstances, final Set<ResultCollector<AbstractTest<SynchronousTask>>> abstractTestInstances,
final long numberOfProcessors, final long numberOfTaskSets) { final long numberOfProcessors, final long numberOfTaskSets) {
...@@ -78,6 +86,12 @@ public class TestEnvironment { ...@@ -78,6 +86,12 @@ public class TestEnvironment {
// resultLogger.logTests(abstractTestInstances); // resultLogger.logTests(abstractTestInstances);
} }
/***
* Measure the performance of each test
* @param manager SystemManager that is used to generate random task sets
* @param abstractTestInstances List of feasibility tests
* @param numberOfMeasurements Number of measurements performed for each test
*/
public void measureExecutionTimes(final SystemManager<DagTaskBuilder> manager, public void measureExecutionTimes(final SystemManager<DagTaskBuilder> manager,
final List<AbstractTest<DagTask>> abstractTestInstances, final List<AbstractTest<DagTask>> abstractTestInstances,
final long numberOfMeasurements) { final long numberOfMeasurements) {
...@@ -108,6 +122,12 @@ public class TestEnvironment { ...@@ -108,6 +122,12 @@ public class TestEnvironment {
} }
/***
* Computes the feasibility varying the number of processors in the systen
* @param manager SystemManager that is used to generate task sets
* @param abstractTestInstances List of feasibility tests
* @param numberOfTaskSetsPerStep Number of task sets that are to be generated for each step (number of processors)
*/
public void varyNumberOfProcessors(final SystemManager<DagTaskBuilder> manager, public void varyNumberOfProcessors(final SystemManager<DagTaskBuilder> manager,
final List<AbstractTest<DagTask>> abstractTestInstances, final List<AbstractTest<DagTask>> abstractTestInstances,
final long numberOfTaskSetsPerStep) { final long numberOfTaskSetsPerStep) {
...@@ -124,7 +144,7 @@ public class TestEnvironment { ...@@ -124,7 +144,7 @@ public class TestEnvironment {
resultMap.replaceAll((k, v) -> (long) 0); resultMap.replaceAll((k, v) -> (long) 0);
for (int i = 0; i < numberOfTaskSetsPerStep; ++i) { for (int i = 0; i < numberOfTaskSetsPerStep; ++i) {
final Set<DagTask> taskSet = manager.getBuilder().generateUUnifastTaskSet( final Set<DagTask> taskSet = manager.getBuilder().generateUUnifastTaskSet(
(long) (1.5 * numberOfProcessors), (double) numberOfProcessors * 0.75); (long) (1.5*numberOfProcessors), (double) numberOfProcessors * 0.75);
System.out.print(checkedTasksets + "/" + numberOfTaskSets + " tasksets tested!\r"); System.out.print(checkedTasksets + "/" + numberOfTaskSets + " tasksets tested!\r");
for (final AbstractTest<DagTask> testInstance : abstractTestInstances) { for (final AbstractTest<DagTask> testInstance : abstractTestInstances) {
...@@ -149,7 +169,12 @@ public class TestEnvironment { ...@@ -149,7 +169,12 @@ public class TestEnvironment {
resultLogger.finalize(); resultLogger.finalize();
} }
/***
* Computes the feasibility varying the number of tasks in the task set
* @param manager SystemManager that is used to generate task sets
* @param abstractTestInstances List of feasibility tests
* @param numberOfTaskSetsPerStep Number of task sets that are to be generated for each step (number of tasks)
*/
public void varyNumberOfTasks(final SystemManager<DagTaskBuilder> manager, public void varyNumberOfTasks(final SystemManager<DagTaskBuilder> manager,
final List<AbstractTest<DagTask>> abstractTestInstances, final List<AbstractTest<DagTask>> abstractTestInstances,
final long numberOfTaskSetsPerStep) { final long numberOfTaskSetsPerStep) {
...@@ -191,6 +216,12 @@ public class TestEnvironment { ...@@ -191,6 +216,12 @@ public class TestEnvironment {
resultLogger.finalize(); resultLogger.finalize();
} }
/***
* Computes the feasibility varying the total system utilization of the task set
* @param manager SystemManager that is used to generate task sets
* @param abstractTestInstances List of feasibility tests
* @param numberOfTaskSetsPerUtil Number of task sets that are to be generated for each step (system utilization)
*/
public void varyUtilization(final SystemManager<DagTaskBuilder> manager, public void varyUtilization(final SystemManager<DagTaskBuilder> manager,
final List<AbstractTest<DagTask>> abstractTestInstances, final List<AbstractTest<DagTask>> abstractTestInstances,
final long numberOfTaskSetsPerUtil) { final long numberOfTaskSetsPerUtil) {
...@@ -231,9 +262,16 @@ public class TestEnvironment { ...@@ -231,9 +262,16 @@ public class TestEnvironment {
resultLogger.finalize(); resultLogger.finalize();
} }
/***
* Computes the feasibility varying the total system utilization of the task set (Task set is generated by the Renyi method)
* @param manager SystemManager that is used to generate task sets
* @param abstractTestInstances List of feasibility tests
* @param numberOfTaskSetsPerUtil Number of task sets that are to be generated for each step (system utilization)
* @param deadlineType Deadline model (implicit or constrained)
*/
public void varyRenyiUtilization(final SystemManager<DagTaskBuilder> manager, public void varyRenyiUtilization(final SystemManager<DagTaskBuilder> manager,
final List<AbstractTest<DagTask>> abstractTestInstances, final List<AbstractTest<DagTask>> abstractTestInstances,
final long numberOfTaskSetsPerUtil) { final long numberOfTaskSetsPerUtil, DeadlineType deadlineType) {
final long numberOfProcessors = manager.getNumberOfProcessors(); final long numberOfProcessors = manager.getNumberOfProcessors();
long checkedTasksets = 0; long checkedTasksets = 0;
final long numberOfTaskSets = ((numberOfProcessors * 4) - 3) * numberOfTaskSetsPerUtil; final long numberOfTaskSets = ((numberOfProcessors * 4) - 3) * numberOfTaskSetsPerUtil;
...@@ -248,7 +286,7 @@ public class TestEnvironment { ...@@ -248,7 +286,7 @@ public class TestEnvironment {
(double) numberOfProcessors / 32) { (double) numberOfProcessors / 32) {
resultMap.replaceAll((k, v) -> (long) 0); resultMap.replaceAll((k, v) -> (long) 0);
for (int i = 0; i < numberOfTaskSetsPerUtil; ++i) { for (int i = 0; i < numberOfTaskSetsPerUtil; ++i) {
final Set<DagTask> taskSet = manager.getBuilder().generateRenyiTaskSet(util); final Set<DagTask> taskSet = manager.getBuilder().generateRenyiTaskSet(util, deadlineType);
System.out.print(checkedTasksets + "/" + numberOfTaskSets + " tasksets tested!\r"); System.out.print(checkedTasksets + "/" + numberOfTaskSets + " tasksets tested!\r");
for (final AbstractTest<DagTask> testInstance : abstractTestInstances) { for (final AbstractTest<DagTask> testInstance : abstractTestInstances) {
...@@ -273,6 +311,13 @@ public class TestEnvironment { ...@@ -273,6 +311,13 @@ public class TestEnvironment {
resultLogger.finalize(); resultLogger.finalize();
} }
/***
* Computes the feasibility varying the probability in the Renyi method the task set (Task set is generated by the Renyi method)
* @param manager SystemManager that is used to generate task sets
* @param abstractTestInstances List of feasibility tests
* @param numberOfTaskSetsPerStep Number of task sets that are to be generated for each step (probability)
*/
public void varyPropability(final SystemManager<DagTaskBuilder> manager, public void varyPropability(final SystemManager<DagTaskBuilder> manager,
final List<AbstractTest<DagTask>> abstractTestInstances, final List<AbstractTest<DagTask>> abstractTestInstances,
final long numberOfTaskSetsPerStep) { final long numberOfTaskSetsPerStep) {
...@@ -288,7 +333,7 @@ public class TestEnvironment { ...@@ -288,7 +333,7 @@ public class TestEnvironment {
manager.setPropability(p_add); manager.setPropability(p_add);
resultMap.replaceAll((k, v) -> (long) 0); resultMap.replaceAll((k, v) -> (long) 0);
for (int i = 0; i < numberOfTaskSetsPerStep; ++i) { for (int i = 0; i < numberOfTaskSetsPerStep; ++i) {
final Set<DagTask> taskSet = manager.getBuilder().generateRenyiTaskSet(5.5); final Set<DagTask> taskSet = manager.getBuilder().generateRenyiTaskSet(5.5, DeadlineType.IMPLICIT);
System.out.print(checkedTasksets + "/" + numberOfTaskSets + " tasksets tested!\r"); System.out.print(checkedTasksets + "/" + numberOfTaskSets + " tasksets tested!\r");
for (final AbstractTest<DagTask> testInstance : abstractTestInstances) { for (final AbstractTest<DagTask> testInstance : abstractTestInstances) {
......
src/main/java/mvd/jester/model/SystemManager.java
...@@ -17,7 +17,7 @@ import mvd.jester.utils.DagUtils; ...@@ -17,7 +17,7 @@ import mvd.jester.utils.DagUtils;
import mvd.jester.model.SystemManager.Builder; import mvd.jester.model.SystemManager.Builder;
/** /**
* TaskSet * The SystemManager is a class to generate random task sets (either Dag Tasks or Synchronous Tasks depending on the specified Builder)
*/ */
public class SystemManager<T extends Builder> implements SystemManagerInterface { public class SystemManager<T extends Builder> implements SystemManagerInterface {
...@@ -53,6 +53,12 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -53,6 +53,12 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return builder; return builder;
} }
public enum DeadlineType {
CONSTRAINED,
IMPLICIT
}
public static interface Builder { public static interface Builder {
public long getNumberOfProcessors(); public long getNumberOfProcessors();
...@@ -62,6 +68,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -62,6 +68,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
public Builder setPropability(long p); public Builder setPropability(long p);
} }
/**
* OUTDATED
* Task builder for Parallel Synchronous Task model
*/
public static class SynchronousTaskBuilder implements Builder { public static class SynchronousTaskBuilder implements Builder {
private long numberOfProcessors = 4; private long numberOfProcessors = 4;
private long minPeriod = 100; private long minPeriod = 100;
...@@ -182,6 +192,9 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -182,6 +192,9 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
} }
} }
/**
* Task builder for DAG Task model
*/
public static class DagTaskBuilder implements Builder { public static class DagTaskBuilder implements Builder {
private long numberOfProcessors = 8; private long numberOfProcessors = 8;
private long minimumWcet = 1; private long minimumWcet = 1;
...@@ -203,12 +216,18 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -203,12 +216,18 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return ThreadLocalRandom.current().nextLong(0, 100); return ThreadLocalRandom.current().nextLong(0, 100);
} }
public Set<DagTask> generateRenyiTaskSet(final double totalUtilization) { /***
* Generates a random task set according to the UUniFast method for utilization and Renyi method for the DAG structure
* @param totalUtilization Total system utilization of the task set
* @param deadlineType Deadline model (implicit or constrained)
* @return Randomly generated task set
*/
public Set<DagTask> generateRenyiTaskSet(final double totalUtilization, DeadlineType deadlineType) {
final LinkedHashSet<DagTask> taskSet = new LinkedHashSet<>(); final LinkedHashSet<DagTask> taskSet = new LinkedHashSet<>();
double currentUtilization = 0; double currentUtilization = 0;
while (currentUtilization <= totalUtilization) { while (currentUtilization <= totalUtilization) {
final DagTask task = generateRenyiTask(totalUtilization); final DagTask task = generateRenyiTask(totalUtilization, deadlineType);
if (currentUtilization + task.getUtilization() < totalUtilization) { if (currentUtilization + task.getUtilization() < totalUtilization) {
currentUtilization += task.getUtilization(); currentUtilization += task.getUtilization();
...@@ -218,12 +237,17 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -218,12 +237,17 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
final long period = (long) Math.ceil(task.getWorkload() / remainingUtilization); final long period = (long) Math.ceil(task.getWorkload() / remainingUtilization);
final long criticalPath = task.getCriticalPath(); final long criticalPath = task.getCriticalPath();
if (period >= criticalPath) { if (period >= criticalPath) {
final long deadline = randomNumberInRange( final long deadline;
criticalPath + (period - criticalPath) / 4, period); // TODO: switch (deadlineType) {
// deadline = case CONSTRAINED:
// period? deadline = randomNumberInRange(
criticalPath + (period - criticalPath) / 4, period);
// final long deadline = period; break;
case IMPLICIT:
default:
deadline = period;
break;
}
long numberOfThreads = LongMath.divide(task.getWorkload() - criticalPath, long numberOfThreads = LongMath.divide(task.getWorkload() - criticalPath,
deadline - criticalPath, RoundingMode.CEILING); deadline - criticalPath, RoundingMode.CEILING);
...@@ -243,6 +267,12 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -243,6 +267,12 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return taskSet; return taskSet;
} }
/***
* Generates a random task set according to the UUniFast method
* @param numberOfTasks Number of tasks the set is supposed to have
* @param totalUtilization Total system utilization of the task set
* @return Randomly generated task set
*/
public Set<DagTask> generateUUnifastTaskSet(final long numberOfTasks, public Set<DagTask> generateUUnifastTaskSet(final long numberOfTasks,
final double totalUtilization) { final double totalUtilization) {
final LinkedHashSet<DagTask> taskSet = new LinkedHashSet<>(); final LinkedHashSet<DagTask> taskSet = new LinkedHashSet<>();
...@@ -263,6 +293,11 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -263,6 +293,11 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return taskSet; return taskSet;
} }
/**
* Generates a random task set with given total system utilization
* @param totalUtilization Total system utilization of the task set
* @return Randomly generated task set
*/
public Set<DagTask> generateTaskSet(final double totalUtilization) { public Set<DagTask> generateTaskSet(final double totalUtilization) {
final LinkedHashSet<DagTask> taskSet = new LinkedHashSet<>(); final LinkedHashSet<DagTask> taskSet = new LinkedHashSet<>();
double currentUtilization = 0; double currentUtilization = 0;
...@@ -288,6 +323,11 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -288,6 +323,11 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return taskSet; return taskSet;
} }
/***
* Generate random DAG task with given utilization according to Renyi method
* @param utilization Utilization of the task that will be generated
* @return Randomly generated task
*/
public DagTask generateRenyiTaskForUUniFast(final double utilization) { public DagTask generateRenyiTaskForUUniFast(final double utilization) {
final DirectedAcyclicGraph<Job, DefaultEdge> jobDag = final DirectedAcyclicGraph<Job, DefaultEdge> jobDag =
new DirectedAcyclicGraph<>(DefaultEdge.class); new DirectedAcyclicGraph<>(DefaultEdge.class);
...@@ -315,7 +355,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -315,7 +355,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return new DagTask(jobDag, period, numberOfThreads); return new DagTask(jobDag, period, numberOfThreads);
} }
public DagTask generateRenyiTask(final double totalUtilization) { /***
* Generates a random DAG task according to the Renyi method
* @param totalUtilization Total system utilization
* @param deadlineType Deadline model (implicit or constrained)
* @return Randomly generated task
*/
public DagTask generateRenyiTask(final double totalUtilization, DeadlineType deadlineType) {
final DirectedAcyclicGraph<Job, DefaultEdge> jobDag = final DirectedAcyclicGraph<Job, DefaultEdge> jobDag =
new DirectedAcyclicGraph<>(DefaultEdge.class); new DirectedAcyclicGraph<>(DefaultEdge.class);
final long numberOfVertices = randomNumberInRange(50, 250); final long numberOfVertices = randomNumberInRange(50, 250);
...@@ -331,12 +377,17 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -331,12 +377,17 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
final long workload = DagUtils.calculateWorkload(jobDag); final long workload = DagUtils.calculateWorkload(jobDag);
final long criticalPath = DagUtils.calculateCriticalPath(jobDag); final long criticalPath = DagUtils.calculateCriticalPath(jobDag);
final long period = randomRenyiPeriod(workload, criticalPath, totalUtilization); final long period = randomRenyiPeriod(workload, criticalPath, totalUtilization);
final long deadline =
randomNumberInRange(criticalPath + (period - criticalPath) / 4, period); // TODO:
// oder
// period?
// final long deadline = period; final long deadline;
switch (deadlineType) {
case CONSTRAINED:
deadline = randomNumberInRange(criticalPath + (period - criticalPath) / 4, period); // TODO:
break;
case IMPLICIT:
default:
deadline = period;
break;
}
final long numberOfThreads = LongMath.divide(workload - criticalPath, final long numberOfThreads = LongMath.divide(workload - criticalPath,
deadline - criticalPath, RoundingMode.CEILING); deadline - criticalPath, RoundingMode.CEILING);
...@@ -348,6 +399,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -348,6 +399,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return new DagTask(jobDag, period, deadline, numberOfThreads); return new DagTask(jobDag, period, deadline, numberOfThreads);
} }
/***
* Generate random period according to Renyi method
* @param workload Workload of the task
* @param criticalPath Critical Path of the task
* @param totalUtilization Total system utilization
* @return Period
*/
private long randomRenyiPeriod(final long workload, final long criticalPath, private long randomRenyiPeriod(final long workload, final long criticalPath,
final double totalUtilization) { final double totalUtilization) {
final double firstPart = final double firstPart =
...@@ -358,6 +416,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -358,6 +416,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return (long) Math.ceil(firstPart * secondPart); return (long) Math.ceil(firstPart * secondPart);
} }
/***
* Add source and sink nodes the the DAG generated by the Renyi method
* @param jobDag Object holding the current DAG structure
*/
private void addSourceAndSink(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag) { private void addSourceAndSink(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag) {
final Multimap<Job, Job> edgePairs = ArrayListMultimap.create(); final Multimap<Job, Job> edgePairs = ArrayListMultimap.create();
Job source = new Job(randomNumberInRange(50, 100)); Job source = new Job(randomNumberInRange(50, 100));
...@@ -383,7 +445,11 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -383,7 +445,11 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
} }
} }
} }
/***
* Generates a random nested fork-join task with given utilization
* @param utilization Utilization of the task
* @return randomly generated Task
*/
public DagTask generateTask(double utilization) { public DagTask generateTask(double utilization) {
final DirectedAcyclicGraph<Job, DefaultEdge> jobDag = final DirectedAcyclicGraph<Job, DefaultEdge> jobDag =
new DirectedAcyclicGraph<>(DefaultEdge.class); new DirectedAcyclicGraph<>(DefaultEdge.class);
...@@ -399,6 +465,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -399,6 +465,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return new DagTask(jobDag, period, numberOfProcessors); return new DagTask(jobDag, period, numberOfProcessors);
} }
/***
* Generates a random nested fork-join task
* @return Randomly generated task
*/
public DagTask generateTask() { public DagTask generateTask() {
final DirectedAcyclicGraph<Job, DefaultEdge> jobDag = final DirectedAcyclicGraph<Job, DefaultEdge> jobDag =
new DirectedAcyclicGraph<>(DefaultEdge.class); new DirectedAcyclicGraph<>(DefaultEdge.class);
...@@ -418,6 +488,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -418,6 +488,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return new DagTask(jobDag, period, numberOfThreads); return new DagTask(jobDag, period, numberOfThreads);
} }
/***
* Function for joining the DAG that was partly generated by fork
* @param jobDag Object holding the current DAG structure
* @param current The fork node
* @param childs The children/successors of the fork-node
* @return returns the fork node (@param current)
*/
private Job join(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag, final Job current, private Job join(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag, final Job current,
final Set<Job> childs) { final Set<Job> childs) {
if (childs.size() > 0) { if (childs.size() > 0) {
...@@ -435,6 +512,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -435,6 +512,13 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return current; return current;
} }
/***
* Function for creating nested fork/join DAGs
* @param jobDag Object holding the current DAG structure
* @param predecessor fork node
* @param depth maximum depth of the nested fork-join structure
* @return the latest Job in the nested fork-join structure
*/
private Job fork(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag, private Job fork(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag,
final Optional<Job> predecessor, final long depth) { final Optional<Job> predecessor, final long depth) {
final Job job = new Job(randomWcet()); final Job job = new Job(randomWcet());
...@@ -457,6 +541,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -457,6 +541,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
return join(jobDag, job, childs); return join(jobDag, job, childs);
} }
/***
* Generate random edges
* @param jobDag
*/
private void randomEdges(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag) { private void randomEdges(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag) {
final Multimap<Job, Job> edgePairs = ArrayListMultimap.create(); final Multimap<Job, Job> edgePairs = ArrayListMultimap.create();
for (final Job j1 : jobDag) { for (final Job j1 : jobDag) {
...@@ -476,6 +564,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface ...@@ -476,6 +564,10 @@ public class SystemManager<T extends Builder> implements SystemManagerInterface
} }
} }
/***
* Generate random edges according to Renyi DAG generation method
* @param jobDag
*/
private void randomEdgesRenyi(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag) { private void randomEdgesRenyi(final DirectedAcyclicGraph<Job, DefaultEdge> jobDag) {
final Multimap<Job, Job> edgePairs = ArrayListMultimap.create(); final Multimap<Job, Job> edgePairs = ArrayListMultimap.create();
for (final Job j1 : jobDag) { for (final Job j1 : jobDag) {
......
src/main/java/mvd/jester/tests/FonsecaNelis.java
...@@ -31,6 +31,10 @@ import mvd.jester.utils.BinaryDecompositionTree; ...@@ -31,6 +31,10 @@ import mvd.jester.utils.BinaryDecompositionTree;
import mvd.jester.utils.BinaryDecompositionTree.Node; import mvd.jester.utils.BinaryDecompositionTree.Node;
import mvd.jester.utils.BinaryDecompositionTree.NodeType; import mvd.jester.utils.BinaryDecompositionTree.NodeType;
/***
* Response time analysis presented by Fonseca et al.
* " Improved Response Time Analysis of Sporadic DAG Tasks for Global FP Scheduling"
*/
public class FonsecaNelis extends AbstractTest<DagTask> { public class FonsecaNelis extends AbstractTest<DagTask> {
private final Map<Task, TerminationInfo> responseTimes; private final Map<Task, TerminationInfo> responseTimes;
......
src/main/java/mvd/jester/tests/JiangYi.java
...@@ -17,6 +17,10 @@ import mvd.jester.model.Task; ...@@ -17,6 +17,10 @@ import mvd.jester.model.Task;
import mvd.jester.priority.EarliestDeadlineFirst; import mvd.jester.priority.EarliestDeadlineFirst;
import mvd.jester.priority.PriorityManager; import mvd.jester.priority.PriorityManager;
/***
* Semi-Federated Scheduling presented by Jiang et al.
* "Semi-Federated Scheduling of Parallel Real-Time Tasks on Multiprocessor"
*/
public class JiangYi extends AbstractTest<DagTask> { public class JiangYi extends AbstractTest<DagTask> {
private final EarliestDeadlineFirst priorityManager; private final EarliestDeadlineFirst priorityManager;
......
src/main/java/mvd/jester/tests/MelaniButtazzo.java
...@@ -14,6 +14,10 @@ import mvd.jester.model.Task; ...@@ -14,6 +14,10 @@ import mvd.jester.model.Task;
import mvd.jester.priority.PriorityManager; import mvd.jester.priority.PriorityManager;
import mvd.jester.priority.RateMonotonic; import mvd.jester.priority.RateMonotonic;
/***
* Response time analysis presented by Melani et al.
* "Response-Time Analysis of Conditional DAG Tasks in Multiprocessor Systems"
*/
public class MelaniButtazzo extends AbstractTest<DagTask> { public class MelaniButtazzo extends AbstractTest<DagTask> {
private final Map<Task, TerminationInfo> responseTimes; private final Map<Task, TerminationInfo> responseTimes;
......
src/main/java/mvd/jester/tests/SchmidMottok.java
...@@ -15,7 +15,7 @@ import mvd.jester.priority.DeadlineMonotonic; ...@@ -15,7 +15,7 @@ import mvd.jester.priority.DeadlineMonotonic;
import mvd.jester.priority.PriorityManager; import mvd.jester.priority.PriorityManager;
/** /**
* SchmidMottok * Our response time analysis
*/ */
public class SchmidMottok extends AbstractTest<DagTask> { public class SchmidMottok extends AbstractTest<DagTask> {
...@@ -52,6 +52,10 @@ public class SchmidMottok extends AbstractTest<DagTask> { ...@@ -52,6 +52,10 @@ public class SchmidMottok extends AbstractTest<DagTask> {
return "SchmidMottok" + "_" + structure.getType(); return "SchmidMottok" + "_" + structure.getType();
} }
/***
* Computes the number of threads for each task
* @param tasks The set of tasks
*/
private void reassignNumberOfThreads(Set<DagTask> tasks) { private void reassignNumberOfThreads(Set<DagTask> tasks) {
long numberOfProcessors = manager.getNumberOfProcessors(); long numberOfProcessors = manager.getNumberOfProcessors();
long occupiedProcessors = 0; long occupiedProcessors = 0;
...@@ -65,6 +69,12 @@ public class SchmidMottok extends AbstractTest<DagTask> { ...@@ -65,6 +69,12 @@ public class SchmidMottok extends AbstractTest<DagTask> {
} }
} }
/***
* Computes the response time for given task
* @param tasks Set of tasks in the system
* @param task Task for which the response time is computed
* @return Response time of task
*/
private long calculateResponseTime(final Set<DagTask> tasks, final DagTask task) { private long calculateResponseTime(final Set<DagTask> tasks, final DagTask task) {
final long minimumWcet = task.getCriticalPath(); final long minimumWcet = task.getCriticalPath();
long responseTime = minimumWcet; long responseTime = minimumWcet;
......
src/main/java/mvd/jester/tests/TypeFunction.java
...@@ -9,6 +9,10 @@ import mvd.jester.model.Segment; ...@@ -9,6 +9,10 @@ import mvd.jester.model.Segment;
import mvd.jester.model.SystemManagerInterface; import mvd.jester.model.SystemManagerInterface;
import mvd.jester.model.Task; import mvd.jester.model.Task;
/***
* Different methods given if the structure of the DAG is known in advance.
* Only UnknownStructure is presented in the paper.
*/
public interface TypeFunction { public interface TypeFunction {
public double getTaskInterference(final DagTask task, public double getTaskInterference(final DagTask task,
...@@ -79,6 +83,9 @@ public interface TypeFunction { ...@@ -79,6 +83,9 @@ public interface TypeFunction {
} }
} }
/***
* This class is presented in the paper
*/
public class UnknownStructure implements TypeFunction { public class UnknownStructure implements TypeFunction {
@Override @Override
......
src/main/java/mvd/jester/tests/UeterAgrawal.java
...@@ -18,6 +18,10 @@ import mvd.jester.model.Task; ...@@ -18,6 +18,10 @@ import mvd.jester.model.Task;
import mvd.jester.priority.EarliestDeadlineFirst; import mvd.jester.priority.EarliestDeadlineFirst;
import mvd.jester.priority.PriorityManager; import mvd.jester.priority.PriorityManager;
/***
* Reservation-based federated scheduling presented by Ueter et al.
* "Reservation-Based Federated Scheduling for Parallel Real-Time Tasks"
*/
public class UeterAgrawal extends AbstractTest<DagTask> { public class UeterAgrawal extends AbstractTest<DagTask> {
private final EarliestDeadlineFirst priorityManager; private final EarliestDeadlineFirst priorityManager;
...@@ -101,7 +105,6 @@ public class UeterAgrawal extends AbstractTest<DagTask> { ...@@ -101,7 +105,6 @@ public class UeterAgrawal extends AbstractTest<DagTask> {
final long second = (long) Math final long second = (long) Math
.ceil(((double) workload - criticalPath) / (criticalPath * (strechRatio - 1))); .ceil(((double) workload - criticalPath) / (criticalPath * (strechRatio - 1)));
// TODO: what are those boundaries?
final long max = Math.max(first, second); final long max = Math.max(first, second);
return max; return max;
...@@ -160,6 +163,10 @@ public class UeterAgrawal extends AbstractTest<DagTask> { ...@@ -160,6 +163,10 @@ public class UeterAgrawal extends AbstractTest<DagTask> {
} }
} }
/***
* Assigns threads and the stretch ratio to each task
* @param tasks Set of tasks in the system
*/
private void assignThreadsAndStretchRatio(Set<DagTask> tasks) { private void assignThreadsAndStretchRatio(Set<DagTask> tasks) {
for (DagTask t : tasks) { for (DagTask t : tasks) {
final long criticalPath = t.getCriticalPath(); final long criticalPath = t.getCriticalPath();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment