4 files changed, 30 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index b84b865..5a62984 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,8 @@ np_test: np_test.o litmus.h liblitmus.a
 run: run.o ${LIBS}
         cc -o run run.o ${LIBS}
 
-rt_launch: liblitmus.a litmus.h rt_launch.o
-        cc -static -o rt_launch  rt_launch.o ${LIBS}
+rt_launch: liblitmus.a litmus.h rt_launch.o common.o
+        cc -static -o rt_launch  rt_launch.o common.o  ${LIBS}
 
 release_ts: liblitmus.a litmus.h release_ts.o
         cc -static -o release_ts release_ts.o ${LIBS}
diff --git a/bin/common.c b/bin/common.c
new file mode 100644
index 0000000..0a5f5c5
--- /dev/null
+++ b/bin/common.c
@@ -0,0 +1,10 @@
+#include <stdio.h>
+#include <errno.h>
+
+#include "common.h"
+
+void bail_out(const char* msg)
+{
+        perror(msg);
+        exit(-1 * errno);
+}
diff --git a/bin/rt_launch.c b/bin/rt_launch.c
index daf91db..66cb21f 100644
--- a/bin/rt_launch.c
+++ b/bin/rt_launch.c
@@ -6,6 +6,7 @@
 #include <signal.h>
 
 #include "litmus.h"
+#include "common.h"
 
 typedef struct {
         int  wait;
@@ -50,6 +51,7 @@ int main(int argc, char** argv)
         int ret;
         lt_t wcet;
         lt_t period;
+        int migrate = 0;
         int cpu = 0;
         int opt;
         int verbose = 0;
@@ -67,6 +69,7 @@ int main(int argc, char** argv)
                         break;
                 case 'p':
                         cpu = atoi(optarg);
+                        migrate = 1;
                         break;
                 case 'c':
                         class = str2class(optarg);
@@ -102,13 +105,17 @@ int main(int argc, char** argv)
         info.exec_path = argv[optind + 2];
         info.argv      = argv + optind + 2;
         info.wait      = wait;
+        if (migrate) {
+                ret = be_migrate_to(cpu);
+                if (ret < 0)
+                        bail_out("could not migrate to target partition");
+        }
         ret = __create_rt_task(launch, &info, cpu, wcet, period, class);
 
         
-        if (ret < 0) {
-                perror("Could not create rt child process");
-                return 2;       
-        } else if (verbose)
+        if (ret < 0)
+                bail_out("could not create rt child process");
+        else if (verbose)
                 printf("%d\n", ret);
 
         return 0;       
diff --git a/include/common.h b/include/common.h
new file mode 100644
index 0000000..d1234ba
--- /dev/null
+++ b/include/common.h
@@ -0,0 +1,7 @@
+#ifndef COMMON_H
+#define COMMON_H
+
+
+void bail_out(const char* msg);
+
+#endif