Created infrastructure for calculating scaling factors.

3 files changed, 4 insertions, 7 deletions

diff --git a/gen/__init__.py b/gen/__init__.py
index 803bb37..dbc7b12 100644
--- a/gen/__init__.py
+++ b/gen/__init__.py
@@ -6,4 +6,4 @@ gen.register_generator("G-EDF", edf.GedfGenerator)
 gen.register_generator("P-EDF", edf.PedfGenerator)
 gen.register_generator("C-EDF", edf.CedfGenerator)
 gen.register_generator("MC", mc.McGenerator)
-gen.register_generator("Color-MC", mc.ColorMcGenerator)
+gen.register_generator("COLOR-MC", mc.ColorMcGenerator)
diff --git a/gen/generator.py b/gen/generator.py
index 1205490..693e52f 100644
--- a/gen/generator.py
+++ b/gen/generator.py
@@ -77,7 +77,7 @@ class Generator(object):
 
     def __make_options(self, params):
         '''Return generic Litmus options.'''
-        return [GenOption('num_tasks', int,
+        return [GenOption('tasks', int,
                           range(self.cpus, 5*self.cpus, self.cpus),
                           'Number of tasks per experiment.'),
                 GenOption('cpus', int, [self.cpus],
diff --git a/gen/mc_generators.py b/gen/mc_generators.py
index bbb1ab9..704bcc3 100644
--- a/gen/mc_generators.py
+++ b/gen/mc_generators.py
@@ -256,7 +256,7 @@ COLOR_TYPES = ['scheduling', 'locking', 'unmanaged']
 
 class ColorMcGenerator(McGenerator):
     def __init__(self, params = {}):
-        super(ColorMcGenerator, self).__init__("COLOR-MC",
+        super(ColorMcGenerator, self).__init__("MC",
             templates=[TP_TYPE, TP_CHUNK, TP_COLOR_B, TP_COLOR_C],
             options=self.__make_options(),
             params=self.__extend_params(params))
@@ -313,10 +313,7 @@ class ColorMcGenerator(McGenerator):
                           'System page size.'),
                 GenOption('wss', [float, int], [.5],
                           'Task working set sizes. Can be expressed as a fraction ' +
-                          'of the cache.'),
-                GenOption('align_unmanaged', [True, False], [True],
-                          'Place all working sets of unmanaged task systems in '+
-                          'the same location, for maximum interference.')]
+                          'of the cache.')]
 
 
     def __get_wss_pages(self, params):