6 files changed, 649 insertions, 75 deletions

diff --git a/dag b/dag
index bb0a8cf..9180799 100644
--- a/dag
+++ b/dag
@@ -1 +1 @@
-1,disparity_qcif, dis001, 2, 1, 5, 1, 15, 1, 0, 12, 14, mser_qcif, mser001, 5, 9
\ No newline at end of file
+0, localization_qcif, loc001, 100, 15, loc, 1, 50, 1, 0, 50, 50
\ No newline at end of file
diff --git a/dag_example b/dag_example
index ce39489..05a7c3f 100644
--- a/dag_example
+++ b/dag_example
@@ -1,4 +1 @@
-1, mser_qcif, mser001, 5, 1, 1, 1, 100, 1, 0, sift_qcif, sift001

-0, mser_qcif, mser002, 3, 2, 2, 1, 10, 1, 0

-1, svm_qcif, svm001, 6, 2, 3, 1, 50, 1, 0, localization_qcif, localization001

-0, tracking_qcif, tracking001, 3, 3, 4, 1, 20, 1, 17

+0, stitch_qcif, stitch001, 10, 2, stitch, 1, 50, 1, 17, 15, 16
\ No newline at end of file
diff --git a/extra.h b/extra.h
index fce8c3f..9da536d 100644
--- a/extra.h
+++ b/extra.h
@@ -30,7 +30,7 @@ extern int sched_getcpu();
 #endif
 
 // This is a proxy for "case study mode" now
-#define LITMUS 0    
+#define LITMUS 0
 #define MMDC_PROF 0
 
 #if LITMUS
@@ -60,6 +60,8 @@ int _rt_core;
 int _rt_will_output;
 struct timespec _rt_start, _rt_end;
 
+int first_job;
+
 char *_rt_run_id;
 char *_rt_our_prog_name;
 char *_rt_other_prog_name;
@@ -78,10 +80,10 @@ char _rt_shm_name[_ID_SZ] = "/_libextra_barrier-";
 
 #if LITMUS
 lt_t _rt_period;
+int _rt_crit;
 lt_t _rt_phase;
 lt_t _rt_cost;
 lt_t _rt_deadline;
-int _rt_crit;
 struct control_page *_rt_cp;
 #endif
 
@@ -108,7 +110,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
 #if LITMUS
         fprintf(stderr, " <task period> in ms\n");
         fprintf(stderr, " <task criticality level> 0 for Level-A, 1 for Level-B, 2 for Level-C\n");
-            fprintf(stderr, " <task phase> in ms\n");
+        fprintf(stderr, " <task phase> in ms\n");
         fprintf(stderr, " <task cost> in ms\n");
         fprintf(stderr, " <task deadline> in ms\n");
 #endif /* LITMUS */
@@ -150,19 +152,23 @@ static void _rt_load_params_itrl(int argc, char **argv) {
         fprintf(stderr, "Run ID is too large! Keep it to less than %d characters.\n", _RT_FILENAME_LEN);
         exit(1);
     }
-#ifdef PAIRED
-    // __rt_sem2_name happens to be the longest
-    if (strlen(pairId) + strlen(_rt_sem2_name) > _ID_SZ) {
-        fprintf(stderr, "PairID is too long! Maximum length is %ld characters.\n", _ID_SZ - strlen(_rt_sem2_name));
-        exit(1);
-    }
     _rt_start_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
     _rt_end_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
-    _rt_exec_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(float));
     if (!_rt_end_time || !_rt_start_time) {
         perror("Unable to allocate buffers for execution times");
         exit(1);
     }
+    _rt_exec_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(float));
+    if (!_rt_exec_time) {
+        perror("Unable to allocate buffer for execution times");
+        exit(1);
+    }
+#ifdef PAIRED
+    // __rt_sem2_name happens to be the longest
+    if (strlen(pairId) + strlen(_rt_sem2_name) > _ID_SZ) {
+        fprintf(stderr, "PairID is too long! Maximum length is %ld characters.\n", _ID_SZ - strlen(_rt_sem2_name));
+        exit(1);
+    }
     // Use PairID to create unique semaphore and shared memory paths
     strcat(_rt_sem1_name, pairId);
     strcat(_rt_sem2_name, pairId);
@@ -201,16 +207,11 @@ static void _rt_load_params_itrl(int argc, char **argv) {
         exit(1);
     }
     *_rt_barrier = 0;
-#else
-    _rt_start_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
-    _rt_end_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
-    _rt_exec_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(float));
-    if (!_rt_exec_time) {
-        perror("Unable to allocate buffer for execution times");
-        exit(1);
-    }
+// #else
+    
 #endif /* PAIRED */
     _rt_jobs_complete = 0;
+    first_job = 1;
     mlockall(MCL_CURRENT || MCL_FUTURE);
 #if LITMUS
     _rt_period = ms2ns(strtoul(argv[end], NULL, 10));
@@ -218,7 +219,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     _rt_phase = ms2ns(strtoul(argv[end+2], NULL, 10));
     _rt_cost = ms2ns(strtoul(argv[end+3], NULL, 10));
     _rt_deadline = ms2ns(strtoul(argv[end+4], NULL, 10));
-    // _rt_phase = 0;
     unsigned int wait = 1;
     if (be_migrate_to_domain(_rt_core) < 0) {
         perror("Unable to migrate to specified CPU");
@@ -232,7 +232,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     rt_param.relative_deadline = _rt_deadline;
     rt_param.phase = _rt_phase;
     rt_param.priority = LITMUS_LOWEST_PRIORITY;
-    // rt_param.priority = ns2ms(_rt_phase);
     rt_param.cls = _rt_crit;
     rt_param.budget_policy = NO_ENFORCEMENT;
     rt_param.cpu = _rt_core;
@@ -358,21 +357,10 @@ static void _rt_save_job_result() {
     _rt_end_time[_rt_jobs_complete] = _rt_end.tv_sec;
     _rt_end_time[_rt_jobs_complete] *= _BILLION;
     _rt_end_time[_rt_jobs_complete] += _rt_end.tv_nsec;
-
+// #else
     _rt_exec_time[_rt_jobs_complete] = _rt_end.tv_sec - _rt_start.tv_sec;
     _rt_exec_time[_rt_jobs_complete] *= _BILLION;
     _rt_exec_time[_rt_jobs_complete] += _rt_end.tv_nsec - _rt_start.tv_nsec;
-// #else
-//     _rt_start_time[_rt_jobs_complete] = _rt_start.tv_sec;
-//     _rt_start_time[_rt_jobs_complete] *= _BILLION;
-//     _rt_start_time[_rt_jobs_complete] += _rt_start.tv_nsec;
-//     _rt_end_time[_rt_jobs_complete] = _rt_end.tv_sec;
-//     _rt_end_time[_rt_jobs_complete] *= _BILLION;
-//     _rt_end_time[_rt_jobs_complete] += _rt_end.tv_nsec;
-
-//     _rt_exec_time[_rt_jobs_complete] = _rt_end.tv_sec - _rt_start.tv_sec;
-//     _rt_exec_time[_rt_jobs_complete] *= _BILLION;
-//     _rt_exec_time[_rt_jobs_complete] += _rt_end.tv_nsec - _rt_start.tv_nsec;
 // #endif /* PAIRED */
 #if MMDC_PROF
     _rt_mmdc_read[_rt_jobs_complete] = mmdc_res.read_bytes;
@@ -439,7 +427,12 @@ out:
 
 // Start a job
 static void _rt_start_loop() {
+    // Let the first job run before synchrnous release --- make sure we have no further page faults
+    if(first_job){
+        return;
+    }
 #if LITMUS
+    // static lt_t last = 0;
     if (_rt_jobs_complete == 0) {
         if(wait_for_ts_release() != 0){
             perror("Unable to wait for taskset release");
@@ -451,45 +444,27 @@ static void _rt_start_loop() {
             perror("Unable to sleep for next period");
         }
     }
-    // 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;