1 files changed, 15 insertions, 8 deletions

diff --git a/gen/generator.py b/gen/generator.py
index 7b91a93..9831252 100644
--- a/gen/generator.py
+++ b/gen/generator.py
@@ -1,6 +1,8 @@
 import gen.rv as rv
 import os
+import sys
 import copy
+import math
 import pprint
 import schedcat.generator.tasks as tasks
 import shutil as sh
@@ -146,6 +148,7 @@ class Generator(object):
         cluster_arg = []
         clustersz_arg = []
         wss_arg = []
+        wss_cycle_arg = []
         split_arg = []
         for g in pgm_params['graphs']:
             cluster_arg_t = []
@@ -167,8 +170,6 @@ class Generator(object):
                     # assume that x=1
                     period_str = format(n.task.period/1000.0, '.4f').rstrip('0').rstrip('.')
                     rates_arg_t.append('node_' + str(n.id) + ':1:' + period_str)
-                    # get cluster size
-                    clustersz_arg_t = str(pgm_params['cpus'] / pgm_params['nr_clusters'])
                 if len(g.nodes) == 1:
                     graph_desc_arg_t.append('node_' + str(n.id))
                 for succ in n.succ:
@@ -192,21 +193,26 @@ class Generator(object):
             wss_arg.append(wss_arg_t)
             split_arg.append(split_arg_t)
             rates_arg.append(rates_arg_t)
-            clustersz_arg.append(clustersz_arg_t)
-            #print('----------')
-        #print(pgm_params)
+
+            clustersz_arg.append(str(pgm_params['cpus'] / pgm_params['nr_clusters']))
+
+            # Use a wss cycle of 1.5x the graph depth to avoid cache
+            # contention among tasks. This mimics how a real data-flow
+            # program would work: buffers get passed down the graph
+            # and later reused after processing by the last node.
+            wss_cycle_arg.append(str(int(math.ceil(g.depth * 1.5))))
 
         pgm_args = []
         for i in range(len(pgm_params['graphs'])):
             pgm_args_t = '';
-            pgm_args_t += '--wait --cluster ' + cluster_arg[i] + ' --clusterSize ' + clustersz_arg[i] + ' --name graph_' + str(i)
+            pgm_args_t += '--wait --cluster ' + cluster_arg[i] + ' --clusterSize ' + clustersz_arg[i]
             pgm_args_t += ' --graph ' + graph_desc_arg[i] + ' --rates ' + rates_arg[i] + ' --execution ' + exec_arg[i]
             if len(split_arg[i]) != 0:
                 pgm_args_t += ' --split ' + split_arg[i]
             if len(wss_arg[i]) != 0:
                 pgm_args_t += ' --wss ' + wss_arg[i]
+            pgm_args_t += ' --wsCycle ' + wss_cycle_arg[i]
 
-#            pgm_args_t += ' --duration ' + str(pgm_params['duration'])
             # last argument must always be duration. actual duration given by run_exps.py
             pgm_args_t += ' --duration'
 
@@ -380,7 +386,8 @@ class Generator(object):
                 last_failed = ''
                 tries = 0
                 success = False
-                while tries < 100 and not success:
+                max_tries = 100
+                while tries < max_tries and not success:
                     created_dirs = []
                     tries += 1