Updated Mixed Criticality stuffwip-mc-jerickso

2 files changed, 32 insertions, 6 deletions

diff --git a/bin/rt_launch.c b/bin/rt_launch.c
index 3863031..f3fda65 100644
--- a/bin/rt_launch.c
+++ b/bin/rt_launch.c
@@ -29,11 +29,12 @@ int launch(void *task_info_p) {
 }
 
 void usage(char *error) {
-        fprintf(stderr, "%s\nUsage: rt_launch [-w][-v][-p cpu][-c hrt | srt | be] wcet period program [arg1 arg2 ...]\n"
+        fprintf(stderr, "%s\nUsage: rt_launch [-w][-v][-p cpu][-c hrt | srt | be][-r criticality] wcet period program [arg1 arg2 ...]\n"
                         "\t-w\tSynchronous release\n"
                         "\t-v\tVerbose\n"
                         "\t-p\tcpu (or initial cpu)\n"
                         "\t-c\tClass\n"
+                        "\t-r\tCriticality\n"
                         "\twcet, period in ms\n"
                         "\tprogram to be launched\n",
                         error);
@@ -41,13 +42,14 @@ void usage(char *error) {
 }
 
 
-#define OPTSTR "p:c:vw"
+#define OPTSTR "p:c:r:vw"
 
 int main(int argc, char** argv) 
 {
         int ret;
         lt_t wcet;
         lt_t period;
+        int criticality = 0;
         int migrate = 0;
         int cpu = 0;
         int opt;
@@ -73,6 +75,17 @@ int main(int argc, char** argv)
                         if (class == -1)
                                 usage("Unknown task class.");
                         break;
+                case 'r':
+                        criticality = atoi(optarg);
+                        if (criticality > 1){
+                                if (criticality > 3){
+                                        class = RT_CLASS_BEST_EFFORT;
+                                }
+                                else{
+                                        class = RT_CLASS_SOFT;
+                                }
+                        }
+                        break;
 
                 case ':':
                         usage("Argument missing.");
@@ -107,7 +120,8 @@ int main(int argc, char** argv)
                 if (ret < 0)
                         bail_out("could not migrate to target partition");
         }
-        ret = __create_rt_task(launch, &info, cpu, wcet, period, class);
+        ret = __create_rt_task(launch, &info, cpu, wcet, period,
+                        criticality, class);
 
         
         if (ret < 0)
diff --git a/bin/rtspin.c b/bin/rtspin.c
index f291869..cfd5853 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -30,7 +30,7 @@ static double wctime()
 void usage(char *error) {
         fprintf(stderr, "Error: %s\n", error);
         fprintf(stderr,
-                "Usage: rt_spin [-w] [-p PARTITION] [-c CLASS] WCET PERIOD DURATION\n"
+                "Usage: rt_spin [-w] [-p PARTITION] [-c CLASS] [-r CRITICALITY] WCET PERIOD DURATION\n"
                 "       rt_spin -l\n");
         exit(1);
 }
@@ -133,7 +133,7 @@ static int job(double exec_time)
         return 0;
 }
 
-#define OPTSTR "p:c:wld:v"
+#define OPTSTR "p:c:r:wld:v"
 
 int main(int argc, char** argv) 
 {
@@ -143,6 +143,7 @@ int main(int argc, char** argv)
         double wcet_ms, period_ms;
         int migrate = 0;
         int cpu = 0;
+        int criticality = 0;
         int opt;
         int wait = 0;
         int test_loop = 0;
@@ -167,6 +168,17 @@ int main(int argc, char** argv)
                         if (class == -1)
                                 usage("Unknown task class.");
                         break;
+                case 'r':
+                        criticality = atoi(optarg);
+                        if (criticality > 1){
+                                if (criticality > 3){
+                                        class = RT_CLASS_BEST_EFFORT;
+                                }
+                                else{
+                                        class = RT_CLASS_SOFT;
+                                }
+                        }
+                        break;
                 case 'l':
                         test_loop = 1;
                         break;
@@ -221,7 +233,7 @@ int main(int argc, char** argv)
                         bail_out("could not migrate to target partition");
         }
 
-        ret = sporadic_task_ns(wcet, period, 0, cpu, class, NO_ENFORCEMENT, migrate);
+        ret = sporadic_task_ns(wcet, period, 0, cpu, criticality, class, NO_ENFORCEMENT, migrate);
 
         if (ret < 0)
                 bail_out("could not setup rt task params");