current

12 files changed, 18 insertions, 15 deletions

diff --git a/SD-VBS/benchmarks/stitch/src/c/script_stitch.c b/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
index 9310048..472e231 100644
--- a/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
+++ b/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
@@ -23,12 +23,6 @@ int main(int argc, char* argv[])
     cols = Icur->width;
 
     for_each_job {
-        iFreeHandle(Icur);
-        fFreeHandle(v);
-        fFreeHandle(interestPnts);
-        fFreeHandle(int1);
-        fFreeHandle(int2);
-        fFreeHandle(Fcur);
         v = harris(Icur);
         interestPnts = getANMS(v, 24);
         int1 = fMallocHandle(interestPnts->height, 1);
@@ -40,6 +34,12 @@ int main(int argc, char* argv[])
         }
 
         Fcur = extractFeatures(Icur, int1, int2);  
+        iFreeHandle(Icur);
+        fFreeHandle(v);
+        fFreeHandle(interestPnts);
+        fFreeHandle(int1);
+        fFreeHandle(int2);
+        fFreeHandle(Fcur);
     }
 
 #ifdef CHECK
diff --git a/all_pairs/bin/anagram b/all_pairs/bin/anagram
index c2f4b84..4d3b54e 100755
--- a/all_pairs/bin/anagram
+++ b/all_pairs/bin/anagram
diff --git a/all_pairs/bin/audiobeam b/all_pairs/bin/audiobeam
index 9caf6e9..5d00fa1 100755
--- a/all_pairs/bin/audiobeam
+++ b/all_pairs/bin/audiobeam
diff --git a/all_pairs/bin/g723_enc b/all_pairs/bin/g723_enc
index b84f812..7ab3acb 100755
--- a/all_pairs/bin/g723_enc
+++ b/all_pairs/bin/g723_enc
diff --git a/all_pairs/bin/huff_dec b/all_pairs/bin/huff_dec
index f00d796..b638a87 100755
--- a/all_pairs/bin/huff_dec
+++ b/all_pairs/bin/huff_dec
diff --git a/baseline/bin/anagram b/baseline/bin/anagram
index d723b8a..be58ec0 100755
--- a/baseline/bin/anagram
+++ b/baseline/bin/anagram
diff --git a/baseline/bin/audiobeam b/baseline/bin/audiobeam
index 52e5e05..cf776b4 100755
--- a/baseline/bin/audiobeam
+++ b/baseline/bin/audiobeam
diff --git a/baseline/bin/g723_enc b/baseline/bin/g723_enc
index ce4ef00..7289895 100755
--- a/baseline/bin/g723_enc
+++ b/baseline/bin/g723_enc
diff --git a/baseline/bin/huff_dec b/baseline/bin/huff_dec
index 39ca800..07d4d32 100755
--- a/baseline/bin/huff_dec
+++ b/baseline/bin/huff_dec
diff --git a/extra.h b/extra.h
index 9c72064..a73ab96 100644
--- a/extra.h
+++ b/extra.h
@@ -120,12 +120,12 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     _rt_will_output = atoi(argv[7]);
     char *pairId;
     int end;
-    if (argc > 8) {
+    if (argc > 7) {
         pairId = argv[8];
-        end = 8;
+        end = 9;
     } else {
         pairId = "none";
-        end = 9;
+        end = 8;
     }
 #else
     _rt_other_core = "none";
@@ -204,7 +204,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
 #if LITMUS
     _rt_period = strtoul(argv[end], NULL, 10);
     unsigned int crit = atoi(argv[end+1]);
-    unsigned int wait = 1;
+    unsigned int wait = 0;
     if (be_migrate_to_domain(_rt_core) < 0) {
         perror("Unable to migrate to specified CPU");
         exit(1);
@@ -221,6 +221,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     rt_param.release_policy = TASK_PERIODIC;
     rt_param.budget_policy = NO_ENFORCEMENT;
     rt_param.cpu = _rt_core;
+    rt_param.release_policy = TASK_PERIODIC;
     if (set_rt_task_param(gettid(), &rt_param) < 0) {
         perror("Unable to set real-time parameters");
         exit(1);
diff --git a/run_case_study.py b/run_case_study.py
index 7f0893a..345ad49 100644
--- a/run_case_study.py
+++ b/run_case_study.py
@@ -52,7 +52,7 @@ def main():
                     ccx = "1"
                 else:
                     ccx = "0"
-            continue
+                continue
             if(row[0] != "task id" and row[0] != ""):
                 row.append(ccx)
                 if(threaded):
@@ -145,11 +145,11 @@ def main():
 
             run("sudo echo " + str(pid1) + " > sudo /sys/fs/resctrl/level-ab-core-" + core + "/tasks")
             run("sudo echo " + str(pid2) + " > sudo /sys/fs/resctrl/level-ab-core-" + core + "/tasks")
-    exit(1)
+    #exit(1)
 
     for task in levelC:
         i+=1
-        if(i>6):
+        if(i>8):
             break
         tid = int(task[0])
         name = all_tasks[tid][2]
@@ -170,9 +170,11 @@ def main():
             binary = "./baseline/bin/" + name1 + arg
         else:
             binary = dis_inputs[name1] + " | ./dis/" + name1 + "_all" + arg
+
+        print(binary + " &")
         proc = subprocess.Popen([binary + " &"], shell = True)
         pid = proc.pid
-        os.system("sudo echo " + str(pid) + " > sudo /sys/fs/resctrl/level-ab-ccx-" + ccx + "/tasks")
+        run("sudo echo " + str(pid) + " > sudo /sys/fs/resctrl/level-ab-ccx-" + ccx + "/tasks")
     #os.system("/playpen/mc2/liblitmus/release_ts")
     #os.system("ls")
 if __name__ == "__main__":
diff --git a/sudo b/sudo
index d4e9257..0713b91 100644
--- a/sudo
+++ b/sudo
@@ -1 +1 @@
-53322 /sys/fs/resctrl/level-ab-core-1/tasks
+101404 /sys/fs/resctrl/level-ab-ccx-1/tasks