diff options
| author | Joshua Bakita <jbakita@cs.unc.edu> | 2020-10-22 03:17:31 -0400 |
|---|---|---|
| committer | Joshua Bakita <jbakita@cs.unc.edu> | 2020-10-22 03:17:31 -0400 |
| commit | 163c440444c74a4e0bbe0a8db3d1ca725413994b (patch) | |
| tree | d4eaf9f407be042811f26dfb2613ff1c99966289 /extra.h | |
| parent | d17b33131c14864bd1eae275f49a3f148e21cf29 (diff) | |
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
Diffstat (limited to 'extra.h')
| -rw-r--r-- | extra.h | 17 |
1 files changed, 4 insertions, 13 deletions
| @@ -29,8 +29,7 @@ extern int sched_getcpu(); | |||
| 29 | #include <sys/syscall.h> | 29 | #include <sys/syscall.h> |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | #define LITMUS 1 | 32 | #define LITMUS 0 |
| 33 | #define MC2 0 | ||
| 34 | #define MMDC_PROF 0 | 33 | #define MMDC_PROF 0 |
| 35 | 34 | ||
| 36 | #if LITMUS | 35 | #if LITMUS |
| @@ -202,10 +201,11 @@ static void _rt_load_params_itrl(int argc, char **argv) { | |||
| 202 | } \ | 201 | } \ |
| 203 | struct rt_task rt_param; \ | 202 | struct rt_task rt_param; \ |
| 204 | init_rt_task_param(&rt_param); \ | 203 | init_rt_task_param(&rt_param); \ |
| 205 | /* Supposedly the next two parameters are irrelevant when reservations are enabled, but I'm leaving them anyway... */ \ | ||
| 206 | rt_param.exec_cost = ms2ns(999); \ | 204 | rt_param.exec_cost = ms2ns(999); \ |
| 207 | rt_param.period = ms2ns(1000); \ | 205 | rt_param.period = ms2ns(1000); \ |
| 208 | rt_param.priority = LITMUS_HIGHEST_PRIORITY; \ | 206 | rt_param.deadline = 0; \ |
| 207 | rt_param.phase = 0; \ | ||
| 208 | rt_param.priority = LITMUS_LOWEST_PRIORITY; \ | ||
| 209 | rt_param.cls = RT_CLASS_HARD; \ | 209 | rt_param.cls = RT_CLASS_HARD; \ |
| 210 | rt_param.release_policy = TASK_PERIODIC; \ | 210 | rt_param.release_policy = TASK_PERIODIC; \ |
| 211 | rt_param.budget_policy = NO_ENFORCEMENT; \ | 211 | rt_param.budget_policy = NO_ENFORCEMENT; \ |
| @@ -218,7 +218,6 @@ static void _rt_load_params_itrl(int argc, char **argv) { | |||
| 218 | perror("init_litmus failed"); \ | 218 | perror("init_litmus failed"); \ |
| 219 | exit(1); \ | 219 | exit(1); \ |
| 220 | } \ | 220 | } \ |
| 221 | MC2_SETUP \ | ||
| 222 | if (task_mode(LITMUS_RT_TASK) != 0) { \ | 221 | if (task_mode(LITMUS_RT_TASK) != 0) { \ |
| 223 | perror("Unable to become real-time task"); \ | 222 | perror("Unable to become real-time task"); \ |
| 224 | exit(1); \ | 223 | exit(1); \ |
| @@ -228,14 +227,6 @@ static void _rt_load_params_itrl(int argc, char **argv) { | |||
| 228 | exit(1); \ | 227 | exit(1); \ |
| 229 | } | 228 | } |
| 230 | 229 | ||
| 231 | #if MC2 | ||
| 232 | #define MC2_SETUP \ | ||
| 233 | |||
| 234 | set_page_color(rt_param.cpu); | ||
| 235 | #else | ||
| 236 | #define MC2_SETUP | ||
| 237 | #endif | ||
| 238 | |||
| 239 | #define CLEANUP_LITMUS \ | 230 | #define CLEANUP_LITMUS \ |
| 240 | if (task_mode(BACKGROUND_TASK) != 0) { \ | 231 | if (task_mode(BACKGROUND_TASK) != 0) { \ |
| 241 | perror("Unable to become a real-time task"); \ | 232 | perror("Unable to become a real-time task"); \ |
