RTSS17 submitwip-modechange

1 files changed, 44 insertions, 58 deletions

diff --git a/bin/rt_mode_poll.c b/bin/rt_mode_poll.c
index 08e9490..d05521c 100644
--- a/bin/rt_mode_poll.c
+++ b/bin/rt_mode_poll.c
@@ -13,15 +13,14 @@
 #include "litmus.h"
 #include "common.h"
 
+#define __NR_request_mode 408
 #define __NR_enact_mode 409
 
 int main_job(void){
-        syscall(__NR_enact_mode);
+        return syscall(__NR_enact_mode);
 }
 
 static char* progname;
-int loops = 1;
-//struct timeval t1, t2;
 
 static void usage(char *error) {
         fprintf(stderr, "Error: %s\n", error);
@@ -38,15 +37,7 @@ static void usage(char *error) {
         exit(EXIT_FAILURE);
 }
 
-inline unsigned long get_cyclecount (void)
-{
-        unsigned long value;
-        // Read CCNT Register
-        asm volatile ("MRC p15, 0, %0, c9, c13, 0\t\n": "=r"(value));
-        return value;
-}
-
-static int job(double exec_time, double program_end)
+static int job(double program_end)
 {
         if (wctime() > program_end)
                 return 0;
@@ -57,41 +48,40 @@ static int job(double exec_time, double program_end)
         }
 }
 
-#define OPTSTR "p:wves:l:m:i:b:"
+#define OPTSTR "p:wvel:b:k:"
 int main(int argc, char** argv)
 {
         int ret;
         lt_t wcet;
         lt_t period;
         lt_t budget;
-        double wcet_us, period_us, budget_us;
-        unsigned int priority = LITMUS_NO_PRIORITY;
+        double wcet_ms, period_ms, budget_ms;
+        unsigned int priority = 0; //guarantee highest priority to this task
         int migrate = 0;
         int cluster = 0;
         int opt;
         int wait = 0;
         int want_enforcement = 0;
-        double duration = 0, start = 0;
-        double scale = 1.0;
         task_class_t class = RT_CLASS_HARD;
         struct rt_task param;
         struct mc2_task mc2_param;
         struct reservation_config config;
         int res_type = PERIODIC_POLLING;
-
-        unsigned int job_no;
-
+        uint32_t mode_mask = (1 << 0);
+        int i;
+        double duration = 0, start = 0;
+        struct control_page* ctl_page = NULL;
 
         progname = argv[0];
 
         /* default for reservation */
         config.id = 0;
-        config.priority = LITMUS_NO_PRIORITY; /* use EDF by default */
+        config.priority = 1;
         config.cpu = -1;
         
-        mc2_param.crit = CRIT_LEVEL_C;
+        mc2_param.crit = CRIT_LEVEL_A;
         
-        budget_us = 10000;
+        budget_ms = 10;
 
         while ((opt = getopt(argc, argv, OPTSTR)) != -1) {
                 switch (opt) {
@@ -106,24 +96,11 @@ int main(int argc, char** argv)
                 case 'e':
                         want_enforcement = 1;
                         break;
-                case 's':
-                        scale = atof(optarg);
-                        break;
-                case 'l':
-                        loops = atoi(optarg);
-                        break;
-                case 'm':
-                        mc2_param.crit = atoi(optarg);
-                        if (mc2_param.crit < CRIT_LEVEL_A || mc2_param.crit == NUM_CRIT_LEVELS) {
-                                usage("Invalid criticality level.");
-                        }
-                        res_type = PERIODIC_POLLING;
-                        break;
                 case 'b':
-                        budget_us = atof(optarg);
+                        budget_ms = atof(optarg);
                         break;
-                case 'i':
-                        config.priority = atoi(optarg);
+                case 'k':
+                        mode_mask = atoi(optarg);
                         break;
                 case ':':
                         usage("Argument missing.");
@@ -138,15 +115,15 @@ int main(int argc, char** argv)
         if (mc2_param.crit > CRIT_LEVEL_A && config.priority != LITMUS_NO_PRIORITY)
                 usage("Bad criticailty level or priority");
 
-        if (argc - optind < 3)
+        if (argc - optind < 2)
                 usage("Arguments missing.");
 
-        wcet_us   = atof(argv[optind + 0]);
-        period_us = atof(argv[optind + 1]);
+        wcet_ms   = atof(argv[optind + 0]);
+        period_ms = atof(argv[optind + 1]);
 
-        wcet   = us2ns(wcet_us);
-        period = us2ns(period_us);
-        budget = us2ns(budget_us);
+        wcet   = ms2ns(wcet_ms);
+        period = ms2ns(period_ms);
+        budget = ms2ns(budget_ms);
         
         if (wcet <= 0)
                 usage("The worst-case execution time must be a "
@@ -159,12 +136,15 @@ int main(int argc, char** argv)
         }
 
         duration  = atof(argv[optind + 2]);
-
+        
         if (migrate) {
                 ret = be_migrate_to_domain(cluster);
                 if (ret < 0)
                         bail_out("could not migrate to target partition or cluster.");
         }
+        else{
+                bail_out("rt_mode_poll must be migrated.");
+        }
 
         /* reservation config */
         config.id = gettid();
@@ -176,11 +156,16 @@ int main(int argc, char** argv)
         if (config.polling_params.budget > config.polling_params.period) {
                 usage("The budget must not exceed the period.");
         }
-        
-        /* create a reservation */
-        ret = reservation_create(res_type, &config);
-        if (ret < 0) {
-                bail_out("failed to create reservation.");
+
+        /* create reservation's */
+        for( i = 0; i < 32; i++){
+                if ( !( (1 << i) & mode_mask ) )
+                        continue;
+                config.mode = i;
+                ret = reservation_create(res_type, &config);
+                if (ret < 0) {
+                        bail_out("failed to create reservation.");
+                }
         }
         
         init_rt_task_param(&param);
@@ -200,21 +185,23 @@ int main(int argc, char** argv)
                 bail_out("could not setup rt task params");
         
         mc2_param.res_id = gettid();
+        mc2_param.mode_mask = mode_mask;
         ret = set_mc2_task_param(gettid(), &mc2_param);
         if (ret < 0)
                 bail_out("could not setup mc2 task params");
 
         init_litmus();
-        if (mc2_param.crit == CRIT_LEVEL_C)
-                set_page_color(8);
-        else if (mc2_param.crit < CRIT_LEVEL_C)
-                set_page_color(config.cpu*2 + mc2_param.crit);
-
+        ctl_page = get_ctrl_page();
+        if (!ctl_page)
+                bail_out("could not get ctrl_page");
+        ctl_page->mode_poll_task = 1;
+        
         start = wctime();
         ret = task_mode(LITMUS_RT_TASK);
         if (ret != 0)
                 bail_out("could not become RT task");
 
+        set_page_color(config.cpu);
 
         if (wait) {
                 ret = wait_for_ts_release();
@@ -223,13 +210,12 @@ int main(int argc, char** argv)
                 start = wctime();
         }
 
-        while (job(wcet_us * 0.000001 * scale, start + duration)) {};
+        while (job(start + duration)) {};
 
         ret = task_mode(BACKGROUND_TASK);
         if (ret != 0)
                 bail_out("could not become regular task (huh?)");
 
         reservation_destroy(gettid(), config.cpu);
-        printf("%s/%d finished.\n",progname, gettid()); 
         return 0;
 }