Removed mixed-criticality codewip-color-jlh

14 files changed, 1284 insertions, 49 deletions

diff --git a/.gitignore b/.gitignore
index 7f419d0..07d6c61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,9 @@ showst
 rtspin
 cycles
 measure_syscall
+colortest
+colorbench
+testcounters
 
 # build system files
 .config
diff --git a/Makefile b/Makefile
index 6b1feed..5527862 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ host-arch := $(shell uname -m | \
 ARCH ?= ${host-arch}
 
 # LITMUS_KERNEL -- where to find the litmus kernel?
-LITMUS_KERNEL ?= ../litmus-rt
+LITMUS_KERNEL ?= ../backup-litmus-rt
 
 
 # ##############################################################################
@@ -71,8 +71,8 @@ AR  := ${CROSS_COMPILE}${AR}
 # Targets
 
 all     = lib ${rt-apps}
-rt-apps = cycles base_task rt_launch locktest rtspin rtspin.ovh rtspin.beta release_ts \
-          measure_syscall base_mt_task runtests bespin
+rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
+          base_mt_task runtests colortest colorbench testcounters bespin
 
 .PHONY: all lib clean dump-config TAGS tags cscope help
 
@@ -155,7 +155,7 @@ arch/${include-${ARCH}}/include/asm/%.h: \
         cp $< $@
 
 litmus-headers = include/litmus/rt_param.h include/litmus/unistd_32.h \
-        include/litmus/unistd_64.h include/litmus/sched_mc.h include/litmus/color.h
+        include/litmus/unistd_64.h include/litmus/color.h
 
 unistd-headers = \
   $(foreach file,${unistd-${ARCH}},arch/${include-${ARCH}}/include/asm/$(file))
@@ -230,12 +230,21 @@ lib-locktest = -lrt -pthread
 obj-measure_syscall = null_call.o
 lib-measure_syscall = -lm
 
+obj-colortest = colortest.o color.o
+lib-colortest = -static
+
+obj-colorbench = colorbench.o color.o perfcounters.o common.o
+lib-colorbench = -lpthread -lrt -lgsl -lgslcblas
+
+obj-testcounters = testcounters.o
+lib-testcounters =
+
 # ##############################################################################
 # Build everything that depends on liblitmus.
 
 .SECONDEXPANSION:
 ${rt-apps}: $${obj-$$@} liblitmus.a
-        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${lib-$@} ${liblitmus-flags}
+        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${liblitmus-flags} ${lib-$@}
 
 # ##############################################################################
 # Dependency resolution.
@@ -273,7 +282,7 @@ $(error Cannot build without access to the LITMUS^RT kernel source)
 endif
 
 kernel-unistd-hdrs := $(foreach file,${unistd-headers},${LITMUS_KERNEL}/$(file))
-hdr-ok     := $(shell egrep '\#include ["<]litmus/unistd' ${kernel-unistd-hdrs} )
+hdr-ok     := $(shell egrep '\#include .*litmus/unistd' ${kernel-unistd-hdrs} )
 ifeq ($(strip $(hdr-ok)),)
 $(info (!!) Could not find LITMUS^RT system calls in ${kernel-unistd-hdrs}.)
 $(error Your kernel headers do not seem to be LITMUS^RT headers)
@@ -290,4 +299,3 @@ $(error Cannot build without access to the architecture-specific files)
 endif
 
 endif
-
diff --git a/bin/color.c b/bin/color.c
new file mode 100644
index 0000000..2ec97a4
--- /dev/null
+++ b/bin/color.c
@@ -0,0 +1,50 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <sys/mman.h>
+#include <sys/fcntl.h>
+#include <unistd.h>
+
+#include <litmus/rt_param.h>
+
+#include "color.h"
+
+#define LITMUS_COLOR_ALLOC      "/dev/litmus/color_alloc"
+#define LITMUS_COLOR_CTRL       "/dev/litmus/color_ctrl"
+
+static int map_file(const char* filename, void **addr, size_t size)
+{
+        int error = 0;
+        int fd;
+
+        if (size > 0) {
+                fd = open(filename, O_RDWR);
+                if (fd >= 0) {
+                        *addr = mmap(NULL, size,
+                                     PROT_READ | PROT_WRITE,
+                                     MAP_PRIVATE,
+                                     fd, 0);
+                        if (*addr == MAP_FAILED)
+                                error = -1;
+                        close(fd);
+                } else
+                        error = fd;
+        } else
+                *addr = NULL;
+        return error;
+}
+
+int map_color_ctrl(void **addr)
+{
+        return map_file(LITMUS_COLOR_CTRL, addr, PAGE_SIZE);
+}
+
+void* color_malloc(size_t size)
+{
+        int err;
+        void *mem;
+
+        err = map_file(LITMUS_COLOR_ALLOC, &mem, size);
+        if (err)
+                mem = NULL;
+        return mem;
+}
diff --git a/bin/colorbench.c b/bin/colorbench.c
new file mode 100644
index 0000000..c91b731
--- /dev/null
+++ b/bin/colorbench.c
@@ -0,0 +1,460 @@
+#include <stdint.h>     /* rt_param needs uint types */
+#include <stdlib.h>
+#include <limits.h>
+#include <pthread.h>
+#include <sched.h>
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/mman.h> /* mlockall */
+#include <sys/ioctl.h>
+
+#include <litmus/rt_param.h>
+
+#include "perfcounters.h"
+#include "color.h"
+#include "litmus.h"
+
+#define DEBUG           1
+#define NR_LOOPS        10
+
+/* Pound */
+#define NR_CPUS         4
+#define CACHE_SIZE_MB   8
+#define ASSOC           16
+#define LINE_SIZE       64
+
+#define CACHE_SIZE      (CACHE_SIZE_MB * 1024 * 1024)
+#define TOTAL_COLORS    (CACHE_SIZE / ASSOC / PAGE_SIZE)
+
+/* number of colors we actually use */
+#define USE_COLORS      (TOTAL_COLORS >> color_shift)
+
+/* how many adjacent pages of the same color we need to allocate */
+#define CONTIG_COLORS   (ARENA_PAGES / USE_COLORS)
+
+/* number of pages in arena */
+#define ARENA_PAGES     (arena_size / PAGE_SIZE)
+
+/* page offset bit mask */
+#define PAGE_LOWER      ((PAGE_SIZE - 1))
+
+/* number of integers in arena */
+#define ARENA_INTS      (arena_size / sizeof(int))
+
+/* number of pages in arena */
+#define ARENA_PAGES     (arena_size / PAGE_SIZE)
+
+/* number of cache lines in arena */
+#define ARENA_LINES     (arena_size / LINE_SIZE)
+
+/* number of cache lines per page */
+#define PAGE_LINES      (PAGE_SIZE / LINE_SIZE)
+
+/* number of integers in a page */
+#define PAGE_INTS       (PAGE_SIZE / sizeof(int))
+
+/* number of integers in a cache line */
+#define LINE_INTS       (LINE_SIZE / sizeof(int))
+