Optimization, if no parallel execution is selected use the serial execution.

[simgrid.git] / src / simix / smx_context_raw.c

diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c
index f9ffbb5..9b2ac2b 100644 (file)
--- a/src/simix/smx_context_raw.c
+++ b/src/simix/smx_context_raw.c
@@ -153,12 +153,12 @@ void raw_swapcontext(raw_stack_t* old, raw_stack_t new) {
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
-static xbt_parmap_t parmap;
-
 #ifdef CONTEXT_THREADS
-static __thread smx_context_t current_context;
+static xbt_parmap_t parmap;
 #endif
 
+static smx_context_factory_t raw_factory;
+
 static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
 
 static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
@@ -241,49 +241,56 @@ static void smx_ctx_raw_wrapper(smx_ctx_raw_t context)
   smx_ctx_raw_stop((smx_context_t) context);
 }
 
-static void smx_ctx_raw_resume(smx_context_t context)
+static void smx_ctx_raw_resume(smx_process_t process)
 {
-  smx_current_context = context; 
+  smx_ctx_raw_t context = (smx_ctx_raw_t)process->context;
+  smx_current_context = (smx_context_t)context;
   raw_swapcontext(
       &((smx_ctx_raw_t) context)->old_stack_top,
       ((smx_ctx_raw_t) context)->stack_top);
 }
 
-static void smx_ctx_raw_runall(xbt_dynar_t processes)
+
+static void smx_ctx_raw_runall_serial(xbt_dynar_t processes)
 {
   smx_process_t process;
   unsigned int cursor;
 
   xbt_dynar_foreach(processes, cursor, process) {
     DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
-    smx_ctx_raw_resume(process->context);
+    smx_ctx_raw_resume(process);
   }
   xbt_dynar_reset(processes);
 }
 
-static void smx_ctx_raw_resume_parallel(smx_process_t process)
-{
-  smx_ctx_raw_t context = (smx_ctx_raw_t)process->context;
-  /*xbt_os_thread_set_extra_data(context);*/
-  current_context = (smx_context_t)context;
-  raw_swapcontext(
-      &context->old_stack_top,
-      context->stack_top);
-  current_context = (smx_context_t)maestro_raw_context;
-  /*xbt_os_thread_set_extra_data(NULL);*/
-}
-
 static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
 {
-  xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_raw_resume_parallel, processes);
+  xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_raw_resume, processes);
   xbt_dynar_reset(processes);
 }
 
 static smx_context_t smx_ctx_raw_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_raw_context;*/
-  return current_context;
+  return smx_current_context;
+}
+
+static int smx_ctx_raw_get_thread_id(){
+  return (int)(unsigned long)xbt_os_thread_get_extra_data();
+}
+
+static void smx_ctx_raw_runall(xbt_dynar_t processes)
+{
+  if(xbt_dynar_length(processes) > 10){
+    DEBUG1("Runall // %lu", xbt_dynar_length(processes));
+    raw_factory->self = smx_ctx_raw_self_parallel;
+    raw_factory->get_thread_id = smx_ctx_raw_get_thread_id;
+    smx_ctx_raw_runall_parallel(processes);
+  }else{
+    DEBUG1("Runall serial %lu", xbt_dynar_length(processes));
+    raw_factory->self = smx_ctx_base_self;
+    raw_factory->get_thread_id = smx_ctx_base_get_thread_id;
+    smx_ctx_raw_runall_serial(processes);
+  }
 }
 
 void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
@@ -299,15 +306,18 @@ void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
   (*factory)->suspend = smx_ctx_raw_suspend;
   (*factory)->name = "smx_raw_context_factory";
 
-  if (smx_parallel_contexts) {
+  if (SIMIX_context_is_parallel()) {
 #ifdef CONTEXT_THREADS  /* To use parallel ucontexts a thread pool is needed */
     parmap = xbt_parmap_new(2);
-    (*factory)->runall = smx_ctx_raw_runall_parallel;
     (*factory)->self = smx_ctx_raw_self_parallel;
+    (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;
+    (*factory)->runall = smx_ctx_raw_runall;
 #else
     THROW0(arg_error, 0, "No thread support for parallel context execution");
 #endif
-  }else{
-    (*factory)->runall = smx_ctx_raw_runall;
+  } else {
+    (*factory)->runall = smx_ctx_raw_runall_serial;
   }
+
+  raw_factory = *factory;
 }