Code cleanup and bugfixes for infrastructure code

- Remove unused parameters to extra.h
- Use floats to avoid integer overflow when timing long loops
- Only include litmus headers and/or MMDC headers if the appropriate
  define is set in extra.h
- Update job parameters to match those used in my PRP experiments

1 files changed, 15 insertions, 3 deletions

diff --git a/dis/original/Makefile b/dis/original/Makefile
index 98634ac..7ff5e2a 100644..100755
--- a/dis/original/Makefile
+++ b/dis/original/Makefile
@@ -1,8 +1,20 @@
 LIBLITMUS ?= /media/speedy/litmus/liblitmus
 CC ?= gcc
-CFLAGS = -pthread -O2 -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include -I/playpen/jbakita/HRTSMT-RTSS19/FinalBenchmarkSetup/baseline/source
-LDFLAGS = -lrt -lm -L${LIBLITMUS} -llitmus
-COMMON = /playpen/jbakita/HRTSMT-RTSS19/FinalBenchmarkSetup/baseline/source/extra.h /media/speedy/litmus/tools/mmdc/mmdc.c
+CFLAGS = -pthread -O2 -g -I../../baseline/source
+LDFLAGS = -lrt -lm
+COMMON = ../../baseline/source/extra.h
+
+# Handle cases where we're also profiling with the MMDC on the i.MX6Q
+ifneq ($(shell grep "define MMDC 1" ../../baseline/source/extra.h),)
+»···COMMON += /media/speedy/litmus/tools/mmdc/mmdc.c
+endif
+
+# Include all the LITMUS^RT headers if we're using it
+ifneq ($(shell grep "define LITMUS 1" ../../baseline/source/extra.h),)
+        CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
+        LDFLAGS += -L${LIBLITMUS} -llitmus
+endif
+
 
 all: field matrix neighborhood pointer transitive update