Transform LITMUS-RT support in libextra to imply case-study mode

Adds <period> and <criticality level> parameters to benchmarks and
disables cache flushing when compiled with LITMUS. Also fixes build
with LITMUS enabled on yamaha.cs.unc.edu.

Also allows output to be disabled, automatically infers _rt_lock_id,
and allows for a specific pair ID for paired tasks. (The pair ID is
added to all the semaphore and shared memory names, allowing multiple
pairs to run in the system at a time.)

1 files changed, 3 insertions, 3 deletions

diff --git a/dis/Makefile b/dis/Makefile
index 88fa7c2..d18761b 100755
--- a/dis/Makefile
+++ b/dis/Makefile
@@ -2,7 +2,7 @@
 # Build the DIS benchmarks with all-pairs or unpaired instrumentation
 # (I know that this Makefile is mildly evil and breaks so many rules
 # that a good Makefile should follow. Sorry - at least I have one.)
-LIBLITMUS ?= /media/speedy/litmus/liblitmus
+LIBLITMUS ?= /playpen/mc2/liblitmus
 CC ?= gcc
 override CFLAGS += -pthread -O2 -I..
 LDFLAGS = -lrt -lm
@@ -15,8 +15,8 @@ endif
 
 # Include all the LITMUS^RT headers if we're using it
 ifneq ($(shell grep "define LITMUS 1" ../extra.h),)
-        CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
-        LDFLAGS += -L${LIBLITMUS} -llitmus
+        override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
+        override LDFLAGS += -L${LIBLITMUS} -llitmus
 endif
 
 all: baseline