rip out old junk

17 files changed, 20 insertions, 618 deletions

diff --git a/Makefile b/Makefile
index 7778545..2164d23 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,9 @@ CPPFLAGS=-Wall -g
 
 LIBS= ./liblitmus.a
 
-LIB_OBJ=  litmus.o syscalls.o sched_trace.o adaptive.o edf-hsb.o task.o kernel_iface.o
+LIB_OBJ=  litmus.o syscalls.o sched_trace.o task.o kernel_iface.o
 
-TARGETS = showsched iotest set_rt_mode  run timeout rt_launch edfhsb liblitmus.a \
+TARGETS = run rt_launch liblitmus.a \
           wait_test np_test stdump mode_test base_task base_mt_task
 
 vpath %.h include/
@@ -30,30 +30,15 @@ mode_test: mode_test.o litmus.h liblitmus.a
 np_test: np_test.o litmus.h liblitmus.a
         cc -static -o np_test np_test.o  ${LIBS}
 
-iotest: iotest.o litmus.h liblitmus.a
-        cc -static -o iotest iotest.o  ${LIBS}
-
-run: run.o
+run: run.o ${LIBS}
         cc -o run run.o ${LIBS}
 
-set_rt_mode: liblitmus.a set_rt_mode.o
-        cc -o set_rt_mode set_rt_mode.o  ${LIBS}
-
-showsched: show_scheduler.o liblitmus.a litmus.h
-        cc -o showsched  show_scheduler.o  ${LIBS}
-
-timeout: liblitmus.a timeout.o litmus.h
-        cc -static -o timeout timeout.o  ${LIBS}
-
 rt_launch: liblitmus.a litmus.h rt_launch.o
         cc -static -o rt_launch  rt_launch.o ${LIBS}
 
-edfhsb: liblitmus.a edf-hsb.o litmus.h edf-hsb.h hrt.o
-        cc -o edfhsb hrt.o edf-hsb.o  ${LIBS}
-
 stdump: liblitmus.a litmus.h sched_trace.h stdump.o
         cc -o stdump  stdump.o ${LIBS}
 
-liblitmus.a:  ${LIB_OBJ} adaptive.h litmus.h edf-hsb.h
+liblitmus.a:  ${LIB_OBJ} litmus.h 
         ${AR} rcs liblitmus.a ${LIB_OBJ}
 
diff --git a/bin/hrt.c b/bin/hrt.c
deleted file mode 100644
index 224293c..0000000
--- a/bin/hrt.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "edf-hsb.h"
-
-
-void usage(char *name) 
-{
-        fprintf(stderr, 
-                "EDF-HSB server setup utility\n"
-                "Usage: %s hrt show    <#cpu>\n"
-                "       %s hrt set     <#cpu> <wcet> <period>\n"
-                "       %s be  create         <wcet> <period>\n", 
-                name, name, name);
-        exit(1);
-}
-
-
-int hrt(int argc, char** argv) 
-{
-        int wcet, period, cpu;
-
-        if (argc == 2 && !strcmp(argv[0], "show")) {
-                cpu = atoi(argv[1]);
-                if (!get_hrt(cpu, &wcet, &period))
-                        printf("HRT/%d = (%d, %d)\n", cpu, wcet, period);
-                else
-                        perror("cannot read HRT settings");
-        } else if (argc == 4 && !strcmp(argv[0], "set")) {
-                cpu    = atoi(argv[1]);
-                wcet   = atoi(argv[2]);
-                period = atoi(argv[3]);
-                printf("Setting HRT/%d to (%d, %d)", cpu, wcet, period);
-                if (!set_hrt(cpu, wcet, period))
-                        printf(" OK.\n");
-                else {
-                        printf("\n");
-                        perror("cannot write HRT settings");
-                }       
-        } else
-                return 1;
-
-        return 0;
-}
-
-int be(int argc, char** argv)
-{
-        int wcet, period;
-        if (argc == 3 && !strcmp(argv[0], "create")) {
-                wcet    = atoi(argv[1]);
-                period   = atoi(argv[2]);
-                printf("Creating BE with (%d, %d)", wcet, period);
-                if (!create_be(wcet, period))
-                        printf(" OK.\n");
-                else {
-                        printf("\n");
-                        perror("cannot create BE server");
-                }
-                return 0;
-        }
-        else
-                return 1;
-}
-
-int main(int argc, char** argv) 
-{
-        int ret = 1;
-        if (argc > 1) {
-                if (!strcmp(argv[1], "hrt"))
-                        ret = hrt(argc - 2, argv + 2);
-                else if (!strcmp(argv[1], "be"))
-                        ret = be(argc - 2, argv + 2);
-        }
-        if (ret)
-                usage(argv[0]);
-        return ret;
-}
diff --git a/bin/iotest.c b/bin/iotest.c
deleted file mode 100644
index ac07e74..0000000
--- a/bin/iotest.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#include "litmus.h"
-
-#define US_PER_MS 1000
-
-int iotest(void *nil) {         
-        int id = getpid();
-        FILE* file;
-        char str[255];
-        unsigned long last = 0;
-        struct timeval time;
-
-        printf("I'am real time task %d  doing IO!\n", id);
-        snprintf(str, sizeof(str), "rt-io-%d.txt", id);
-        file = fopen(str, "w");
-        if (!file) {
-                perror("could not open file for output");
-                exit(1);
-        }
-        while (1) {
-                gettimeofday(&time, NULL);
-                if (time.tv_usec - last > US_PER_MS) {
-                  fprintf(file, "ran at %lus %lums\n", time.tv_sec, time.tv_usec / US_PER_MS);
-                  last = time.tv_usec;
-                }
-                fflush(file);
-        }
-        return id;
-}
-
-#define NUMTASKS 4
-
-int main(int argc, char** argv) 
-{
-        int rt_task[NUMTASKS];
-        int i;
-        int ret, pid;
-        
-        for (i = 0; i < NUMTASKS; i++) {                
-                /*                        func   arg  cpu  wcet  period */
-                rt_task[i] = create_rt_task(iotest, NULL,   0,   25,     100);
-                if (rt_task[i] < 0) {
-                        perror("Could not create rt child process");
-                }
-        }
-
-        sync();
-        sync();
-
-        printf(":: Starting real-time mode.\n");
-        set_rt_mode(MODE_RT_RUN);
-
-        printf(":: Sleeping...\n");
-        sleep(120);     
-
-        printf("Killing real-time tasks.\n");
-        for (i = 0; i < NUMTASKS; i++) {
-                printf(":: sending SIGKILL to %d\n", rt_task[i]);
-                kill(rt_task[i], SIGKILL);                      
-        }
-        for (i = 0; i < NUMTASKS; i++) {
-                pid = wait(&ret);
-                printf(":: %d exited with status %d\n", pid, ret);
-        }
-        printf(":: Leaving real-time mode.\n");