X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/005cf0f71b3817a9e93de0b0c3bd92f216ef5c7f..918f374c626b2c4f4481d7d5d9c4b0dfbc94ef43:/src/simix/smx_context_sysv.c

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index 2bef17db16..5c607b8f92 100644
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -6,8 +6,9 @@
  /* 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 <stdarg.h>
 #include "smx_context_sysv_private.h"
-#include "xbt/threadpool.h"
+#include "xbt/parmap.h"
 #include "simix/private.h"
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
@@ -23,18 +24,18 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
-static xbt_tpool_t tpool; 
+static xbt_parmap_t parmap;
 
 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);
+static void smx_ctx_sysv_wrapper(int count, ...);
 
 void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
 {
   smx_ctx_base_factory_init(factory);
+  VERB0("Activating SYSV context factory");
 
   (*factory)->finalize = smx_ctx_sysv_factory_finalize;
   (*factory)->create_context = smx_ctx_sysv_create_context;
@@ -44,9 +45,14 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
   (*factory)->suspend = smx_ctx_sysv_suspend;
   (*factory)->name = "smx_sysv_context_factory";
 
-  if(_surf_parallel_contexts){
-    tpool = xbt_tpool_new(2, 10);
+  if (smx_parallel_contexts) {
+#ifdef CONTEXT_THREADS	/* To use parallel ucontexts a thread pool is needed */
+    parmap = xbt_parmap_new(2);
     (*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;
   }    
@@ -54,8 +60,8 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
 
 int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory)
 { 
-  if(tpool)
-    xbt_tpool_destroy(tpool);
+  if(parmap)
+    xbt_parmap_destroy(parmap);
   return smx_ctx_base_factory_finalize(factory);
 }
 
@@ -65,7 +71,7 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
                                   void_pfn_smxprocess_t cleanup_func,
                                   void *data)
 {
-
+  uintptr_t ctx_addr;
   smx_ctx_sysv_t context =
       (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size,
                                                                  code,
@@ -96,9 +102,23 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
                                 ((char *) context->uc.uc_stack.ss_sp) +
                                 context->uc.uc_stack.ss_size);
 #endif                          /* HAVE_VALGRIND_VALGRIND_H */
-
-    makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
-                sizeof(void*)/sizeof(int), context);
+    ctx_addr = (uintptr_t)context;
+    /* This switch select a case base on a static value: the compiler optimizes it out */
+    /* It could be replaced by a set of #ifdef/#else/#endif blocks */
+    switch(sizeof(uintptr_t) / sizeof(int)) {
+      case 1:
+        makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
+                    2, 1, (int)ctx_addr);
+        break;
+      case 2:
+        makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
+                    3, 2, (int)(ctx_addr >> (8 * sizeof(int))), (int)(ctx_addr));
+        break;
+      default:
+        THROW_IMPOSSIBLE;
+    }
+  }else{
+    maestro_context = context;
   }
 
   return (smx_context_t) context;
@@ -134,12 +154,23 @@ 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);
 }
 
-void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context)
+void smx_ctx_sysv_wrapper(int count, ...)
 { 
+  uintptr_t ctx_addr = 0;
+  va_list ap;
+  smx_ctx_sysv_t context;
+  int i;
+
+  va_start(ap, count);
+  for(i = 0; i < count; i++) {
+     ctx_addr <<= 8*sizeof(int);
+     ctx_addr |= (uintptr_t)va_arg(ap, int);
+  }
+  va_end(ap);
+  context = (smx_ctx_sysv_t)ctx_addr;
   (context->super.code) (context->super.argc, context->super.argv);
 
   smx_ctx_sysv_stop((smx_context_t) context);
@@ -147,42 +178,50 @@ 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, &((smx_ctx_sysv_t)context)->old_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(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
 
   xbt_assert0((rv == 0), "Context swapping failure");
 }
 
-void smx_ctx_sysv_runall(xbt_swag_t processes)
+void smx_ctx_sysv_runall(xbt_dynar_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;
+  unsigned int cursor;
+
+  xbt_dynar_foreach(processes, cursor, process) {
+    DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
+    smx_ctx_sysv_resume(process->context);
   }
+  xbt_dynar_reset(processes);
 }
 
-void smx_ctx_sysv_runall_parallel(xbt_swag_t processes)
+void smx_ctx_sysv_resume_parallel(smx_process_t process)
 {
-  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);
-  }
+  smx_context_t context = process->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_dynar_t processes)
+{
+  xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_sysv_resume_parallel, processes);
+  xbt_dynar_reset(processes);
+}
+
+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;
 }