RTSS17 submitwip-modechange

19 files changed, 441 insertions, 6519 deletions

diff --git a/Makefile b/Makefile
index c2a1105..3e6ee15 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ LITMUS_KERNEL ?= ../litmus-rt
 
 # compiler flags
 flags-debug    = -O0 -Wall -g -Wdeclaration-after-statement
-flags-api      = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE -DCONFIG_PGMRT_SUPPORT
+flags-api      = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE
 
 # architecture-specific flags
 flags-i386     = -m32
@@ -73,13 +73,14 @@ AR  := ${CROSS_COMPILE}${AR}
 
 all     = lib ${rt-apps}
 rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
-          base_mt_task uncache runtests resctrl mc2spin test1 \
-          mc2thrash mc2shm mc2thrash1 mc2thrash2 mc2thrash3 mc2bench\
-          mtdag
+        base_mt_task uncache runtests resctrl mc2mem \
+        mc2spin mtdag mode_request rt_mode_poll
+
+#mc2thrash mc2thrash1 mc2thrash2 mc2thrash3
 
 .PHONY: all lib clean dump-config TAGS tags cscope help doc
 
-all: ${all} inc/config.makefile
+all: ${all} inc/config.makefile post-build
 
 # Write a distilled version of the flags for clients of the library. Ideally,
 # this should depend on liblitmus.a, but that requires LIBLITMUS to be a
@@ -128,6 +129,7 @@ clean:
         rm -f inc/config.makefile
         rm -f tags TAGS cscope.files cscope.out
         rm -r -f docs
+        rm -f mc2mem*
 
 # Emacs Tags
 TAGS:
@@ -145,6 +147,8 @@ cscope:
         @find . -type f -and  -iname '*.[ch]' | xargs printf "%s\n" > cscope.files
         @cscope -b
 
+post-build:
+        
 # ##############################################################################
 # Kernel headers.
 # The kernel does not like being #included directly, so let's
@@ -242,38 +246,17 @@ obj-resctrl = resctrl.o
 obj-mc2spin = mc2spin.o common.o
 lib-mc2spin = -lrt -static
 
-obj-mc2pollute = mc2pollute.o common.o
-lib-mc2pollute = -lrt -static
-
-obj-mc2syn = mc2syn.o common.o
-lib-mc2syn = -lrt -static
-
-obj-memthrash = memthrash.o
-lib-memthrash = -lrt
-
-obj-test1 = test1.o common.o
-lib-test1 = -lrt -static
-
-obj-mc2thrash = mc2thrash.o common.o
-lib-mc2thrash = -lrt -static
-
-obj-mc2thrash1 = mc2thrash.o common.o
-lib-mc2thrash1 = -lrt -static
-
-obj-mc2thrash2 = mc2thrash.o common.o
-lib-mc2thrash2 = -lrt -static
-
-obj-mc2thrash3 = mc2thrash.o common.o
-lib-mc2thrash3 = -lrt -static
-
-obj-mc2shm = mc2shm.o common.o
-lib-mc2shm = -lrt -static
+obj-mc2mem = mc2mem.o common.o
+lib-mc2mem = -lrt -static
 
 obj-mtdag = mtdag.o common.o
 ldf-mtdag = -lrt -pthread -static
 
-obj-mc2bench = mc2bench.o common.o
-lib-mc2bench = -lrt -static
+obj-mode_request = mode_request.o common.o
+lib-mode_request = -lrt -static
+
+obj-rt_mode_poll = rt_mode_poll.o common.o
+lib-rt_mode_poll = -lrt -static
 # ##############################################################################
 # Build everything that depends on liblitmus.
 
diff --git a/bin/mc2bench.c b/bin/mc2bench.c
deleted file mode 100644
index dfb4f15..0000000
--- a/bin/mc2bench.c
+++ /dev/null
@@ -1,503 +0,0 @@
-#include <sys/time.h>
-#include <sys/mman.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
-#include <assert.h>
-#include <limits.h>
-#include <fcntl.h>
-
-#include "litmus.h"
-#include "common.h"
-#include "color_shm.h"
-
-#define PAGE_SIZE (4096)
-//#define CACHELINE_SIZE 32
-//#define INTS_IN_CACHELINE (CACHELINE_SIZE/sizeof(int))
-//#define CACHELINES_IN_1KB (1024 / sizeof(cacheline_t))
-#define INTS_IN_1KB     (1024 / sizeof(int))
-
-//typedef struct cacheline
-//{
-//        int line[INTS_IN_CACHELINE];
-//} __attribute__((aligned(CACHELINE_SIZE))) cacheline_t;
-
-static int loops = 100000;
-static cacheline_t* arena = NULL;
-static cacheline_t* local_buf = NULL;
-
-struct timeval t1,t2;
-
-lt_t exectime[100000];
-
-inline unsigned long get_cyclecount (void)
-{
-        unsigned long value;
-        // Read CCNT Register
-        asm volatile ("MRC p15, 0, %0, c9, c13, 0\t\n": "=r"(value));
-        return value;
-}
-
-#define UNCACHE_DEV "/dev/litmus/uncache"
-
-static cacheline_t* alloc_shm(int cs, size_t size, int use_huge_pages, int use_uncache_pages)
-{
-        struct color_ioctl_cmd shm_info;
-        struct color_ioctl_offset shm_offset;
-        cacheline_t* arena = NULL;
-        
-
-        shm_info.color = 0x0000ffff; 
-        
-        if (cs == 1 || cs == 2)
-                shm_info.bank  = 0x00000020; // hi crit. bank
-        else if (cs == 3)
-                shm_info.bank  = 0x00000040; // levelC
-        
-        shm_offset.offset = 0;
-        shm_offset.lock = 1;
-
-        arena = color_mmap(size, shm_info, shm_offset);
-        if (arena == MAP_FAILED) {
-                printf("mmap failed.\n");
-                return NULL;
-        }
-
-        mlockall(MCL_CURRENT | MCL_FUTURE);
-        /* finish allocation */
-
-    assert(arena);
-
-    return arena;
-}
-
-static cacheline_t* alloc_local(size_t size, int use_huge_pages, int use_uncache_pages)
-{
-    int flags = MAP_PRIVATE | MAP_POPULATE;
-    cacheline_t* arena = NULL;
-    int fd;
-
-    if(use_huge_pages)
-        flags |= MAP_HUGETLB;
-
-        if(use_uncache_pages) {
-                        fd = open(UNCACHE_DEV, O_RDWR|O_SYNC);
-                        if (fd == -1)
-                                        bail_out("Failed to open uncache device. Are you running the LITMUS^RT kernel?");
-        }
-        else {
-                        fd = -1;
-                        flags |= MAP_ANONYMOUS;
-        }
-
-    arena = mmap(0, size, PROT_READ | PROT_WRITE, flags, fd, 0);
-