From 163c440444c74a4e0bbe0a8db3d1ca725413994b Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Thu, 22 Oct 2020 03:17:31 -0400
Subject: Make SD-VBS compatible with run_bench.sh and cleanup

SD-VBS:
- Run silently
- Fix some whitespace errors
- Don't duplicate extra.h
- Auto-detect if building with LITMUS-RT
- Disable result checking
- Add helper symlinks
Misc:
- Remove unused code from libextra
- Set some missing rt_param fields in libextra
- Disable CSV info dump from computeSMTslowdown.sh
- Widen scope of .gitignore on .txt files
- Include list of 2MB DIS pair benchmarks and inputs
---
 extra.h | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'extra.h')

diff --git a/extra.h b/extra.h
index 0d700ab..59ae97a 100644
--- a/extra.h
+++ b/extra.h
@@ -29,8 +29,7 @@ extern int sched_getcpu();
 #include <sys/syscall.h>
 #endif
 
-#define LITMUS 1
-#define MC2 0
+#define LITMUS 0
 #define MMDC_PROF 0
 
 #if LITMUS
@@ -202,10 +201,11 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     } \
     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... */ \
     rt_param.exec_cost = ms2ns(999); \
     rt_param.period = ms2ns(1000); \
-    rt_param.priority = LITMUS_HIGHEST_PRIORITY; \
+    rt_param.deadline = 0; \
+    rt_param.phase = 0; \
+    rt_param.priority = LITMUS_LOWEST_PRIORITY; \
     rt_param.cls = RT_CLASS_HARD; \
     rt_param.release_policy = TASK_PERIODIC; \
     rt_param.budget_policy = NO_ENFORCEMENT; \
@@ -218,7 +218,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
         perror("init_litmus failed"); \
         exit(1); \
     } \
-    MC2_SETUP \
     if (task_mode(LITMUS_RT_TASK) != 0) { \
         perror("Unable to become real-time task"); \
         exit(1); \
@@ -228,14 +227,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
         exit(1); \
     }
 
-#if MC2
-#define MC2_SETUP \
-
-    set_page_color(rt_param.cpu);
-#else
-#define MC2_SETUP
-#endif
-
 #define CLEANUP_LITMUS \
     if (task_mode(BACKGROUND_TASK) != 0) { \
         perror("Unable to become a real-time task"); \
-- 
cgit v1.2.2