Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[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 5759fa6..24189f8 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -107,7 +107,7 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
 
     int res;
     res = getcontext(&(context->uc));
-    xbt_assert2(res == 0,
+    xbt_assert(res == 0,
                 "Error in context saving: %d (%s)", errno,
                 strerror(errno));
 
@@ -190,20 +190,20 @@ void smx_ctx_sysv_wrapper(int first, ...)
 
 void smx_ctx_sysv_suspend(smx_context_t context)
 {
-  smx_current_context = (smx_context_t)maestro_context;
+  SIMIX_context_set_current((smx_context_t) maestro_context);
   int rv;
   rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &((smx_ctx_sysv_t)context)->old_uc);
 
-  xbt_assert0((rv == 0), "Context swapping failure");
+  xbt_assert((rv == 0), "Context swapping failure");
 }
 
 void smx_ctx_sysv_resume(smx_context_t context)
 {
-  smx_current_context = context; 
+  SIMIX_context_set_current(context);
   int rv;
   rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
 
-  xbt_assert0((rv == 0), "Context swapping failure");
+  xbt_assert((rv == 0), "Context swapping failure");
 }
 
 void smx_ctx_sysv_runall(xbt_dynar_t processes)
@@ -221,12 +221,12 @@ void smx_ctx_sysv_runall(xbt_dynar_t processes)
 void smx_ctx_sysv_resume_parallel(smx_process_t process)
 {
   smx_context_t context = process->context;
-  smx_current_context = (smx_context_t)context;
+  SIMIX_context_set_current((smx_context_t) context);
   int rv;
   rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
-  smx_current_context = (smx_context_t)maestro_context;
+  SIMIX_context_set_current((smx_context_t) maestro_context);
 
-  xbt_assert0((rv == 0), "Context swapping failure");
+  xbt_assert((rv == 0), "Context swapping failure");
 }
 
 void smx_ctx_sysv_runall_parallel(xbt_dynar_t processes)
@@ -241,7 +241,7 @@ smx_context_t smx_ctx_sysv_self_parallel(void)
 {
   /*smx_context_t self_context = (smx_context_t) xbt_os_thread_get_extra_data();
   return self_context ? self_context : (smx_context_t) maestro_context;*/
-  return smx_current_context;
+  return SIMIX_context_get_current();
 }
 
 int smx_ctx_sysv_get_thread_id(void)