1 files changed, 27 insertions, 56 deletions

diff --git a/bin/mc2spin.c b/bin/mc2spin.c
index 25b1c58..dfb5c80 100644
--- a/bin/mc2spin.c
+++ b/bin/mc2spin.c
@@ -14,10 +14,6 @@
 #include "common.h"
 
 #define PAGE_SIZE 4096
-#define NUM_ITEMS 8192
-
-int *pages;
-unsigned long *access_order;
 
 static void usage(char *error) {
         fprintf(stderr, "Error: %s\n", error);
@@ -105,46 +101,16 @@ static void get_exec_times(const char *file, const int column,
         fclose(fstream);
 }
 
-#define NUMS 4096
+#define NUMS 16
 static int num[NUMS];
 static char* progname;
 
-static int randrange(const int max)
-{
-        return (rand() / (RAND_MAX / max + 1));
-}
-
-static void sattolo(unsigned long *items, const unsigned long len)
-{
-        unsigned long i;
-        /* first set up 0, 1, ..., n - 1 */
-        for (i = 0; i < len; i++)
-                items[i] = i;
-        /* note: i is now n */
-        while (1 < i--) {
-                /* 0 <= j < i */
-                int t, j = randrange(i);
-                t = items[i];
-                items[i] = items[j];
-                items[j] = t;
-        }
-}
-
 static int loop_once(void)
 {
         int i, j = 0;
         for (i = 0; i < NUMS; i++)
-                j += num[i]++;
+                j += num[i];
         return j;
-/*
-        int i, tmp;
-        for (i = 0; i < NUM_ITEMS; i++) {
-                tmp = pages[access_order[i]];
-                if (access_order[i] % 3 == 0)
-                        pages[access_order[i]] = i+tmp;
-        }
-        return 1;
-*/
 }
 
 static int loop_for(double exec_time, double emergency_exit)
@@ -275,7 +241,7 @@ struct lt_interval* parse_td_intervals(int num, char* optarg, unsigned int *num_
         return slots;
 }
 
-#define OPTSTR "p:c:wlveo:f:s:q:X:L:Q:vh:m:i:b:"
+#define OPTSTR "p:c:wlveo:f:s:q:X:L:Q:vh:m:i:b:k:"
 int main(int argc, char** argv)
 {
         int ret;
@@ -302,7 +268,8 @@ int main(int argc, char** argv)
         struct mc2_task mc2_param;
         struct reservation_config config;
         int res_type = PERIODIC_POLLING;
-        int n_str, num_int = 0;
+        int i;
+        uint32_t mode_mask;
 
         int verbose = 0;
         unsigned int job_no;
@@ -395,6 +362,9 @@ int main(int argc, char** argv)
                 case 'i':
                         config.priority = atoi(optarg);
                         break;
+                case 'k':
+                        mode_mask = atoi(optarg);
+                        break;
                 case ':':
                         usage("Argument missing.");
                         break;
@@ -410,8 +380,16 @@ int main(int argc, char** argv)
                 return 0;
         }
 
-        if (mc2_param.crit > CRIT_LEVEL_A && config.priority != LITMUS_NO_PRIORITY)
+        if (mc2_param.crit == CRIT_LEVEL_A && config.priority == LITMUS_NO_PRIORITY)
                 usage("Bad criticailty level or priority");
+        if (mc2_param.crit == CRIT_LEVEL_B) {
+                config.priority = LITMUS_NO_PRIORITY;
+        }
+        
+        if (mc2_param.crit == CRIT_LEVEL_C) {
+                config.priority = LITMUS_NO_PRIORITY;
+                config.cpu = -1;
+        }
 
         srand(getpid());
 
@@ -477,11 +455,15 @@ 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.");
+        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);
@@ -501,24 +483,19 @@ 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);
 //printf("SET_MC2_TASK\n");
         if (ret < 0)
                 bail_out("could not setup mc2 task params");
 
-        pages = (int*)malloc(sizeof(int)*NUM_ITEMS);
-        access_order = (unsigned long*)malloc(sizeof(unsigned long)*NUM_ITEMS);
-        sattolo(access_order, NUM_ITEMS);
-
         init_litmus();
-printf("CALL\n");
-        set_page_color(config.cpu);
-printf("CALL\n");
 
 //printf("INIT_LITMUS\n");
         start = wctime();
         ret = task_mode(LITMUS_RT_TASK);
 //printf("TASK_MODE\n");
+        set_page_color(config.cpu);
         if (ret != 0)
                 bail_out("could not become RT task");
 
@@ -555,7 +532,6 @@ printf("CALL\n");
                 } while (job(wcet_ms * 0.001 * scale, start + duration,
                            lock_od, cs_length * 0.001));
         }
-printf("BEFORE BACK_TASK\n");
         ret = task_mode(BACKGROUND_TASK);
         if (ret != 0)
                 bail_out("could not become regular task (huh?)");
@@ -565,10 +541,5 @@ printf("BEFORE BACK_TASK\n");
 
         reservation_destroy(gettid(), config.cpu);
         
-printf("CALL\n");
-        set_page_color(config.cpu);
-printf("CALL\n");
-        free(pages);
-        free(access_order);
         return 0;
 }