[API] rename task_mode_transition() and don't exit on error

2 files changed, 13 insertions, 8 deletions

diff --git a/include/litmus.h b/include/litmus.h
index b0095e3..343aab3 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -152,7 +152,7 @@ enum rt_task_mode_t {
         BACKGROUND_TASK = 0,
         LITMUS_RT_TASK  = 1
 };
-int task_mode_transition(int target_mode);
+int task_mode(int target_mode);
 
 
 const char* get_scheduler_name(spolicy scheduler);
diff --git a/src/litmus.c b/src/litmus.c
index 5be0b41..6ca35a3 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -276,8 +276,14 @@ int litmus_task_active(void)
         return !exit_requested;
 }
 
-#define check(str) if (ret == -1) {perror(str); fprintf(stderr, \
-        "Could not initialize LITMUS^RT, aborting...\n"); exit(1);}
+#define check(str)       \
+        if (ret == -1) { \
+                perror(str); \
+                fprintf(stderr, \
+                        "Warning: Could not initialize LITMUS^RT, " \
+                        "%s failed.\n", str                         \
+                        ); \
+        }
 
 void init_litmus(void)
 {
@@ -286,9 +292,9 @@ void init_litmus(void)
         np_flag.ctr = 0;
 
         ret = mlockall(MCL_CURRENT | MCL_FUTURE);
-        check("mlockall");
+        check("mlockall()");
         ret = register_np_flag(&np_flag);
-        check("register_np_flag");      
+        check("register_np_flag()");    
         signal(SIGINT, sig_handler);
         signal(SIGTERM, sig_handler);
         signal(SIGHUP, sig_handler);
@@ -296,7 +302,6 @@ void init_litmus(void)
 }
 
 
-
 /*      Litmus syscalls definitions */
 #define __NR_sched_setpolicy    320
 #define __NR_sched_getpolicy    321
@@ -321,7 +326,7 @@ void init_litmus(void)
 #define __NR_get_cur_service_level      340
 #define __NR_reg_ics_cb                 341
 #define __NR_start_wcs                  342
-#define __NR_task_mode_transition       343
+#define __NR_task_mode                  343
 
 /*      Syscall stub for setting RT mode and scheduling options */
 _syscall0(spolicy, sched_getpolicy);
@@ -348,4 +353,4 @@ _syscall1(int,     wait_for_job_release, unsigned int, job_no);
 
 _syscall1(int,     start_wcs,         int,  od);
 _syscall1(int,     reg_ics_cb,        struct ics_cb*, ics_cb);
-_syscall1(int,     task_mode_transition, int, target_mode);
+_syscall1(int,     task_mode, int, target_mode);