Bespin can now be partitioned

1 files changed, 19 insertions, 5 deletions

diff --git a/bin/bespin.c b/bin/bespin.c
index f3b7e20..5c98a1f 100644
--- a/bin/bespin.c
+++ b/bin/bespin.c
@@ -40,7 +40,8 @@ static void usage(char *error) {
         fprintf(stderr, "Error: %s\n", error);
         fprintf(stderr,
                 "Usage:\n"
-                "       bespin [-w] [-o] [-n] [-s seed] [-f res-time file] OS_TYPE DURATION\n"
+                "       bespin [-w] [-o] [-n] [-p partition] "
+                "[-s seed] [-f res-time file] OS_TYPE DURATION\n"
                 "OS_TYPE is litmus or linux\n"
                 "DURATION is milliseconds.\n");
         exit(EXIT_FAILURE);
@@ -228,13 +229,13 @@ static int job(const lt_t exec_mean, const lt_t ia_mean, FILE *out_f,
         }
 }
 
-static void setup_litmus_task(const double phase_ms)
+static void setup_litmus_task(const double phase_ms, const int cpu)
 {
         const lt_t phase = phase_ms * __NS_PER_MS;
         int ret;
 
         /* Best-Effort task has no WCET or period, just use one */
-        ret = sporadic_task_ns(1, 1, phase, 0, RT_CLASS_BEST_EFFORT,
+        ret = sporadic_task_ns(1, 1, phase, cpu, RT_CLASS_BEST_EFFORT,
                         NO_ENFORCEMENT, 0);
         if (ret < 0)
                 bail_out("could not setup rt task params");
@@ -246,7 +247,7 @@ static void setup_litmus_task(const double phase_ms)
                 bail_out("could not become RT task");
 }
 
-#define OPTSTR "wnos:f:"
+#define OPTSTR "p:wnos:f:"
 
 int main(int argc, char** argv)
 {
@@ -261,6 +262,8 @@ int main(int argc, char** argv)
         int wait = 0;
         int nice = 0;
         int fifo = 0;
+        int cpu = 0;
+        int migrate = 0;
         struct sched_param param;
 
         progname = argv[0];
@@ -270,6 +273,10 @@ int main(int argc, char** argv)
                 case 'w':
                         wait = 1;
                         break;
+                case 'p':
+                        cpu = atoi(optarg);
+                        migrate = 1;
+                        break;
                 case 'n':
                         nice = 1;
                         break;
@@ -345,7 +352,14 @@ int main(int argc, char** argv)
         setup_rng(seed);
 
         if (using_os(LITMUS_STR, os_type)) {
-                setup_litmus_task(phase_ms);
+
+                if (migrate) {
+                        ret = be_migrate_to(cpu);
+                        if (ret < 0)
+                                bail_out("could not migrate to target partition");
+                }
+
+                setup_litmus_task(phase_ms, cpu);
 
                 if (wait) {
                         ret = wait_for_ts_release();