4 files changed, 35 insertions, 17 deletions

diff --git a/gen/edf_generators.py b/gen/edf_generators.py
index ca77556..bee0119 100644
--- a/gen/edf_generators.py
+++ b/gen/edf_generators.py
@@ -76,13 +76,14 @@ class EdfPgmGenerator(gen.Generator):
 
     def __make_options(self):
         '''Return generic EDF options.'''
-        return [gen.Generator._dist_option('period', ['uni-long'],
+        return [gen.Generator._dist_option('period', ['uni-moderate'],
                                            ecrts14.NAMED_PERIODS_US,
                                            'Task period distributions.'),
-                gen.Generator._dist_option('num_graphs', 'uni-medium',
+                gen.Generator._dist_option('num_graphs', ['uni-medium'],
                                            ecrts14.NAMED_NUM_GRAPHS,
                                            'Number of graphs.'),
-                gen.Generator._dist_option('depth_factor', ['uni-medium'],
+#                gen.Generator._dist_option('depth_factor', ['uni-medium'],
+                gen.Generator._dist_option('depth_factor', ['pipeline'],
                                            ecrts14.NAMED_HEIGHT_FACTORS,
                                            'Depth of graphs.'),
                 gen.Generator._dist_option('clustering', ['L1', 'L2', 'L3', 'ALL'],
@@ -94,25 +95,27 @@ class EdfPgmGenerator(gen.Generator):
                 gen.Generator._dist_option('node_placement', ['uniform'],
                                            ecrts14.NAMED_SHAPES,
                                            'The node placement of a graph.'),
-                gen.Generator._dist_option('fan_out', ['uniform_3'],
+#                gen.Generator._dist_option('fan_out', ['uniform_3'],
+                gen.Generator._dist_option('fan_out', ['none'],
                                            ecrts14.NAMED_FAN,
                                            'The number of out edges of a node.'),
                 gen.Generator._dist_option('fan_in_cap', [3],
                                            {}, 
                                            'The maximum number of in-edges of a node.'),
-                gen.Generator._dist_option('edge_distance', ['uniform_3'],
+#                gen.Generator._dist_option('edge_distance', ['uniform_3'],
+                gen.Generator._dist_option('edge_distance', ['none'],
                                            ecrts14.NAMED_EDGE_HOP,
                                            'The number of hops for an edge.'),
-                gen.Generator._dist_option('wss', ['uni-medium'],
+                gen.Generator._dist_option('wss', ['uni-light', 'uni-medium', 'uni-heavy'],
                                            ecrts14.NAMED_EDGE_WSS,
                                            'Working set size.'),
-                gen.Generator._dist_option('task_util', ['uni-light'],
+                gen.Generator._dist_option('task_util', ['uni-medium'],
                                            NAMED_UTILIZATIONS,
                                            'Task utilization.'),
-                gen.Generator._dist_option('polluters', [False, True],
+                gen.Generator._dist_option('polluters', [False],
                                            {},
                                            'Polluters.'),
-                gen.Generator._dist_option('job_splitting', [False, True],
+                gen.Generator._dist_option('job_splitting', [True],
                                            {},
                                            'Job splitting.'),
                 gen.Generator._dist_option('ovh_type', 'max',
@@ -121,7 +124,7 @@ class EdfPgmGenerator(gen.Generator):
                 gen.Generator._dist_option('heur_aggressiveness', 0.75,
                                            {},
                                            'heur_aggressiveness.'),
-                gen.Generator._dist_option('sys_util', [20.0, 16.0, 12.0, 9.0],
+                gen.Generator._dist_option('sys_util', [18.0, 13.0, 8.0],
                                            {},
                                            'Task set utilization.')]
 
@@ -256,6 +259,11 @@ class CflSplitPgmGenerator(EdfPgmGenerator):
         overheads = get_overheads(dp, dp.system)
         # do the partition here
         ts = partition.clear_partitioning(ts)
+
+        if overheads.consumer is not None:
+            for t in ts:
+                overheads.consumer.place_production(t)
+
         try:
             ts = PARTITION_METHOD[exp_params['partitions']](ts, graphs, subts, cluster_sz, dp.nr_clusters, dp.system, dp.heur_aggressiveness, overheads)
         except DidNotFit:
@@ -264,7 +272,7 @@ class CflSplitPgmGenerator(EdfPgmGenerator):
         # compute split factor
         working_ts = ts
         partitions = get_partitions(working_ts, dp.nr_clusters, cluster_sz)
-        do_splits = dp.job_splitting == 'True'
+        do_splits = dp.job_splitting
         is_srt_sched = split.compute_splits_nolock(overheads, False, working_ts, partitions, bypass_split = not do_splits)
 
         return True, working_ts
diff --git a/gen/generator.py b/gen/generator.py
index 7b254b5..7a994e9 100644
--- a/gen/generator.py
+++ b/gen/generator.py
@@ -389,8 +389,9 @@ class Generator(object):
             p = storage()
             p.partitioning = part
             p.clustering = clust
-            p.polluting = pol
-            p.splitting = splt
+            # convert from string to bool
+            p.polluting = True if pol == 'True' else False
+            p.splitting = True if splt == 'True' else False
             shared_params.append(p)
 
         for _dp in PgmDesignPointGenerator(exp):
@@ -419,6 +420,9 @@ class Generator(object):
                     created_dirs = []
                     tries += 1
 
+                    if tries > 1:
+                        print('Retrying...')
+
                     # Generate a task set
                     ts, graphs, subts = self._create_tasks(dp)
                     dp.tasks = len(ts)
@@ -435,6 +439,9 @@ class Generator(object):
                             dp.job_splitting = shp.splitting
 
                             # Create directory name from relevant parameters
+                            temp = dp.wss
+                            # slam the wss parameter to get a text-based name
+                            dp.wss = _dp.wss
                             dir_parts = []
                             dir_parts.append("sched=%s" % self.scheduler)
                             dir_parts.append("cluster=%s" % shp.clustering)
@@ -450,6 +457,8 @@ class Generator(object):
 
                             print("Generating %s" % dir_leaf)
 
+                            dp.wss = temp
+
                             if os.path.exists(dir_path):
                                 if force:
                                     sh.rmtree(dir_path)
@@ -482,6 +491,7 @@ class Generator(object):
                                 del _dp[PARAMS['trial']]
                         success = True
                     except Exception, e:
+                        print e
                         for d in created_dirs:
                             sh.rmtree(d)
                     if not success:
diff --git a/parse/sched.py b/parse/sched.py
index d773c8a..83004f2 100644
--- a/parse/sched.py
+++ b/parse/sched.py
@@ -13,7 +13,7 @@ from heapq import *
 
 class TimeTracker:
     '''Store stats for durations of time demarcated by sched_trace records.'''
-    def __init__(self, is_valid_duration = lambda x: True, delay_buffer_size = 1, max_pending = 100):
+    def __init__(self, is_valid_duration = lambda x: True, delay_buffer_size = 1, max_pending = -1):
         self.validator = is_valid_duration
         self.avg = self.max = self.num = 0
 
@@ -51,13 +51,13 @@ class TimeTracker:
         # Give up on some jobs if they've been hanging around too long.
         # While not strictly needed, it helps improve performance and
         # it is unlikey to cause too much trouble.
-        if(len(self.start_records) > self.max_pending):
+        if(self.max_pending >= 0 and len(self.start_records) > self.max_pending):
             to_discard = len(self.start_records) - self.max_pending
             for i in range(to_discard):
                 # pop off the oldest jobs
                 del self.start_records[self.start_records.iterkeys().next()]
             self.discarded += to_discard
-        if(len(self.end_records) > self.max_pending):
+        if(self.max_pending >= 0 and len(self.end_records) > self.max_pending):
             to_discard = len(self.end_records) - self.max_pending
             for i in range(to_discard):
                 # pop off the oldest jobs
diff --git a/run_exps.py b/run_exps.py
index 3fff667..8736d19 100755
--- a/run_exps.py
+++ b/run_exps.py
@@ -31,7 +31,7 @@ ExpData  = com.recordtype('ExpData', ['name', 'params', 'sched_file', 'out_dir',
 ConfigResult = namedtuple('ConfigResult', ['param', 'wanted', 'actual'])
 
 '''Maximum times an experiment will be retried'''
-MAX_RETRY = 5
+MAX_RETRY = 15
 '''Location experiment retry count is stored'''
 TRIES_FNAME = ".tries.pkl"