Kill MSG_WARNING and MSG_FATAL return codes

[simgrid.git] / src / simix / smx_context_sysv.c

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index a44593d..242a962 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -22,10 +22,9 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
 typedef struct s_smx_ctx_sysv {
-  SMX_CTX_BASE_T;
+  s_smx_ctx_base_t super;       /* Fields of super implementation */
   ucontext_t uc;                /* the thread that execute the code */
   char stack[STACK_SIZE];       /* the thread stack size */
-  struct s_smx_ctx_sysv *prev;           /* the previous process */
 #ifdef HAVE_VALGRIND_VALGRIND_H
   unsigned int valgrind_stack_id;       /* the valgrind stack id */
 #endif                          
@@ -38,13 +37,9 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
 static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory);
 
 static void smx_ctx_sysv_free(smx_context_t context);
-
 static void smx_ctx_sysv_stop(smx_context_t context);
-
 static void smx_ctx_sysv_suspend(smx_context_t context);
-
-static void 
-smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context);
+static void smx_ctx_sysv_resume(smx_context_t new_context);
 
 static void smx_ctx_sysv_wrapper(void);
 
@@ -77,7 +72,7 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if(code){
-    context->code = code;
+    context->super.code = code;
 
     xbt_assert2(getcontext(&(context->uc)) == 0,
         "Error in context saving: %d (%s)", errno, strerror(errno));
@@ -97,10 +92,10 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
             context->uc.uc_stack.ss_size);
 #endif /* HAVE_VALGRIND_VALGRIND_H */
 
-    context->argc = argc;
-    context->argv = argv;
-    context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
+    context->super.argc = argc;
+    context->super.argv = argv;
+    context->super.cleanup_func = cleanup_func;
+    context->super.cleanup_arg = cleanup_arg;
 
     makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
   }
@@ -119,12 +114,12 @@ static void smx_ctx_sysv_free(smx_context_t pcontext)
 #endif /* HAVE_VALGRIND_VALGRIND_H */
 
     /* free argv */
-    if (context->argv) {
-      for (i = 0; i < context->argc; i++)
-        if (context->argv[i])
-          free(context->argv[i]);
+    if (context->super.argv) {
+      for (i = 0; i < context->super.argc; i++)
+        if (context->super.argv[i])
+          free(context->super.argv[i]);
 
-      free(context->argv);
+      free(context->super.argv);
     }
 
     /* destroy the context */
@@ -136,8 +131,8 @@ static void smx_ctx_sysv_stop(smx_context_t pcontext)
 {
   smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext;
 
-  if (context->cleanup_func)
-    (*context->cleanup_func) (context->cleanup_arg);
+  if (context->super.cleanup_func)
+    (*context->super.cleanup_func) (context->super.cleanup_arg);
 
   smx_ctx_sysv_suspend(pcontext);
 }
@@ -154,33 +149,26 @@ static void smx_ctx_sysv_wrapper()
   smx_ctx_sysv_t context = 
       (smx_ctx_sysv_t)simix_global->current_process->context;
 
-  (context->code) (context->argc, context->argv);
+  (context->super.code) (context->super.argc, context->super.argv);
 
   smx_ctx_sysv_stop((smx_context_t)context);
 }
 
-static void smx_ctx_sysv_suspend(smx_context_t context)
-{
+static void smx_ctx_sysv_suspend(smx_context_t context) {
   int rv;
+  ucontext_t maestro_ctx = ((smx_ctx_sysv_t)simix_global->maestro_process->context)->uc;
 
-  smx_ctx_sysv_t prev_context = ((smx_ctx_sysv_t) context)->prev;
-
-  ((smx_ctx_sysv_t) context)->prev = NULL;
-
-  rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &prev_context->uc);
+  rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx);
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
 
 static void 
-smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context)
-{
+smx_ctx_sysv_resume(smx_context_t new_context) {
   int rv;
+  smx_ctx_sysv_t maestro = (smx_ctx_sysv_t)simix_global->maestro_process->context;
 
-  ((smx_ctx_sysv_t) new_context)->prev = (smx_ctx_sysv_t)old_context;
-
-  rv = swapcontext(&((smx_ctx_sysv_t)old_context)->uc,
-      &((smx_ctx_sysv_t)new_context)->uc);
+  rv = swapcontext(&(maestro->uc), &((smx_ctx_sysv_t)new_context)->uc);
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }