Merge branch 'sd-vbs' of ssh://rtsrv.cs.unc.edu/public/mc2-scripts-and-benchmarks into sd-vbs

1 files changed, 134 insertions, 127 deletions

diff --git a/extra.h b/extra.h
index a15313a..3f1df9d 100644
--- a/extra.h
+++ b/extra.h
@@ -29,8 +29,8 @@ extern int sched_getcpu();
 #include <sys/syscall.h>
 #endif
 
-#define LITMUS 0
-#define MC2 0
+// This is a proxy for "case study mode" now
+#define LITMUS 1
 #define MMDC_PROF 0
 
 #if LITMUS
@@ -41,18 +41,6 @@ extern int sched_getcpu();
 #include  "/media/speedy/litmus/tools/mmdc/mmdc.h"
 #endif
 
-#if LITMUS
-#define SET_UP LOAD_PARAMS SETUP_LITMUS
-#else
-#define SET_UP LOAD_PARAMS
-#endif
-
-#if MMDC_PROF
-#define LOAD_PARAMS LOAD_PARAMS_ITRL SETUP_MMDC
-#else
-#define LOAD_PARAMS LOAD_PARAMS_ITRL
-#endif
-
 // Store state globally so that the job can be outside main()
 // Arrays use float as a comprimise between overflow and size
 // Paired arrays use long longs as precision is more important for those times
@@ -82,50 +70,72 @@ char *_rt_other_core;
 char *_rt_barrier;
 sem_t *_rt_first_sem, *_rt_second_sem;
 int _rt_lock_id;
+#define _ID_SZ 128
+char _rt_sem1_name[_ID_SZ] = "/_libextra_first_sem-";
+char _rt_sem2_name[_ID_SZ] = "/_libextra_second_sem-";
+char _rt_shm_name[_ID_SZ] = "/_libextra_barrier-";
+#endif /* PAIRED */
+
+#if LITMUS
+long unsigned int _rt_period;
 #endif
 
 static void _rt_load_params_itrl(int argc, char **argv) {
 #ifdef PAIRED
-    if (argc != 8) {
-        fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <lockID>", argv[0]);
-        fprintf(stderr, " <name> string for logging. Name of this task.\n");
-        fprintf(stderr, " <loops> integer number of iterations. -1 for infinite.\n");
-        fprintf(stderr, " <my core> UNUSED. Core is now auto-detected.\n");
-        fprintf(stderr, " <other core> integer for logging. Core of paired task.\n");
-        fprintf(stderr, " <other name> string for logging. Name of paired task.\n");
-        fprintf(stderr, " <runID> string to append with .txt to yield output file name.\n");
-        fprintf(stderr, " <lockID> 1 to indicate this is pair member 1, otherwise pair member 2.\n");
-        exit(1);
-    }
+    if (argc != (8 + LITMUS*2) && argc != (9 + LITMUS*2)) {
+        fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?>", argv[0]);
 #else
-    if (argc != 6) {
+    if (argc != (6 + LITMUS*2)) {
         fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);
+#endif /* PAIRED */
         fprintf(stderr, " <name> string for logging. Name of this task.\n");
         fprintf(stderr, " <loops> integer number of iterations. -1 for infinite.\n");
-        fprintf(stderr, " <my core> UNUSED. Core is now auto-detected.\n");
+        fprintf(stderr, " <my core> integer core number. Only used for LITMUS-RT.\n");
+#ifdef PAIRED
+        fprintf(stderr, " <other core> integer for logging. Core of paired task.\n");
+        fprintf(stderr, " <other name> string for logging. Name of paired task.\n");
+#endif /* PAIRED */
         fprintf(stderr, " <runID> string to append with .txt to yield output file name.\n");
         fprintf(stderr, " <save results?> 1 to save results, 0 to discard.\n");
+#ifdef PAIRED
+        fprintf(stderr, " <pairID> (optional).\n");
+#endif
+#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");
+#endif /* LITMUS */
         exit(1);
     }
-#endif
     _rt_our_prog_name = argv[1];
     _rt_max_jobs = atol(argv[2]);
+#if !LITMUS
     _rt_core = sched_getcpu();
+#else
+    _rt_core = atoi(argv[3]);
+#endif
 #ifdef PAIRED
     _rt_other_core = argv[4];
     _rt_other_prog_name = argv[5];
     _rt_run_id = argv[6];
-    _rt_lock_id = atoi(argv[7]);
-    // The paired version doesn't support disabling output (legacy compatibility)
-    _rt_will_output = 1;
+    _rt_will_output = atoi(argv[7]);
+    char *pairId;
+    int end;
+    if (argc > 8) {
+        pairId = argv[8];
+        end = 8;
+    } else {
+        pairId = "none";
+        end = 9;
+    }
 #else
     _rt_other_core = "none";
     _rt_other_prog_name = "none";
     _rt_run_id = argv[4];
     _rt_will_output = atoi(argv[5]);
+    int end = 6;
 #endif /* PAIRED */
     if (_rt_max_jobs < 0 && _rt_will_output != 0) {
-        fprintf(stderr, "Infinite loops only supported when _rt_will_output is disabled!\n");
+        fprintf(stderr, "Infinite loops only supported when output is disabled!\n");
         exit(1);
     }
     if (strlen(_rt_run_id) + 5 > _RT_FILENAME_LEN) {
@@ -133,32 +143,54 @@ static void _rt_load_params_itrl(int argc, char **argv) {
         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));
     if (!_rt_end_time || !_rt_start_time) {
         perror("Unable to allocate buffers for execution times");
         exit(1);
     }
-    _rt_first_sem = sem_open("/_libextra_first_sem", O_CREAT, 644, 0);
-    _rt_second_sem = sem_open("/_libextra_second_sem", O_CREAT, 644, 0);
+    // Use PairID to create unique semaphore and shared memory paths
+    strcat(_rt_sem1_name, pairId);
+    strcat(_rt_sem2_name, pairId);
+    strcat(_rt_shm_name, pairId);
+    _rt_first_sem = sem_open(_rt_sem1_name, O_CREAT, 644, 0);
+    _rt_second_sem = sem_open(_rt_sem2_name, O_CREAT, 644, 0);
     if (_rt_first_sem == SEM_FAILED || _rt_second_sem == SEM_FAILED) {
         perror("Error while creating semaphores");
         exit(1);
     }
-    int barrier_file = shm_open("/_libextra_barrier", O_CREAT | O_RDWR, 644);
+    // Create shared memory for barrier synchronization and infer lock ID
+    int barrier_file = shm_open(_rt_shm_name, O_CREAT | O_RDWR | O_EXCL, 644);
+    if (barrier_file == -1) {
+        // File already existed - we're the 2nd program and thus lock ID 2
+        _rt_lock_id = 2;
+        barrier_file = shm_open(_rt_shm_name, O_CREAT | O_RDWR, 644);
+    } else {
+        _rt_lock_id = 1;
+    }
     if (barrier_file == -1) {
         perror("Error while creating shared memory for barrier synchronization");
         exit(1);
     }
-    if (ftruncate(barrier_file, 1) == -1) {
+    if (ftruncate(barrier_file, 2) == -1) {
         perror("Error while setting size of shared memory for barrier synchronization");
         exit(1);
     }
-    _rt_barrier = mmap(NULL, 1, PROT_WRITE, MAP_SHARED, barrier_file, 0);
+    _rt_barrier = mmap(NULL, 2, PROT_WRITE, MAP_SHARED, barrier_file, 0);
     if (_rt_barrier == MAP_FAILED) {
         perror("Error while mapping shared memory for barrier synchronization");
         exit(1);
     }
+    // If we're the 2nd user of this barrier, mark it as in-use
+    if (_rt_lock_id == 2 && !__sync_bool_compare_and_swap(_rt_barrier+1, 0, 1)) {
+        fprintf(stderr, "Pair ID already in use!\n");
+        exit(1);
+    }