X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e276e9953a9ab5894bbb623fc17ec79512efab5d..5dcd4aa6c32ea714a5da23840de597cfc04b90bd:/src/simix/smx_context_sysv.c

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index c0c1a02ff6..9b1fbdf7ea 100644
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -8,6 +8,7 @@
 
 #include "smx_context_sysv_private.h"
 #include "xbt/threadpool.h"
+#include "simix/private.h"
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
 #  include <valgrind/valgrind.h>
@@ -22,7 +23,7 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
-static xbt_tpool_t tpool; 
+static xbt_tpool_t tpool;
 
 static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
@@ -44,8 +45,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;
   }    
@@ -98,6 +104,8 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
 
     makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
                 sizeof(void*)/sizeof(int), context);
+  }else{
+    maestro_context = context;
   }
 
   return (smx_context_t) context;
@@ -133,7 +141,6 @@ void smx_ctx_sysv_free(smx_context_t context)
 void smx_ctx_sysv_stop(smx_context_t context)
 {
   smx_ctx_base_stop(context);
-
   smx_ctx_sysv_suspend(context);
 }
 
@@ -146,42 +153,47 @@ void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context)
 
 void smx_ctx_sysv_suspend(smx_context_t context)
 {
-  ucontext_t maestro_ctx =
-      ((smx_ctx_sysv_t) simix_global->maestro_process->context)->uc;
-
-  int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx);
+  smx_current_context = (smx_context_t)maestro_context;
+  int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_context->uc);
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
 
-void smx_ctx_sysv_resume(smx_context_t new_context)
+void smx_ctx_sysv_resume(smx_context_t context)
 {
-  smx_ctx_sysv_t maestro =
-      (smx_ctx_sysv_t) simix_global->maestro_process->context;
-
-  int rv =
-      swapcontext(&(maestro->uc), &((smx_ctx_sysv_t) new_context)->uc);
+  smx_current_context = context; 
+  int rv = swapcontext(&maestro_context->uc, &((smx_ctx_sysv_t) context)->uc);
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
 
 void smx_ctx_sysv_runall(xbt_swag_t processes)
 {
-  smx_context_t old_context;
   smx_process_t process;
   
-  while ((process = xbt_swag_extract(processes))) {
-    old_context = smx_current_context;
-    smx_current_context = process->context;
-    smx_ctx_sysv_resume(smx_current_context);
-    smx_current_context = old_context;
-  }
+  while ((process = xbt_swag_extract(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(&maestro_context->uc, &((smx_ctx_sysv_t) context)->uc);
+
+  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;
 }