Added option to ignore environment issues and rewrote part of the generation scripts for easier generator creation.

1 files changed, 12 insertions, 18 deletions

diff --git a/gen/edf_generators.py b/gen/edf_generators.py
index c7267f7..9bf6b8f 100644
--- a/gen/edf_generators.py
+++ b/gen/edf_generators.py
@@ -1,15 +1,20 @@
 import generator as gen
 import random
-import schedcat.generator.tasks as tasks
+
+TP_TBASE = """#for $t in $task_set
+{} $t.cost $t.period
+#end for"""
+TP_GLOB_TASK = TP_TBASE.format("")
+TP_PART_TASK = TP_TBASE.format("-p $t.cpu")
 
 class EdfGenerator(gen.Generator):
     '''Creates sporadic task sets with the most common Litmus options.'''
     def __init__(self, name, templates, options, params):
         super(EdfGenerator, self).__init__(name, templates,
-                                           self.__make_options(params) + options,
+                                           self.__make_options() + options,
                                            params)
 
-    def __make_options(self, params):
+    def __make_options(self):
         '''Return generic EDF options.'''
         return [gen.Generator._dist_option('utils', ['uni-medium'],
                                            gen.NAMED_UTILIZATIONS,
@@ -26,23 +31,12 @@ class EdfGenerator(gen.Generator):
         udist = self._create_dist('utilization',
                                   exp_params['utils'],
                                   gen.NAMED_UTILIZATIONS)
-        tg = tasks.TaskGenerator(period=pdist, util=udist)
 
-        ts = []
-        tries = 0
-        while len(ts) != exp_params['num_tasks'] and tries < 5:
-            ts = tg.make_task_set(max_tasks = exp_params['num_tasks'])
-            tries += 1
-        if len(ts) != exp_params['num_tasks']:
-            print("Failed to create task set with parameters: %s" % exp_params)
+        ts = self._create_taskset(exp_params, pdist, udist)
 
         self._customize(ts, exp_params)
 
-        exp_params['task_set'] = ts
-        self._write_schedule(exp_params)
-
-        del exp_params['task_set']
-        del exp_params['num_tasks']
+        self._write_schedule(dict(exp_params.items() + ('task_set', ts)))
         self._write_params(exp_params)
 
     def _customize(self, taskset, exp_params):
@@ -53,7 +47,7 @@ class EdfGenerator(gen.Generator):
 class PartitionedGenerator(EdfGenerator):
     def __init__(self, name, templates, options, params):
         super(PartitionedGenerator, self).__init__(name,
-            templates + [gen.TP_PART_TASK], options, params)
+            templates + [TP_PART_TASK], options, params)
 
     def _customize(self, taskset, exp_params):
         start = 1 if exp_params['release_master'] else 0
@@ -78,5 +72,5 @@ class CedfGenerator(PartitionedGenerator):
 
 class GedfGenerator(EdfGenerator):
     def __init__(self, params={}):
-        super(GedfGenerator, self).__init__("GSN-EDF", [gen.TP_GLOB_TASK],
+        super(GedfGenerator, self).__init__("GSN-EDF", [TP_GLOB_TASK],
                                             [], params)