X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d869090cbfe6a45bedf556f99e16612c595e3a98..7e71d73eb6728d8d498d010976f038789049c131:/src/simix/smx_context_sysv.c

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index 7ad1d9829a..a44593d9e0 100644
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -33,20 +33,18 @@ typedef struct s_smx_ctx_sysv {
 
 static smx_context_t 
 smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, 
-                                    void_f_pvoid_t cleanup_func, void* cleanup_arg);
+    void_f_pvoid_t cleanup_func, void* cleanup_arg);
 
 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_start(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);
+smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context);
 
 static void smx_ctx_sysv_wrapper(void);
 
@@ -57,7 +55,6 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
   (*factory)->create_context = smx_ctx_sysv_factory_create_context;
   (*factory)->finalize = smx_ctx_sysv_factory_finalize;
   (*factory)->free = smx_ctx_sysv_free;
-  (*factory)->start = smx_ctx_sysv_start;
   (*factory)->stop = smx_ctx_sysv_stop;
   (*factory)->suspend = smx_ctx_sysv_suspend;
   (*factory)->resume = smx_ctx_sysv_resume;
@@ -73,39 +70,41 @@ static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory)
 
 static smx_context_t 
 smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, 
-                                    void_f_pvoid_t cleanup_func, void* cleanup_arg)
+    void_f_pvoid_t cleanup_func, void* cleanup_arg)
 {
   smx_ctx_sysv_t context = xbt_new0(s_smx_ctx_sysv_t, 1);
-  
+
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if(code){
     context->code = code;
 
     xbt_assert2(getcontext(&(context->uc)) == 0,
-                "Error in context saving: %d (%s)", errno, strerror(errno));
+        "Error in context saving: %d (%s)", errno, strerror(errno));
 
     context->uc.uc_link = NULL;
 
     context->uc.uc_stack.ss_sp =
-      pth_skaddr_makecontext(context->stack, STACK_SIZE);
+        pth_skaddr_makecontext(context->stack, STACK_SIZE);
 
     context->uc.uc_stack.ss_size =
-      pth_sksize_makecontext(context->stack, STACK_SIZE);
+        pth_sksize_makecontext(context->stack, STACK_SIZE);
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
     context->valgrind_stack_id =
-      VALGRIND_STACK_REGISTER(context->uc.uc_stack.ss_sp,
-                              ((char *) context->uc.uc_stack.ss_sp) +
-                              context->uc.uc_stack.ss_size);
+        VALGRIND_STACK_REGISTER(context->uc.uc_stack.ss_sp,
+            ((char *) context->uc.uc_stack.ss_sp) +
+            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;
+
+    makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
   }
-  
+
   return (smx_context_t)context;
 }
 
@@ -127,30 +126,25 @@ static void smx_ctx_sysv_free(smx_context_t pcontext)
 
       free(context->argv);
     }
-    
+
     /* destroy the context */
     free(context);
   }
 }
 
-static void smx_ctx_sysv_start(smx_context_t context)
-{  
-  makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
-}
-
 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);
 
-  smx_ctx_sysv_suspend((smx_context_t)context);
+  smx_ctx_sysv_suspend(pcontext);
 }
 
 static void smx_ctx_sysv_wrapper()
 {
-  /*FIXME: I would like to avoid accesing simix_global to get the current
+  /*FIXME: I would like to avoid accessing simix_global to get the current
     context by passing it as an argument of the wrapper function. The problem
     is that this function is called from smx_ctx_sysv_start, and uses
     makecontext for calling it, and the stupid posix specification states that
@@ -158,10 +152,10 @@ static void smx_ctx_sysv_wrapper()
     in 64-bit architectures where pointers are 64 bit long.
    */
   smx_ctx_sysv_t context = 
-    (smx_ctx_sysv_t)simix_global->current_process->context;
-  
+      (smx_ctx_sysv_t)simix_global->current_process->context;
+
   (context->code) (context->argc, context->argv);
-  
+
   smx_ctx_sysv_stop((smx_context_t)context);
 }
 
@@ -186,7 +180,7 @@ smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_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);
+      &((smx_ctx_sysv_t)new_context)->uc);
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }