Improve context switching for ucontext

[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 9774fda..f89fb01 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -6,9 +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 "smx_context_sysv_private.h"
+#include "xbt/threadpool.h"
+#include "simix/private.h"
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
 #  include <valgrind/valgrind.h>
@@ -23,33 +23,47 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
+static xbt_tpool_t tpool;
+
 static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
-    void_pfn_smxprocess_t cleanup_func,
-    smx_process_t process);
+    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)
+void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
 {
-
   smx_ctx_base_factory_init(factory);
 
+  (*factory)->finalize = smx_ctx_sysv_factory_finalize;
   (*factory)->create_context = smx_ctx_sysv_create_context;
   /* Do not overload that method (*factory)->finalize */
   (*factory)->free = smx_ctx_sysv_free;
   (*factory)->stop = smx_ctx_sysv_stop;
   (*factory)->suspend = smx_ctx_sysv_suspend;
-  (*factory)->runall = smx_ctx_sysv_runall;
   (*factory)->name = "smx_sysv_context_factory";
+
+  if(_surf_parallel_contexts){
+    tpool = xbt_tpool_new(2, 10);
+    (*factory)->runall = smx_ctx_sysv_runall_parallel;
+  }else{
+    (*factory)->runall = smx_ctx_sysv_runall;
+  }    
+}
+
+int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory)
+{ 
+  if(tpool)
+    xbt_tpool_destroy(tpool);
+  return smx_ctx_base_factory_finalize(factory);
 }
 
 smx_context_t
 smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
                                   int argc, char **argv,
                                   void_pfn_smxprocess_t cleanup_func,
-                                  smx_process_t process)
+                                  void *data)
 {
 
   smx_ctx_sysv_t context =
@@ -58,7 +72,7 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
                                                                  argc,
                                                                  argv,
                                                                  cleanup_func,
-                                                                 process);
+                                                                 data);
 
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
@@ -85,6 +99,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;
@@ -94,12 +110,12 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
 static smx_context_t
 smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
     void_pfn_smxprocess_t cleanup_func,
-    smx_process_t process)
+    void *data)
 {
 
   return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t),
                                            code, argc, argv, cleanup_func,
-                                           process);
+                                           data);
 
 }
 
@@ -120,7 +136,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);
 }
 
@@ -133,21 +148,16 @@ 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");
 }
@@ -155,9 +165,15 @@ void smx_ctx_sysv_resume(smx_context_t new_context)
 void smx_ctx_sysv_runall(xbt_swag_t processes)
 {
   smx_process_t process;
-  while((process = xbt_swag_extract(processes))){
-    simix_global->current_process = process;
+  
+  while ((process = xbt_swag_extract(processes)))
     smx_ctx_sysv_resume(process->context);
-    simix_global->current_process = simix_global->maestro_process;
+}
+
+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);
   }
 }