Merge branch 'prop/rt_task-init-final' into temp

Conflicts:
	bin/base_mt_task.c
	bin/rt_launch.c
	bin/rtspin.c
	include/litmus.h
	src/litmus.c
	src/task.c

4 files changed, 36 insertions, 14 deletions

diff --git a/gpu/dgl.c b/gpu/dgl.c
index 42a3ae2..3029255 100644
--- a/gpu/dgl.c
+++ b/gpu/dgl.c
@@ -160,14 +160,17 @@ void* rt_thread(void* _ctx)
 {
         int i;
         int do_exit = 0;
+        struct rt_task param;
 
         struct thread_context *ctx = (struct thread_context*)_ctx;
 
-        TH_CALL( init_rt_thread() );
+        init_rt_task_param(&param);
+        param.exec_cost = EXEC_COST;
+        param.period = PERIOD + 10*ctx->id; /* Vary period a little bit. */
+        param.cls = RT_CLASS_SOFT;
 
-        /* Vary period a little bit. */
-        TH_CALL( sporadic_task_ns(EXEC_COST, PERIOD + 10*ctx->id, 0, 0, LITMUS_LOWEST_PRIORITY,
-                                                        RT_CLASS_SOFT, NO_ENFORCEMENT, NO_SIGNALS, 1) );
+        TH_CALL( init_rt_thread() );
+        TH_CALL( set_rt_task_param(gettid(), &param) );
 
         if (NUM_REPLICAS) {
                 ctx->ikglp = open_ikglp_sem(ctx->fd, 0, NUM_REPLICAS);
diff --git a/gpu/ikglptest.c b/gpu/ikglptest.c
index 30623b7..e5fa6fc 100644
--- a/gpu/ikglptest.c
+++ b/gpu/ikglptest.c
@@ -193,6 +193,7 @@ int main(int argc, char** argv)
         struct thread_context* aux_ctx = NULL;
         pthread_t*           task = NULL;
         pthread_t*           aux_task = NULL;
+        struct rt_task  param;
         int fd;
 
         int opt;
@@ -346,9 +347,13 @@ int main(int argc, char** argv)
         }
 
         if (NUM_AUX_THREADS) {
+                init_rt_task_param(&param);
+                param.exec_cost = EXEC_COST;
+                param.period = PERIOD + 10*NUM_THREADS+1;
+                param.cls = RT_CLASS_SOFT;
+
                 TH_CALL( init_rt_thread() );
-                TH_CALL( sporadic_task_ns(EXEC_COST, PERIOD + 10*NUM_THREADS+1, 0, 0,
-                        LITMUS_LOWEST_PRIORITY, RT_CLASS_SOFT, NO_ENFORCEMENT, NO_SIGNALS, 1) );
+                TH_CALL( set_rt_task_param(gettid(), &param) );
                 TH_CALL( task_mode(LITMUS_RT_TASK) );
 
                 printf("[MASTER] Waiting for TS release.\n ");
@@ -442,14 +447,17 @@ void* rt_thread(void* _ctx)
         int i;
         int do_exit = 0;
         int last_replica = -1;
+        struct rt_task param;
 
         struct thread_context *ctx = (struct thread_context*)_ctx;
 
-        TH_CALL( init_rt_thread() );
+        init_rt_task_param(&param);
+        param.exec_cost = EXEC_COST;
+        param.period = PERIOD + 10*ctx->id; /* Vary period a little bit. */
+        param.cls = RT_CLASS_SOFT;
 
-        /* Vary period a little bit. */
-        TH_CALL( sporadic_task_ns(EXEC_COST, PERIOD + 10*ctx->id, 0, 0,
-                LITMUS_LOWEST_PRIORITY, RT_CLASS_SOFT, NO_ENFORCEMENT, NO_SIGNALS, 1) );
+        TH_CALL( init_rt_thread() );
+        TH_CALL( set_rt_task_param(gettid(), &param) );
 
         if(USE_KFMLP) {
                 ctx->kexclu = open_kfmlp_gpu_sem(ctx->fd,
diff --git a/gpu/nested.c b/gpu/nested.c
index edec46b..334de10 100644
--- a/gpu/nested.c
+++ b/gpu/nested.c
@@ -145,15 +145,20 @@ void* rt_thread(void* _ctx)
 {
         int i;
         int do_exit = 0;
+        struct rt_task param;
 
         struct thread_context *ctx = (struct thread_context*)_ctx;
 
+        init_rt_task_param(&param);
+        param.exec_cost = EXEC_COST;
+        param.period = PERIOD + 10*ctx->id;
+        param.cls = RT_CLASS_SOFT;
+
         /* Make presence visible. */
         //printf("RT Thread %d active.\n", ctx->id);
 
         TH_CALL( init_rt_thread() );
-        TH_CALL( sporadic_task_ns(EXEC_COST, PERIOD + 10*ctx->id, 0, 0,
-                LITMUS_LOWEST_PRIORITY, RT_CLASS_SOFT, NO_ENFORCEMENT, NO_SIGNALS, 1) );
+        TH_CALL( set_rt_task_param(gettid(), &param) );
 
         for (i = 0; i < NUM_SEMS; i++) {
                 if (!USE_PRIOQ) {
diff --git a/gpu/normal_task.c b/gpu/normal_task.c
index ffc95b1..ccc265c 100644
--- a/gpu/normal_task.c
+++ b/gpu/normal_task.c
@@ -64,11 +64,17 @@
 
 int main(int argc, char** argv)
 {
+        struct rt_task param;
+
+        init_rt_task_param(&param);
+        param.exec_cost = EXEC_COST;
+        param.period = PERIOD;
+        param.cls = RT_CLASS_SOFT;
+
         CALL( init_litmus() );
 
         CALL( init_rt_thread() );
-        CALL( sporadic_task_ns(EXEC_COST, PERIOD, 0, 0,
-                LITMUS_LOWEST_PRIORITY, RT_CLASS_SOFT, NO_ENFORCEMENT, NO_SIGNALS, 1) );
+        CALL( set_rt_task_param(gettid(), &param) );
         //CALL( task_mode(LITMUS_RT_TASK) );
 
         fprintf(stdout, "Waiting for TS release.\n ");