2 files changed, 12 insertions, 30 deletions

diff --git a/SD-VBS/common/c/extra.h b/SD-VBS/common/c/extra.h
index 3215951..8c67b33 100644
--- a/SD-VBS/common/c/extra.h
+++ b/SD-VBS/common/c/extra.h
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 Sims Hill Osborne and Joshua Bakita
+ * Copyright 2019 Sims Hill Osborne and 2020 Joshua Bakita
  *
  * This header provides facilities by which to separably run and time TACLeBench
  * To use this for paired task timing, define PAIRED (pass CFLAGS=-DPAIRED to make)
@@ -29,7 +29,7 @@ extern int sched_getcpu();
 #include <sys/syscall.h>
 #endif
 
-#define LITMUS 0
+#define LITMUS 1
 #define MC2 0
 #define MMDC_PROF 0
 
@@ -200,20 +200,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
         perror("Unable to migrate to specified CPU"); \
         exit(1); \
     } \
-    struct reservation_config res; \
-    res.id = gettid(); \
-    res.cpu = cpu; \
-    res.priority = LITMUS_HIGHEST_PRIORITY; \
-    /* we take over half the CPU time (these are ns) */ \
-    res.polling_params.budget = ms2ns(3000); \
-    res.polling_params.period = ms2ns(3000); \
-    res.polling_params.offset = 0; \
-    res.polling_params.relative_deadline = ms2ns(3000); \
-    /* Not 100% sure that we should use periodic polling */ \
-    if (reservation_create(PERIODIC_POLLING, &res) < 0) { \
-        perror("Unable to create reservation"); \
-        exit(1); \
-    } \
     struct rt_task rt_param; \
     init_rt_task_param(&rt_param); \
     /* Supposedly the next two parameters are irrelevant when reservations are enabled, but I'm leaving them anyway... */ \
@@ -223,7 +209,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     rt_param.cls = RT_CLASS_HARD; \
     rt_param.release_policy = TASK_PERIODIC; \
     rt_param.budget_policy = NO_ENFORCEMENT; \
-    rt_param.cpu = cpu; \
+    rt_param.cpu = _rt_core; \
     if (set_rt_task_param(gettid(), &rt_param) < 0) { \
         perror("Unable to set real-time parameters"); \
         exit(1); \
@@ -244,13 +230,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
 
 #if MC2
 #define MC2_SETUP \
-    struct mc2_task mc2_param; \
-    mc2_param.res_id = gettid(); \
-    mc2_param.crit = CRIT_LEVEL_A; \
-    if (set_mc2_task_param(gettid(), &mc2_param) < 0) { \
-        perror("Unable to set MC^2 task params"); \
-        exit(1); \
-    } \
+
     set_page_color(rt_param.cpu);
 #else
 #define MC2_SETUP
@@ -261,7 +241,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
         perror("Unable to become a real-time task"); \
         exit(1); \
     } \
-    reservation_destroy(gettid(), rt_param.cpu);
 
 #if __arm__
 // On ARM, manually flush the cache
diff --git a/SD-VBS/common/makefiles/Makefile.common b/SD-VBS/common/makefiles/Makefile.common
index 7fc8824..964ece6 100644
--- a/SD-VBS/common/makefiles/Makefile.common
+++ b/SD-VBS/common/makefiles/Makefile.common
@@ -18,8 +18,7 @@ endif
 endif
 
 CC=gcc
-override CFLAGS += -DGCC -D$(INPUT) -pthread -DCHECK
-
+override CFLAGS += -DGCC -D$(INPUT) -pthread -I../../../../..
 COMMON_DIR := $(TOP_DIR)/common/c
 M_COMMON := $(TOP_DIR)/common/matlab
 M_TOOLBOX=$(TOP_DIR)/common/toolbox
@@ -29,7 +28,11 @@ PRELOAD_TIMES_DIR := $(TOP_DIR)/preload-times/$(BMARK)
 MTIMING_DIR := $(TOP_DIR)/cycles/$(BMARK)
 BMARK_DIR := $(TOP_DIR)/benchmarks/$(BMARK)
 TOOL_DIR := $(TOP_DIR)/tools
-
+LIBLITMUS ?= /home/litmus/liblitmus
+ifneq ($(shell grep "define LITMUS 1" ../../../../../extra.h),)
+        override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
+        override LDFLAGS += -L${LIBLITMUS} -llitmus
+endif
 #The options set below and specific to each benchmark. Disparity takes 2 input images, whereas Tracking can take any >1 input images =.
 
 # Variables exported from the benchmark specific Makefiles:
@@ -57,7 +60,7 @@ COMMON_SRC := $(wildcard $(COMMON_DIR)/*.c)
 
 EXE =
 INCLUDES = -I$(COMMON_DIR) -I$(C_DIR)
-COMPILE_C = $(CC) $(CFLAGS) -lm -O2 $(INCLUDES)
+COMPILE_C = $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) -O2
 #COMPILE_C = $(CC) $(CFLAGS) -DGENERATE_OUTPUT -lm -O2 $(INCLUDES)
 COMPILE_G = $(CC) $(CFLAGS) -g -lm $(INCLUDES)
 COMPILE_PG = $(COMPILE_G) -pg
@@ -108,7 +111,7 @@ compile-preload:
 compile: $(C_SRC)
         @echo 
         @echo -e "Benchmark\t\t- $(BMARK)"
-        @$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -lm -w -o $(BMARK)$(EXE)
+        @$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -lm  -w -o $(BMARK)$(EXE)
 
 compile-prof: $(C_SRC)
         @echo