Change create_rt_task() to task rt_task parameter.

This updates create_rt_task() to take an rt_task parameter
instead of a number of task parameters.  This probably
should have been a part of patches recent patches that revised
the sproadic_*() macros.

3 files changed, 29 insertions, 33 deletions

diff --git a/bin/rt_launch.c b/bin/rt_launch.c
index f5de40c..805e20b 100644
--- a/bin/rt_launch.c
+++ b/bin/rt_launch.c
@@ -42,7 +42,7 @@ void usage(char *error) {
 }
 
 
-#define OPTSTR "p:z:c:vwq:"
+#define OPTSTR "p:z:c:vwq:t"
 
 int main(int argc, char** argv)
 {
@@ -58,6 +58,8 @@ int main(int argc, char** argv)
         startup_info_t info;
         task_class_t cls = RT_CLASS_HARD;
         unsigned int priority = LITMUS_LOWEST_PRIORITY;
+        budget_policy_t budget_pol = QUANTUM_ENFORCEMENT;
+        struct rt_task param;
 
         while ((opt = getopt(argc, argv, OPTSTR)) != -1) {
                 switch (opt) {
@@ -84,7 +86,10 @@ int main(int argc, char** argv)
                         if (cls == -1)
                                 usage("Unknown task class.");
                         break;
-
+                case 't':
+                        /* use an hrtimer for budget enforcement */
+                        budget_pol = PRECISE_ENFORCEMENT;
+                        break;
                 case ':':
                         usage("Argument missing.");
                         break;
@@ -118,8 +123,18 @@ int main(int argc, char** argv)
                 if (ret < 0)
                         bail_out("could not migrate to target partition or cluster");
         }
-        ret = __create_rt_task(launch, &info, cluster, cluster_size, wcet, period,
-                                priority, cls);
+
+        init_rt_task_param(&param);
+        param.exec_cost = wcet;
+        param.period = period;
+        param.priority = priority;
+        param.cls = cls;
+        param.budget_policy = budget_pol;
+
+        if (migrate)
+                param.cpu = cluster_to_first_cpu(cluster, cluster_size);
+
+        ret = create_rt_task(launch, &info, &param);
 
         if (ret < 0)
                 bail_out("could not create rt child process");
diff --git a/include/litmus.h b/include/litmus.h
index accdbaa..d3b89cf 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -117,14 +117,8 @@ void exit_litmus(void);
 /* A real-time program. */
 typedef int (*rt_fn_t)(void*);
 
-/* These two functions configure the RT task to use enforced exe budgets.
- * Partitioned scheduling: cluster = desired partition, cluster_size = 1
- * Global scheduling: cluster = 0, cluster_size = 0
- */
-int create_rt_task(rt_fn_t rt_prog, void *arg, int cluster, int cluster_size,
-                        lt_t wcet, lt_t period, unsigned int prio);
-int __create_rt_task(rt_fn_t rt_prog, void *arg, int cluster, int cluster_size,
-                        lt_t wcet, lt_t period, unsigned int prio, task_class_t cls);
+/* exec another program as a real-time task. */
+int create_rt_task(rt_fn_t rt_prog, void *arg, struct rt_task* param);
 
 /*      per-task modes */
 enum rt_task_mode_t {
diff --git a/src/task.c b/src/task.c
index ef4bf79..c3a9109 100644
--- a/src/task.c
+++ b/src/task.c
@@ -40,29 +40,16 @@ int __launch_rt_task(rt_fn_t rt_prog, void *rt_arg, rt_setup_fn_t setup,
         return rt_task;
 }
 
-int __create_rt_task(rt_fn_t rt_prog, void *arg, int cluster, int cluster_size,
-                lt_t wcet, lt_t period, unsigned int priority, task_class_t cls)
+int create_rt_task(rt_fn_t rt_prog, void *arg, struct rt_task* param)
 {
-        struct rt_task params;
-        init_rt_task_param(&params);
-        params.cpu       = cluster_to_first_cpu(cluster, cluster_size);
-        params.period    = period;
-        params.exec_cost = wcet;
-        params.cls       = cls;
-        params.phase     = 0;
-        params.priority = priority;
-        /* enforce budget for tasks that might not use sleep_next_period() */
-        params.budget_policy = QUANTUM_ENFORCEMENT;
-
-        return __launch_rt_task(rt_prog, arg,
-                                (rt_setup_fn_t) set_rt_task_param, &params);
-}
+        if (param->budget_policy == NO_ENFORCEMENT) {
+                /* This is only safe if the task to be launched does not peg the CPU.
+                 That is, it must block frequently for I/O or call sleep_next_period()
+                 at the end of each job. Otherwise, the task may peg the CPU. */
+                //printf("Warning: running budget enforcement used.\n");
+        }
 
-int create_rt_task(rt_fn_t rt_prog, void *arg, int cluster, int cluster_size,
-                lt_t wcet, lt_t period, unsigned int prio)
-{
-        return __create_rt_task(rt_prog, arg, cluster, cluster_size, wcet, period,
-                                prio, RT_CLASS_HARD);
+        return __launch_rt_task(rt_prog, arg, (rt_setup_fn_t) set_rt_task_param, param);
 }