X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7991df17f36cf55b8594f1e9823ac6a2c93d9d2a..54a25f9e51c5aa862e5306c508234188fd295247:/src/simix/smx_context_raw.c

diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c
index f9ffbb5c3f..766d7e1879 100644
--- a/src/simix/smx_context_raw.c
+++ b/src/simix/smx_context_raw.c
@@ -153,16 +153,22 @@ 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;
+
+#include "xbt/xbt_os_time.h"
+static xbt_os_timer_t timer;
+static double totaltime;
+
+
 static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
 
 static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
 { 
+  INFO1("Total User Time: %lf", totaltime);
   if(parmap)
       xbt_parmap_destroy(parmap);
   return smx_ctx_base_factory_finalize(factory);
@@ -223,9 +229,11 @@ static void smx_ctx_raw_free(smx_context_t context)
 static void smx_ctx_raw_suspend(smx_context_t context)
 {
   smx_current_context = (smx_context_t)maestro_raw_context;
+  xbt_os_timer_stop(timer);
   raw_swapcontext(
       &((smx_ctx_raw_t) context)->stack_top,
       ((smx_ctx_raw_t) context)->old_stack_top);
+  xbt_os_timer_start(timer);
 }
 
 static void smx_ctx_raw_stop(smx_context_t context)
@@ -236,54 +244,63 @@ static void smx_ctx_raw_stop(smx_context_t context)
 
 static void smx_ctx_raw_wrapper(smx_ctx_raw_t context)
 { 
+  xbt_os_timer_start(timer);
   (context->super.code) (context->super.argc, context->super.argv);
 
   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);
+  totaltime += xbt_os_timer_elapsed(timer);
 }
 
-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) >= SIMIX_context_get_parallel_threshold()) {
+    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 +316,27 @@ 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) {
-#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;
-#else
-    THROW0(arg_error, 0, "No thread support for parallel context execution");
-#endif
-  }else{
-    (*factory)->runall = smx_ctx_raw_runall;
+  parmap = xbt_parmap_new(2);
+
+  if (SIMIX_context_is_parallel()) {
+    if (SIMIX_context_get_parallel_threshold() > 1) {
+      /* choose dynamically */
+      (*factory)->runall = smx_ctx_raw_runall;
+    }
+    else {
+      /* always parallel */
+      (*factory)->self = smx_ctx_raw_self_parallel;
+      (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;
+      (*factory)->runall = smx_ctx_raw_runall_parallel;
+    }
+  }
+  else {
+    /* always serial */
+    (*factory)->self = smx_ctx_base_self;
+    (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
+    (*factory)->runall = smx_ctx_raw_runall_serial;
   }
+  raw_factory = *factory;
+
+  timer = xbt_os_timer_new();
 }