3 files changed, 115 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 361a891..63bdd53 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ LIBS= ./liblitmus.a
 
 LIB_OBJ=  litmus.o syscalls.o sched_trace.o task.o kernel_iface.o
 
-TARGETS = run rt_launch liblitmus.a \
-          wait_test np_test mode_test base_task base_mt_task release_ts showst
+TARGETS = rt_launch liblitmus.a \
+          wait_test np_test mode_test base_task base_mt_task release_ts showst rtspin
 
 vpath %.h include/
 vpath %.c src/ bin/
@@ -43,12 +43,12 @@ mode_test: mode_test.o litmus.h liblitmus.a
 np_test: np_test.o litmus.h liblitmus.a
         ${CC} ${CFLAGS} -static -o np_test np_test.o  ${LIBS}
 
-run: run.o ${LIBS}
-        ${CC} ${CFLAGS} -o run run.o ${LIBS}
-
 rt_launch: liblitmus.a litmus.h rt_launch.o common.o
         ${CC} ${CFLAGS} -static -o rt_launch  rt_launch.o common.o  ${LIBS}
 
+rtspin: liblitmus.a litmus.h rtspin.o common.o
+        ${CC} ${CFLAGS} -static -o rtspin  rtspin.o common.o  ${LIBS}
+
 release_ts: liblitmus.a litmus.h release_ts.o
         ${CC} ${CFLAGS} -static -o release_ts release_ts.o ${LIBS}
 
diff --git a/bin/rtspin.c b/bin/rtspin.c
new file mode 100644
index 0000000..435e496
--- /dev/null
+++ b/bin/rtspin.c
@@ -0,0 +1,110 @@
+#include <sys/time.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+
+
+#include "litmus.h"
+#include "common.h"
+
+void usage(char *error) {
+        fprintf(stderr, "Error: %s\n", error);
+        fprintf(stderr, "Usage: rt_spin [-w] [-p PARTITION] [-c CLASS] WCET PERIOD DURATION\n");
+        exit(1);
+}
+
+static double wctime()
+{
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+        return (tv.tv_sec + 1E-6 * tv.tv_usec);
+}
+
+#define OPTSTR "p:c:w"
+
+int main(int argc, char** argv) 
+{
+        int i;
+        int ret;
+        lt_t wcet;
+        lt_t period;
+        int migrate = 0;
+        int cpu = 0;
+        int opt;
+        int wait = 0;
+        double duration, start;
+        task_class_t class = RT_CLASS_HARD;
+
+        while ((opt = getopt(argc, argv, OPTSTR)) != -1) {
+                switch (opt) {
+                case 'w':
+                        wait = 1;
+                        break;
+                case 'p':
+                        cpu = atoi(optarg);
+                        migrate = 1;
+                        break;
+                case 'c':
+                        class = str2class(optarg);
+                        if (class == -1)
+                                usage("Unknown task class.");
+                        break;
+                case ':':
+                        usage("Argument missing.");
+                        break;
+                case '?':
+                default:
+                        usage("Bad argument.");
+                        break;
+                }
+        }
+
+        if (argc - optind < 3)
+                usage("Arguments missing.");       
+        wcet     = atoi(argv[optind + 0]);
+        period   = atoi(argv[optind + 1]);
+        duration = atof(argv[optind + 2]);
+        if (wcet <= 0)
+                usage("The worst-case execution time must be a "
+                      "positive number.");
+        if (period <= 0)
+                usage("The period must be a positive number.");
+        if (wcet > period) {
+                usage("The worst-case execution time must not "
+                      "exceed the period.");
+        }
+        if (migrate) {
+                ret = be_migrate_to(cpu);
+                if (ret < 0)
+                        bail_out("could not migrate to target partition");
+        }
+        
+//      printf("wcet: %llu\nperiod: %llu\n", wcet, period);
+        ret = sporadic_task(wcet, period, 0, cpu, class, migrate);
+        
+        if (ret < 0)
+                bail_out("could not become rt tasks.");
+
+//      ret = init_litmus();
+//      if (ret < 0)
+//              perror("init_litmus()");
+
+        ret = task_mode(LITMUS_RT_TASK);
+        if (ret != 0)
+                bail_out("task_mode()");
+
+        if (wait) {
+                ret = wait_for_ts_release();
+                if (ret != 0)
+                        bail_out("wait_for_ts_release()");
+        }
+        start = wctime();
+
+        while (start + duration > wctime()) {
+                for (i = 0; i < 500000; i++);
+        }
+
+        return 0;
+}
diff --git a/bin/run.c b/bin/run.c
deleted file mode 100644
index 3719d6f..0000000
--- a/bin/run.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-int main(int argc, char** argv) 
-{
-        int i;
-        for (i = 0; i < 500000000; i++);
-        return 0;
-}