Change convenience API routines.

The sproadic_*() macros have become unwieldy. This patch
replaces those convenience macros for global, clustered,
and partitioned scheduling. A part of this API change
is the explicit use of nanosecond time-values. Prior APIs
have used lt_t (litmus time), which had an implied time
scale of nanoseconds.

/bin apps and test suite also updated to use revised API.
Modifications to the test suite are mostly centered around
using nanoseconds instead of milliseconds.

5 files changed, 31 insertions, 25 deletions

diff --git a/bin/base_mt_task.c b/bin/base_mt_task.c
index 8090cc3..aec79a4 100644
--- a/bin/base_mt_task.c
+++ b/bin/base_mt_task.c
@@ -26,8 +26,6 @@
 #define RELATIVE_DEADLINE 100
 #define EXEC_COST         10
 
-#define NS_PER_MS         1e6
-
 /* Let's create 10 threads in the example, 
  * for a total utilization of 1.
  */
@@ -129,10 +127,10 @@ void* rt_thread(void *tcontext)
         struct rt_task param;
 
         /* Set up task parameters */
-        memset(&param, 0, sizeof(param));
-        param.exec_cost = EXEC_COST * NS_PER_MS;
-        param.period = PERIOD * NS_PER_MS;
-        param.relative_deadline = RELATIVE_DEADLINE * NS_PER_MS;
+        init_rt_task_param(&param);
+        param.exec_cost = ms2ns(EXEC_COST);
+        param.period = ms2ns(PERIOD);
+        param.relative_deadline = ms2ns(RELATIVE_DEADLINE);
 
         /* What to do in the case of budget overruns? */
         param.budget_policy = NO_ENFORCEMENT;
diff --git a/bin/base_task.c b/bin/base_task.c
index df0c5a2..09edba9 100644
--- a/bin/base_task.c
+++ b/bin/base_task.c
@@ -30,8 +30,6 @@
 #define RELATIVE_DEADLINE 100
 #define EXEC_COST         10
 
-#define NS_PER_MS         1e6
-
 /* Catch errors.
  */
 #define CALL( exp ) do { \
@@ -69,10 +67,10 @@ int main(int argc, char** argv)
         struct rt_task param;
 
         /* Setup task parameters */
-        memset(&param, 0, sizeof(param));
-        param.exec_cost = EXEC_COST * NS_PER_MS;
-        param.period = PERIOD * NS_PER_MS;
-        param.relative_deadline = RELATIVE_DEADLINE * NS_PER_MS;
+        init_rt_task_param(&param);
+        param.exec_cost = ms2ns(EXEC_COST);
+        param.period = ms2ns(PERIOD);
+        param.relative_deadline = ms2ns(RELATIVE_DEADLINE);
 
         /* What to do in the case of budget overruns? */
         param.budget_policy = NO_ENFORCEMENT;
diff --git a/bin/release_ts.c b/bin/release_ts.c
index c2f6d4c..feca5ef 100644
--- a/bin/release_ts.c
+++ b/bin/release_ts.c
@@ -10,7 +10,6 @@
 #include "internal.h"
 
 #define OPTSTR "d:wf:"
-#define NS_PER_MS 1000000
 
 #define LITMUS_STATS_FILE "/proc/litmus/stats"
 
@@ -44,7 +43,7 @@ void wait_until_ready(int expected)
 int main(int argc, char** argv)
 {
         int released;
-        lt_t delay = ms2lt(1000);
+        lt_t delay = ms2ns(1000);
         int wait = 0;
         int expected = 0;
         int opt;
@@ -52,7 +51,7 @@ int main(int argc, char** argv)
         while ((opt = getopt(argc, argv, OPTSTR)) != -1) {
                 switch (opt) {
                 case 'd':
-                        delay = ms2lt(atoi(optarg));
+                        delay = ms2ns(atoi(optarg));
                         break;
                 case 'w':
                         wait = 1;
diff --git a/bin/rt_launch.c b/bin/rt_launch.c
index ae68601..93f10d5 100644
--- a/bin/rt_launch.c
+++ b/bin/rt_launch.c
@@ -99,8 +99,8 @@ int main(int argc, char** argv)
 
         if (argc - optind < 3)
                 usage("Arguments missing.");
-        wcet   = ms2lt(atoi(argv[optind + 0]));
-        period = ms2lt(atoi(argv[optind + 1]));
+        wcet   = ms2ns(atoi(argv[optind + 0]));
+        period = ms2ns(atoi(argv[optind + 1]));
         if (wcet <= 0)
         usage("The worst-case execution time must be a "
               "positive number.");
diff --git a/bin/rtspin.c b/bin/rtspin.c
index b05c17c..167741d 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -185,7 +185,6 @@ static int job(double exec_time, double program_end, int lock_od, double cs_leng
 }
 
 #define OPTSTR "p:z:c:wlveo:f:s:q:X:L:Q:"
-
 int main(int argc, char** argv)
 {
         int ret;
@@ -207,6 +206,7 @@ int main(int argc, char** argv)
         double scale = 1.0;
         task_class_t class = RT_CLASS_HARD;
         int cur_job = 0, num_jobs = 0;
+        struct rt_task param;
 
         /* locking */
         int lock_od = -1;
@@ -308,8 +308,8 @@ int main(int argc, char** argv)
         wcet_ms   = atof(argv[optind + 0]);
         period_ms = atof(argv[optind + 1]);
 
-        wcet   = wcet_ms * __NS_PER_MS;
-        period = period_ms * __NS_PER_MS;
+        wcet   = ms2ns(wcet_ms);
+        period = ms2ns(period_ms);
         if (wcet <= 0)
                 usage("The worst-case execution time must be a "
                                 "positive number.");
@@ -325,11 +325,22 @@ int main(int argc, char** argv)
         else if (file && num_jobs > 1)
                 duration += period_ms * 0.001 * (num_jobs - 1);
 
-        ret = sporadic_task_ns(wcet, period, 0, cluster, cluster_size,
-                               priority, class,
-                               want_enforcement ? PRECISE_ENFORCEMENT
-                                                : NO_ENFORCEMENT,
-                               migrate);
+        if (migrate) {
+                ret = be_migrate_to_cluster(cluster, cluster_size);
+                if (ret < 0)
+                        bail_out("could not migrate to target partition or cluster.");
+        }
+
+        init_rt_task_param(&param);
+        param.exec_cost = wcet;
+        param.period = period;
+        param.priority = priority;
+        param.cls = class;
+        param.budget_policy = (want_enforcement) ?
+                        PRECISE_ENFORCEMENT : NO_ENFORCEMENT;
+        if (migrate)
+                param.cpu = cluster_to_first_cpu(cluster, cluster_size);
+        ret = set_rt_task_param(gettid(), &param);
         if (ret < 0)
                 bail_out("could not setup rt task params");