26 files changed, 113 insertions, 46 deletions

diff --git a/Makefile b/Makefile
index 6408505..44171d0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ case-study:
         $(MAKE) -C SD-VBS/benchmarks compile
 
 benchmarks:
-        sed -i "s/LITMUS 1/LITMUS 0/g" extra.h
-        #$(MAKE) -C baseline all
+        sed -i "s/LITMUS 0/LITMUS 1/g" extra.h
+        # $(MAKE) -C baseline all
         #$(MAKE) -C all_pairs all
         #$(MAKE) -C dis pairs
-#       $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile
-        $(MAKE) -C SD-VBS/benchmarks compile
+        $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile
+#       $(MAKE) -C SD-VBS/benchmarks compile
 
 
 benches := svm mser sift texture_synthesis tracking disparity localization multi_ncut stitch
diff --git a/SD-VBS/dag_binaries/disparity_qcif_pair b/SD-VBS/dag_binaries/disparity_qcif_pair
index e40c79c..44a7f81 100755
--- a/SD-VBS/dag_binaries/disparity_qcif_pair
+++ b/SD-VBS/dag_binaries/disparity_qcif_pair
diff --git a/SD-VBS/dag_binaries/disparity_qcif_single b/SD-VBS/dag_binaries/disparity_qcif_single
index 961f76f..73bd933 100755
--- a/SD-VBS/dag_binaries/disparity_qcif_single
+++ b/SD-VBS/dag_binaries/disparity_qcif_single
diff --git a/SD-VBS/dag_binaries/localization_qcif_pair b/SD-VBS/dag_binaries/localization_qcif_pair
index 846e01d..5fb17b3 100755
--- a/SD-VBS/dag_binaries/localization_qcif_pair
+++ b/SD-VBS/dag_binaries/localization_qcif_pair
diff --git a/SD-VBS/dag_binaries/localization_qcif_single b/SD-VBS/dag_binaries/localization_qcif_single
index 4c18acd..be38797 100755
--- a/SD-VBS/dag_binaries/localization_qcif_single
+++ b/SD-VBS/dag_binaries/localization_qcif_single
diff --git a/SD-VBS/dag_binaries/mser_qcif_pair b/SD-VBS/dag_binaries/mser_qcif_pair
index 59532ba..3b66704 100755
--- a/SD-VBS/dag_binaries/mser_qcif_pair
+++ b/SD-VBS/dag_binaries/mser_qcif_pair
diff --git a/SD-VBS/dag_binaries/mser_qcif_single b/SD-VBS/dag_binaries/mser_qcif_single
index 18be365..80c4abd 100755
--- a/SD-VBS/dag_binaries/mser_qcif_single
+++ b/SD-VBS/dag_binaries/mser_qcif_single
diff --git a/SD-VBS/dag_binaries/multi_ncut_qcif_pair b/SD-VBS/dag_binaries/multi_ncut_qcif_pair
index a92002f..d5c9eb2 100755
--- a/SD-VBS/dag_binaries/multi_ncut_qcif_pair
+++ b/SD-VBS/dag_binaries/multi_ncut_qcif_pair
diff --git a/SD-VBS/dag_binaries/multi_ncut_qcif_single b/SD-VBS/dag_binaries/multi_ncut_qcif_single
index db3d837..9772c3c 100755
--- a/SD-VBS/dag_binaries/multi_ncut_qcif_single
+++ b/SD-VBS/dag_binaries/multi_ncut_qcif_single
diff --git a/SD-VBS/dag_binaries/sift_qcif_pair b/SD-VBS/dag_binaries/sift_qcif_pair
index e8fb035..d08dcd6 100755
--- a/SD-VBS/dag_binaries/sift_qcif_pair
+++ b/SD-VBS/dag_binaries/sift_qcif_pair
diff --git a/SD-VBS/dag_binaries/sift_qcif_single b/SD-VBS/dag_binaries/sift_qcif_single
index f829bbe..a1c8c3d 100755
--- a/SD-VBS/dag_binaries/sift_qcif_single
+++ b/SD-VBS/dag_binaries/sift_qcif_single
diff --git a/SD-VBS/dag_binaries/stitch_qcif_pair b/SD-VBS/dag_binaries/stitch_qcif_pair
index e0359cb..a6e9ea9 100755
--- a/SD-VBS/dag_binaries/stitch_qcif_pair
+++ b/SD-VBS/dag_binaries/stitch_qcif_pair
diff --git a/SD-VBS/dag_binaries/stitch_qcif_single b/SD-VBS/dag_binaries/stitch_qcif_single
index 31278ac..209fc86 100755
--- a/SD-VBS/dag_binaries/stitch_qcif_single
+++ b/SD-VBS/dag_binaries/stitch_qcif_single
diff --git a/SD-VBS/dag_binaries/svm_qcif_pair b/SD-VBS/dag_binaries/svm_qcif_pair
index aa9e7f1..8891062 100755
--- a/SD-VBS/dag_binaries/svm_qcif_pair
+++ b/SD-VBS/dag_binaries/svm_qcif_pair
diff --git a/SD-VBS/dag_binaries/svm_qcif_single b/SD-VBS/dag_binaries/svm_qcif_single
index da0986e..76da83f 100755
--- a/SD-VBS/dag_binaries/svm_qcif_single
+++ b/SD-VBS/dag_binaries/svm_qcif_single
diff --git a/SD-VBS/dag_binaries/texture_synthesis_qcif_pair b/SD-VBS/dag_binaries/texture_synthesis_qcif_pair
index 4017329..5133606 100755
--- a/SD-VBS/dag_binaries/texture_synthesis_qcif_pair
+++ b/SD-VBS/dag_binaries/texture_synthesis_qcif_pair
diff --git a/SD-VBS/dag_binaries/texture_synthesis_qcif_single b/SD-VBS/dag_binaries/texture_synthesis_qcif_single
index 9e75bce..c982e12 100755
--- a/SD-VBS/dag_binaries/texture_synthesis_qcif_single
+++ b/SD-VBS/dag_binaries/texture_synthesis_qcif_single
diff --git a/SD-VBS/dag_binaries/tracking_qcif_pair b/SD-VBS/dag_binaries/tracking_qcif_pair
index 3967bc8..bafb339 100755
--- a/SD-VBS/dag_binaries/tracking_qcif_pair
+++ b/SD-VBS/dag_binaries/tracking_qcif_pair
diff --git a/SD-VBS/dag_binaries/tracking_qcif_single b/SD-VBS/dag_binaries/tracking_qcif_single
index 023dfc9..25d9d80 100755
--- a/SD-VBS/dag_binaries/tracking_qcif_single
+++ b/SD-VBS/dag_binaries/tracking_qcif_single
diff --git a/dag b/dag
index 7217bfa..5dbd6b6 100644
--- a/dag
+++ b/dag
@@ -1 +1 @@
-1,disparity_qcif, cut001, 5, 9, 4, 1, 100, 1, 0, svm_qcif, svm001
\ No newline at end of file
+1,disparity_qcif, dis001, 5, 1, 3, 1, 10, 1, 19, mser_qcif, mser001
\ No newline at end of file
diff --git a/deadline_misses b/deadline_misses
index 90ccbf7..664ac11 100644
--- a/deadline_misses
+++ b/deadline_misses
@@ -1,2 +1,8 @@
-(svm001/232202:2) HAZARDOUS: Level-B tardy 50419794 ns, relative tardiness 0.504198
-(svm001/232202:3) HAZARDOUS: Level-B tardy 639529 ns, relative tardiness 0.006395
+(dis001/93299:2)  tardy 3033045 ns, relative tardiness 0.303304
+(dis001/93299:3)  tardy 6005778 ns, relative tardiness 0.600578
+(mser001/93302:4)  tardy 102354 ns, relative tardiness 0.010235
+(dis001/93299:4)  tardy 8989592 ns, relative tardiness 0.898959
+(mser001/93302:5)  tardy 3083757 ns, relative tardiness 0.308376
+(dis001/93299:5)  tardy 11969214 ns, relative tardiness 1.196921
+(mser001/93302:6)  tardy 6060660 ns, relative tardiness 0.606066
+(dis001/93299:6)  tardy 15251106 ns, relative tardiness 1.525111
diff --git a/extra.h b/extra.h
index 5f08a60..7bcc8f5 100644
--- a/extra.h
+++ b/extra.h
@@ -244,10 +244,10 @@ static void _rt_load_params_itrl(int argc, char **argv) {
         exit(1);
     }
     _rt_cp = get_ctrl_page();
-    if (wait && wait_for_ts_release() != 0) {
-        perror("Unable to wait for taskset release");
-        exit(1);
-    }
+    // if (wait && wait_for_ts_release() != 0) {
+    //     perror("Unable to wait for taskset release");
+    //     exit(1);
+    // }
 #endif /* LITMUS */
 #if MMDC_PROF
     SETUP_MMDC
@@ -434,31 +434,46 @@ out:
 // Start a job
 static void _rt_start_loop() {
 #if LITMUS
-    static lt_t last = 0;
-    lt_t now = litmus_clock();
-    if (now > _rt_cp->deadline) {
-        fprintf(stderr, "(%s/%d:%lu) ", _rt_our_prog_name, gettid(), _rt_cp->job_index);
-        if (_rt_crit == 0)
-            fprintf(stderr, "CATASTROPHIC: Level-A");
-        else if (_rt_crit == 1)
-            fprintf(stderr, "HAZARDOUS: Level-B");
-        else
-            fprintf(stderr, "MAJOR: Level-C");
-        fprintf(stderr, " tardy %llu ns, "
-               "relative tardiness %f\n",
-               now - _rt_cp->deadline,
-               (now - _rt_cp->deadline) / (double)_rt_period);
+    if (_rt_jobs_complete == 0) {
+        if(wait_for_ts_release() != 0){
+            perror("Unable to wait for taskset release");
+            exit(1);
+        }
+    }
+    else{
+        if (sleep_next_period() != 0) {
+            perror("Unable to sleep for next period");
+        }
     }
-    if (last == 0) {
-        last = now;
-    } 
+    // static lt_t last = 0;
+    // lt_t now = litmus_clock();
+    // fprintf(stderr, "current now : %llu\n", now);
+    // if (now > _rt_cp->deadline) {
+    //     fprintf(stderr, "(%s/%d:%lu) ", _rt_our_prog_name, gettid(), _rt_cp->job_index);
+    //     // if (_rt_crit == 0)
+    //         // fprintf(stderr, "CATASTROPHIC: Level-A");
+    //     // else if (_rt_crit == 1)
+    //         // fprintf(stderr, "HAZARDOUS: Level-B");
+    //     // else
+    //         // fprintf(stderr, "MAJOR: Level-C");
+    //     fprintf(stderr, " tardy %llu ns, "
+    //            "relative tardiness %f\n",
+    //            now - _rt_cp->deadline,
+    //            (now - _rt_cp->deadline) / (double)_rt_period);
+    // }
+    // if (last == 0) {
+    //     last = now;
+    // } 
     // else if (now > last + 60ull * _BILLION && _rt_crit >= 2) {
     //     last = now;
     //     fprintf(stderr, "(%s/%d:%lu) Ping\n", _rt_our_prog_name, gettid(), _rt_cp->job_index);
     // }
-    if (sleep_next_period() != 0) {
-        perror("Unable to sleep for next period");
-    }
+    // lt_t now = litmus_clock();
+    // if(_rt_jobs_complete != 0){
+        // fprintf(stderr, "in start before sleep: release: %llu, deadline: %llu, now: %llu\n", _rt_cp->release ,_rt_cp->deadline, litmus_clock());
+        
+        // fprintf(stderr, "in start after sleep: release: %llu, deadline: %llu, now: %llu\n", _rt_cp->release ,_rt_cp->deadline, litmus_clock());
+    // }
 #else
     sched_yield();
 #endif /* LITMUS */
@@ -488,6 +503,22 @@ static void _rt_stop_loop() {
     get_mmdc_profiling_results(mmdc, &mmdc_res);
 #endif /* MMDC_PROF */
     _rt_save_job_result();
+#if LITMUS
+    long long end = _rt_end_time[_rt_jobs_complete];
+    if (end > _rt_cp->deadline) {
+        fprintf(stderr, "(%s/%d:%lu) ", _rt_our_prog_name, gettid(), _rt_cp->job_index);
+        // if (_rt_crit == 0)
+            // fprintf(stderr, "CATASTROPHIC: Level-A");
+        // else if (_rt_crit == 1)
+            // fprintf(stderr, "HAZARDOUS: Level-B");
+        // else