Add a new version of RTSpin

This version uses nanoseconds as its parameters and takes an extra
parameter that is the time to run for; i.e., RTSpin does not run for its
WCET, but something less than that.

2 files changed, 247 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index ae06ce5..36d395b 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ AR  := ${CROSS_COMPILE}${AR}
 # Targets
 
 all     = lib ${rt-apps}
-rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
+rt-apps = cycles base_task rt_launch rtspin rtspin.ovh release_ts measure_syscall \
           base_mt_task runtests
 
 .PHONY: all lib clean dump-config TAGS tags cscope help
@@ -211,6 +211,9 @@ obj-rt_launch = rt_launch.o common.o
 obj-rtspin = rtspin.o common.o
 lib-rtspin = -lrt
 
+obj-rtspin.ovh = rtspin.ovh.o common.o
+lib-rtspin.ovh = -lrt
+
 obj-release_ts = release_ts.o
 
 obj-measure_syscall = null_call.o
diff --git a/bin/rtspin.ovh.c b/bin/rtspin.ovh.c
new file mode 100644
index 0000000..31a4458
--- /dev/null
+++ b/bin/rtspin.ovh.c
@@ -0,0 +1,243 @@
+#include <sys/time.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include <assert.h>
+#include <strings.h>
+
+
+#include "litmus.h"
+#include "common.h"
+
+#include <litmus/sched_mc.h>
+
+
+static void usage(char *error) {
+        fprintf(stderr, "Error: %s\n", error);
+        fprintf(stderr,
+                "Usage:\n"
+                "       rt_spin [COMMON-OPTS] EXEC_TIME WCET PERIOD DURATION\n"
+                "       rt_spin -l\n"
+                "\n"
+                "COMMON-OPTS = [-w] [-p PARTITION] [-c CLASS] [-s SCALE]\n"
+                "              [-r CRITICALITY = [a|b|c|d]] [-i MC-LVL-A-ID]\n"
+                "\n"
+                "WCET and PERIOD are nanoseconds, DURATION is seconds.\n");
+        exit(EXIT_FAILURE);
+}
+
+#define NUMS 4096
+static int num[NUMS];
+static char* progname;
+
+static int loop_once(void)
+{
+        int i, j = 0;
+        for (i = 0; i < NUMS; i++)
+                j += num[i]++;
+        return j;
+}
+
+static int loop_for(double exec_time, double emergency_exit)
+{
+        double last_loop = 0, loop_start;
+        int tmp = 0;
+
+        double start = cputime();
+        double now = cputime();
+
+        while (now + last_loop < start + exec_time) {
+                loop_start = now;
+                tmp += loop_once();
+                now = cputime();
+                last_loop = now - loop_start;
+                if (emergency_exit && wctime() > emergency_exit) {
+                        /* Oops --- this should only be possible if the execution time tracking
+                         * is broken in the LITMUS^RT kernel. */
+                        fprintf(stderr, "!!! rtspin/%d emergency exit!\n", getpid());
+                        fprintf(stderr, "Something is seriously wrong! Do not ignore this.\n");
+                        break;
+                }
+        }
+
+        return tmp;
+}
+
+
+static void debug_delay_loop(void)
+{
+        double start, end, delay;
+
+        while (1) {
+                for (delay = 0.5; delay > 0.01; delay -= 0.01) {
+                        start = wctime();
+                        loop_for(delay, 0);
+                        end = wctime();
+                        printf("%6.4fs: looped for %10.8fs, delta=%11.8fs, error=%7.4f%%\n",
+                               delay,
+                               end - start,
+                               end - start - delay,
+                               100 * (end - start - delay) / delay);
+                }
+        }
+}
+
+static int job(double exec_time, double program_end)
+{
+        if (wctime() > program_end)
+                return 0;
+        else {
+                loop_for(exec_time, program_end + 1);
+                sleep_next_period();
+                return 1;
+        }
+}
+
+enum crit_level str2crit(const char* str)
+{
+        if (0 == strncasecmp("a", str, 1))
+                return CRIT_LEVEL_A;
+        else if (0 == strncasecmp("b", str, 1))
+                return CRIT_LEVEL_B;
+        else if (0 == strncasecmp("c", str, 1))
+                return CRIT_LEVEL_C;
+        /* failure */
+        return NUM_CRIT_LEVELS;
+}
+
+#define OPTSTR "p:c:wlveo:f:s:r:i:"
+
+int main(int argc, char** argv)
+{
+        int ret;
+        lt_t exec_time;
+        lt_t wcet;
+        lt_t period;
+        int migrate = 0;
+        int cpu = 0;
+        int opt;
+        int wait = 0;
+        int test_loop = 0;
+        int column = 1;
+        int want_enforcement = 0;
+        double duration = 0, start;
+        double scale = 1.0;
+        task_class_t class = RT_CLASS_HARD;
+        struct mc_task mc_task = { .crit = NUM_CRIT_LEVELS, .lvl_a_id = -1 };
+
+        progname = argv[0];
+
+        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 'e':
+                        want_enforcement = 1;
+                        break;
+                case 'l':
+                        test_loop = 1;
+                        break;
+                case 'o':
+                        column = atoi(optarg);
+                        break;
+                case 's':
+                        scale = atof(optarg);
+                        break;
+                case 'r':
+                        mc_task.crit = str2crit(optarg);
+                        if (NUM_CRIT_LEVELS == mc_task.crit)
+                                usage("Bad crit level.");
+                        break;
+                case 'i':
+                        mc_task.lvl_a_id = atoi(optarg);
+                        break;
+                case ':':
+                        usage("Argument missing.");
+                        break;
+                case '?':
+                default:
+                        usage("Bad argument.");
+                        break;
+                }
+        }
+
+        if (test_loop) {
+                debug_delay_loop();
+                return 0;
+        }
+
+        if (argc - optind < 4)
+                usage("Arguments missing.");
+
+        exec_time       = atoi(argv[optind + 0]);
+        wcet            = atoi(argv[optind + 1]);
+        period          = atoi(argv[optind + 2]);
+
+        if (exec_time <= 0 || exec_time > period)
+                usage("bad execution time");
+        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.");
+        }
+
+        duration  = atof(argv[optind + 3]);
+
+        if (migrate) {
+                ret = be_migrate_to(cpu);
+                if (ret < 0)
+                        bail_out("could not migrate to target partition");
+        }
+
+        ret = sporadic_task_ns(wcet, period, 0, cpu, class,
+                               want_enforcement ? PRECISE_ENFORCEMENT
+                                                : NO_ENFORCEMENT,
+                               migrate);
+        if (ret < 0)
+                bail_out("could not setup rt task params");
+
+        if (NUM_CRIT_LEVELS != mc_task.crit) {
+                ret = set_rt_task_mc_param(gettid(), &mc_task);
+                if (ret < 0)
+                        bail_out("could not setup rt mixed criticality params");
+        }
+
+        init_litmus();
+
+        ret = task_mode(LITMUS_RT_TASK);
+        if (ret != 0)
+                bail_out("could not become RT task");
+
+        if (wait) {
+                ret = wait_for_ts_release();
+                if (ret != 0)
+                        bail_out("wait_for_ts_release()");
+        }
+
+        start = wctime();
+
+        /* conver to seconds and scale */
+        while (job(exec_time * 0.000000001 * scale, start + duration));
+
+        ret = task_mode(BACKGROUND_TASK);
+        if (ret != 0)
+                bail_out("could not become regular task (huh?)");
+
+        return 0;
+}