Made default generator behavior more intuitive.

GenOption defaults can be specified as a single value in addition to a list
of values. PartitionedEdfGenerator's now use worst-fit partitioning for the
most even distribution of tasks.

2 files changed, 25 insertions, 10 deletions

diff --git a/gen/edf_generators.py b/gen/edf_generators.py
index 3f05b76..a722c21 100644
--- a/gen/edf_generators.py
+++ b/gen/edf_generators.py
@@ -16,10 +16,10 @@ class EdfGenerator(gen.Generator):
 
     def __make_options(self):
         '''Return generic EDF options.'''
-        return [gen.Generator._dist_option('utils', ['uni-medium'],
+        return [gen.Generator._dist_option('utils', 'uni-medium',
                                            gen.NAMED_UTILIZATIONS,
                                            'Task utilization distributions.'),
-                gen.Generator._dist_option('periods', ['harmonic'],
+                gen.Generator._dist_option('periods', 'harmonic',
                                            gen.NAMED_PERIODS,
                                            'Task period distributions.')]
 
@@ -50,10 +50,22 @@ class PartitionedGenerator(EdfGenerator):
             templates + [TP_PART_TASK], options, params)
 
     def _customize(self, taskset, exp_params):
-        start = 1 if exp_params['release_master'] else 0
-        # Random partition for now: could do a smart partitioning
+        cpus  = exp_params['cpus']
+        start = 0
+        if exp_params['release_master']:
+            cpus -= 1
+            start = 1
+
+        # Partition using worst-fit for most even distribution
+        utils = [0]*cpus
+        tasks = [0]*cpus
         for t in taskset:
-            t.cpu = random.randint(start, exp_params['cpus'] - 1)
+            t.cpu = utils.index(min(utils))
+            utils[t.cpu] += t.utilization()
+            tasks[t.cpu] += 1
+
+            # Increment by one so release master has no tasks
+            t.cpu += start
 
 class PedfGenerator(PartitionedGenerator):
     def __init__(self, params={}):
@@ -61,7 +73,7 @@ class PedfGenerator(PartitionedGenerator):
 
 class CedfGenerator(PartitionedGenerator):
     TP_CLUSTER = "plugins/C-EDF/cluster{$level}"
-    CLUSTER_OPTION = gen.GenOption('level', ['L2', 'L3', 'All'], ['L2'],
+    CLUSTER_OPTION = gen.GenOption('level', ['L2', 'L3', 'All'], 'L2',
                                    'Cache clustering level.',)
 
     def __init__(self, params={}):
diff --git a/gen/generator.py b/gen/generator.py
index f35a22b..6a07616 100644
--- a/gen/generator.py
+++ b/gen/generator.py
@@ -69,10 +69,10 @@ class Generator(object):
         else:
             cpus = num_cpus()
         try:
-            config = get_config_option("RELEASE_MASTER") and True
+            rm_config  = get_config_option("RELEASE_MASTER") and True
         except:
-            config = False
-        release_master = list(set([False, config]))
+            rm_config  = False
+        release_master = list(set([False, bool(rm_config)]))
 
 
         return [GenOption('tasks', int, range(cpus, 5*cpus, cpus),
@@ -147,7 +147,10 @@ class Generator(object):
         '''Set default parameter values and check that values are valid.'''
         for option in self.options:
             if option.name not in params:
-                params[option.name] = option.default
+                val = option.default
+                val = val if type(val) == type([]) else [val]
+
+                params[option.name] = val
             else:
                 option.hidden = True
             params[option.name] = self._check_value(option.name,