fix raw contextes for supernovae and for parallel execution

[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 f89fb01..d17a080 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -29,7 +29,6 @@ static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
     void_pfn_smxprocess_t cleanup_func, void* data);
 
-
 static void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context);
 
 void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
@@ -45,8 +44,13 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
   (*factory)->name = "smx_sysv_context_factory";
 
   if(_surf_parallel_contexts){
+#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */
     tpool = xbt_tpool_new(2, 10);
     (*factory)->runall = smx_ctx_sysv_runall_parallel;
+    (*factory)->self = smx_ctx_sysv_self_parallel;
+#else
+    THROW0(arg_error, 0, "No thread support for parallel context execution");
+#endif
   }else{
     (*factory)->runall = smx_ctx_sysv_runall;
   }    
@@ -149,7 +153,7 @@ void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context)
 void smx_ctx_sysv_suspend(smx_context_t context)
 {
   smx_current_context = (smx_context_t)maestro_context;
-  int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_context->uc);
+  int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &((smx_ctx_sysv_t)context)->old_uc);
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
@@ -157,7 +161,7 @@ void smx_ctx_sysv_suspend(smx_context_t context)
 void smx_ctx_sysv_resume(smx_context_t context)
 {
   smx_current_context = context; 
-  int rv = swapcontext(&maestro_context->uc, &((smx_ctx_sysv_t) context)->uc);
+  int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
@@ -170,10 +174,26 @@ void smx_ctx_sysv_runall(xbt_swag_t processes)
     smx_ctx_sysv_resume(process->context);
 }
 
+void smx_ctx_sysv_resume_parallel(smx_context_t context)
+{
+  xbt_os_thread_set_extra_data(context);
+  int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
+  xbt_os_thread_set_extra_data(NULL);
+
+  xbt_assert0((rv == 0), "Context swapping failure");
+}
+
 void smx_ctx_sysv_runall_parallel(xbt_swag_t processes)
 {
   smx_process_t process;
   while((process = xbt_swag_extract(processes))){
-    xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_sysv_resume, process->context);
+    xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_sysv_resume_parallel, process->context);
   }
+  xbt_tpool_wait_all(tpool);
+}
+
+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;
 }