add deadlines and costs

1 files changed, 24 insertions, 10 deletions

diff --git a/run_case_study_dag.py b/run_case_study_dag.py
index 0599bec..df44cb4 100755
--- a/run_case_study_dag.py
+++ b/run_case_study_dag.py
@@ -9,9 +9,9 @@ import subprocess
 
 
 # Single tasks:
-# 0, binary_name, task_name, iterations, my_core, runID, save?, period, criticality, phase
+# 0, binary_name, task_name, iterations, my_core, runID, save?, period, criticality, phase, cost, deadline
 # Paired tasks:
-# 1, binary_name, task_name, iterations, my_core, runID, save?, period, criticality, phase, other_binary_name, other_task_name
+# 1, binary_name, task_name, iterations, my_core, runID, save?, period, criticality, phase, cost, deadline, other_binary_name, other_task_name, other_cost, other_deadline
 
 
 binary_path = "./SD-VBS/dag_binaries/"
@@ -28,9 +28,13 @@ SAVE_RESULT = 6
 PERIOD = 7
 CRT_LEVEL = 8
 PHASE= 9
+COST = 10
+DEADLINE = 11
 
-OTHER_BINARY_NAME = 10
-OTHER_TASK_NAME = 11
+OTHER_BINARY_NAME = 12
+OTHER_TASK_NAME = 13
+OTHER_COST = 14
+OTHER_DEADLINE = 15
 # OTHER_CORE_NUM = 12
 # PAIR_ID = 12
 
@@ -137,18 +141,23 @@ def main(pathName):
             period = launch[PERIOD].strip()
             crt_level = launch[CRT_LEVEL].strip()
             phase = launch[PHASE].strip()
+            cost = launch[COST].strip()
+            deadline = launch[DEADLINE].strip()
+            if(int(cost) > int(deadline)):
+                print("----Error: task {} cost = {} > {} = deadline!----".format(task_name, int(cost), int(deadline)))
+                continue
 
 
         phys_core = int(core_num) % 16
         if ID2PID(task_name):
-            print("ERROR: Task Name {} is already running! Did you end the previous case study?".format(task_name))
+            print("----ERROR: Task Name {} is already running! Did you end the previous case study?---- ".format(task_name))
             return 1
         # single tasks
         if launch[0] == '0':
             if LITMUS:
                 binary =  binary_path + binary_name + "_single"
                 # Arg format: <unique name> <num_iters> <core> <NULL runID> <save?> <period> <crit lvl> <phase>
-                arg = " " + task_name  + " " + num_iters +" " +  core_num +" " +  run_id +" " + save_result+" " + period +" " +  crt_level + " "+ phase
+                arg = " " + task_name  + " " + num_iters +" " +  core_num +" " +  run_id +" " + save_result+" " + period +" " +  crt_level + " "+ phase + " " + cost + " " + deadline
                 bench_tsk = subprocess.Popen(input_cmd[binary_name] + " | numactl --interleave=all " + binary + arg, shell=True, executable='/bin/bash', stderr=stderr_file)
 
             else:
@@ -170,18 +179,23 @@ def main(pathName):
             other_binary_name = launch[OTHER_BINARY_NAME].strip()
             other_task_name = launch[OTHER_TASK_NAME].strip()
             other_core_num = str(int(core_num)+16)
-
+            if LITMUS:
+                other_cost = launch[OTHER_COST].strip()
+                other_deadline = launch[OTHER_DEADLINE].strip()
+                if(int(other_cost) > int(other_deadline)):
+                    print("----Error: task {} cost = {} > {} = deadline!----".format(other_task_name, int(other_cost), int(other_deadline)))
+                    continue
             #Check if SMT-paired correctly
             # assert(abs(int(core_num)-int(other_core_num)) == 16)
             if ID2PID(other_task_name):
-                print("ERROR: Task Name {} is already running! Did you end the previous case study?".format(other_task_name))
+                print("----ERROR: Task Name {} is already running! Did you end the previous case study?----".format(other_task_name))
                 return 1
             if LITMUS:
                 binary =  binary_path + binary_name + "_pair"
                 other_binary =  binary_path + other_binary_name + "_pair"
                 # Arg format: <unique name> <num iters> <core> <0 other core> <other name> <runID> <save?> <pairID> <period> <crit lvl> <phase>
-                arg1 = " " + task_name  + " " + num_iters +" " +  core_num +" " + other_core_num+" "+ other_task_name+" "+ run_id +" " + save_result+" " +str(pairID) +" "+ period +" " +  crt_level +" "+phase
-                arg2 = " " + other_task_name  + " " + num_iters +" " +  other_core_num +" " + core_num+" "+ task_name+" "+ run_id +" " + save_result+" " +str(pairID) +" "+ period +" " +  crt_level+" " +phase
+                arg1 = " " + task_name  + " " + num_iters +" " +  core_num +" " + other_core_num+" "+ other_task_name+" "+ run_id +" " + save_result+" " +str(pairID) +" "+ period +" " +  crt_level +" "+phase + " " + cost + " " + deadline
+                arg2 = " " + other_task_name  + " " + num_iters +" " +  other_core_num +" " + core_num+" "+ task_name+" "+ run_id +" " + save_result+" " +str(pairID) +" "+ period +" " +  crt_level+" " +phase + " " + other_cost + " " + other_deadline
                 # print(input_cmd[binary_name] + " | numactl --membind=0 " + binary + arg1)
                 # print(input_cmd[other_binary_name] + " | numactl --membind=1 " + other_binary + arg2)
                 bench_tsk1 = subprocess.Popen(input_cmd[binary_name] + " | numactl --membind=0 " + binary + arg1, shell=True, executable='/bin/bash', stderr=stderr_file)