Merge context_start into context_new to simplify the soup

[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 f0bd8aa..a44593d 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -7,7 +7,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

-#include "xbt/ex_interface.h"

 #include "private.h"
 #include "context_sysv_config.h"        /* loads context system definitions */
 #include "portable.h"
 #include "private.h"
 #include "context_sysv_config.h"        /* loads context system definitions */
 #include "portable.h"


@@ -32,46 +31,23 @@ typedef struct s_smx_ctx_sysv {
 #endif                          
 } s_smx_ctx_sysv_t, *smx_ctx_sysv_t;
 
 #endif                          
 } s_smx_ctx_sysv_t, *smx_ctx_sysv_t;
 

-
-/* callback: context fetching */
-static ex_ctx_t *xbt_jcontext_ex_ctx(void);
-
-/* callback: termination */
-static void xbt_jcontext_ex_terminate(xbt_ex_t *e);
-

 static smx_context_t 
 smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, 
 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 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 
 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);
 
 
 static void smx_ctx_sysv_wrapper(void);
 

-/* callback: context fetching */
-static ex_ctx_t *xbt_ctx_sysv_ex_ctx(void)
-{
-  /*FIXME: the factory should access simix level datastructures! */
-  return simix_global->current_process->context->exception;
-}
-
-/* callback: termination */
-static void xbt_ctx_sysv_ex_terminate(xbt_ex_t * e)
-{
-  xbt_ex_display(e);
-  abort();
-}
-

 void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
 {
   *factory = xbt_new0(s_smx_context_factory_t, 1);
 void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
 {
   *factory = xbt_new0(s_smx_context_factory_t, 1);


@@ -79,20 +55,14 @@ 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)->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;
   (*factory)->name = "smx_sysv_context_factory";
   (*factory)->stop = smx_ctx_sysv_stop;
   (*factory)->suspend = smx_ctx_sysv_suspend;
   (*factory)->resume = smx_ctx_sysv_resume;
   (*factory)->name = "smx_sysv_context_factory";

-
-  /* context exception handlers */
-  __xbt_ex_ctx = xbt_ctx_sysv_ex_ctx;
-  __xbt_ex_terminate = xbt_ctx_sysv_ex_terminate;

 }
 
 static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory)
 {
 }
 
 static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory)
 {

-  /*FIXME free(maestro_context->exception);*/

   free(*factory);
   *factory = NULL;
   return 0;
   free(*factory);
   *factory = NULL;
   return 0;


@@ -100,42 +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, 
 
 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);
 
 {
   smx_ctx_sysv_t context = xbt_new0(s_smx_ctx_sysv_t, 1);
 

-  context->exception = xbt_new(ex_ctx_t, 1);
-  XBT_CTX_INITIALIZE(context->exception);
-  

   /* 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,
   /* 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 =
 
     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 =
 
     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 =
 
 #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;
 #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;
 }
 
   return (smx_context_t)context;
 }
 


@@ -145,9 +114,6 @@ static void smx_ctx_sysv_free(smx_context_t pcontext)
   smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext;   
   if (context){
 
   smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext;   
   if (context){
 

-    if (context->exception)
-      free(context->exception);
-

 #ifdef HAVE_VALGRIND_VALGRIND_H
     VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) context)->valgrind_stack_id);
 #endif /* HAVE_VALGRIND_VALGRIND_H */
 #ifdef HAVE_VALGRIND_VALGRIND_H
     VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) context)->valgrind_stack_id);
 #endif /* HAVE_VALGRIND_VALGRIND_H */


@@ -160,30 +126,25 @@ static void smx_ctx_sysv_free(smx_context_t pcontext)
 
       free(context->argv);
     }
 
       free(context->argv);
     }

-    
+

     /* destroy the context */
     free(context);
   }
 }
 
     /* 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;
 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->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()
 {
 }
 
 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
     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


@@ -191,10 +152,10 @@ static void smx_ctx_sysv_wrapper()
     in 64-bit architectures where pointers are 64 bit long.
    */
   smx_ctx_sysv_t context = 
     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);
   (context->code) (context->argc, context->argv);

-  
+

   smx_ctx_sysv_stop((smx_context_t)context);
 }
 
   smx_ctx_sysv_stop((smx_context_t)context);
 }
 


@@ -219,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)->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");
 }
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }