X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/385f8e9f92c6ee135a5b06244ab47b4c4859f357..d97146659e0007421b6d1a5d60b960befb66663b:/src/simix/smx_context_raw.c

diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c
index b91dfd67ae..c03fb504c3 100644
--- a/src/simix/smx_context_raw.c
+++ b/src/simix/smx_context_raw.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 "xbt/threadpool.h"
 #include "simix/private.h"
+#include "xbt/parmap.h"
+
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
 #  include <valgrind/valgrind.h>
@@ -20,12 +21,6 @@
 #include "ucontext.h"
 #endif
 
-/* lower this if you want to reduce the memory consumption  */
-#ifndef CONTEXT_STACK_SIZE      /* allow lua to override this */
-#define CONTEXT_STACK_SIZE 128*1024
-#endif                          /*CONTEXT_STACK_SIZE */
-
-
 typedef char * raw_stack_t;
 typedef void (*rawctx_entry_point_t)(void *);
 
@@ -158,27 +153,37 @@ void raw_swapcontext(raw_stack_t* old, raw_stack_t new) {
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
-static xbt_tpool_t tpool;
+#ifdef CONTEXT_THREADS
+static xbt_parmap_t parmap;
+#endif
 
-static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
+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)
 { 
-  if(tpool)
-    xbt_tpool_destroy(tpool);
+  VERB1("Total User Time: %lf", totaltime);
+  if(parmap)
+      xbt_parmap_destroy(parmap);
   return smx_ctx_base_factory_finalize(factory);
 }
 
+
 static smx_context_t
-smx_ctx_raw_create_context_sized(size_t size, xbt_main_func_t code,
-    int argc, char **argv,
+smx_ctx_raw_create_context(xbt_main_func_t code, int argc, char **argv,
     void_pfn_smxprocess_t cleanup_func,
     void *data)
 {
 
   smx_ctx_raw_t context =
-      (smx_ctx_raw_t) smx_ctx_base_factory_create_context_sized(size,
+      (smx_ctx_raw_t) smx_ctx_base_factory_create_context_sized(
+          sizeof(s_smx_ctx_raw_t),
           code,
           argc,
           argv,
@@ -188,15 +193,15 @@ smx_ctx_raw_create_context_sized(size_t size, xbt_main_func_t code,
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
      if (code) {
-       context->malloced_stack = xbt_malloc0(CONTEXT_STACK_SIZE);
+       context->malloced_stack = xbt_malloc0(smx_context_stack_size);
        context->stack_top =
-           raw_makecontext(context->malloced_stack,CONTEXT_STACK_SIZE,
+           raw_makecontext(context->malloced_stack, smx_context_stack_size,
                (void(*)(void*))smx_ctx_raw_wrapper,context);
 
 #ifdef HAVE_VALGRIND_VALGRIND_H
        context->valgrind_stack_id =
            VALGRIND_STACK_REGISTER(context->malloced_stack,
-               context->malloced_stack + CONTEXT_STACK_SIZE);
+               context->malloced_stack + smx_context_stack_size);
 #endif                          /* HAVE_VALGRIND_VALGRIND_H */
 
      }else{
@@ -204,19 +209,6 @@ smx_ctx_raw_create_context_sized(size_t size, xbt_main_func_t code,
      }
 
      return (smx_context_t) context;
-
-}
-
-static smx_context_t
-smx_ctx_raw_create_context(xbt_main_func_t code, int argc, char **argv,
-    void_pfn_smxprocess_t cleanup_func,
-    void *data)
-{
-
-  return smx_ctx_raw_create_context_sized(sizeof(s_smx_ctx_raw_t),
-      code, argc, argv, cleanup_func,
-      data);
-
 }
 
 static void smx_ctx_raw_free(smx_context_t context)
@@ -229,6 +221,7 @@ static void smx_ctx_raw_free(smx_context_t context)
         context)->valgrind_stack_id);
 #endif                          /* HAVE_VALGRIND_VALGRIND_H */
 
+    free(((smx_ctx_raw_t)context)->malloced_stack);
   }
   smx_ctx_base_free(context);
 }
@@ -236,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)
@@ -249,54 +244,68 @@ 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_swag_t processes)
+
+static void smx_ctx_raw_runall_serial(xbt_dynar_t processes)
 {
   smx_process_t process;
+  unsigned int cursor;
 
-  while ((process = xbt_swag_extract(processes)))
-    smx_ctx_raw_resume(process->context);
+  xbt_dynar_foreach(processes, cursor, process) {
+    DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
+    smx_ctx_raw_resume(process);
+  }
+  xbt_dynar_reset(processes);
 }
 
-static void smx_ctx_raw_resume_parallel(smx_context_t context)
+static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
 {
-  xbt_os_thread_set_extra_data(context);
-  raw_swapcontext(
-      &((smx_ctx_raw_t) context)->old_stack_top,
-      ((smx_ctx_raw_t) context)->stack_top);
-  xbt_os_thread_set_extra_data(NULL);
+  xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_raw_resume, processes);
+  xbt_dynar_reset(processes);
 }
 
-static void smx_ctx_raw_runall_parallel(xbt_swag_t processes)
+static smx_context_t smx_ctx_raw_self_parallel(void)
 {
-  smx_process_t process;
-  while((process = xbt_swag_extract(processes))){
-    xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_raw_resume_parallel, process->context);
-  }
-  xbt_tpool_wait_all(tpool);
+  return smx_current_context;
 }
 
-static smx_context_t smx_ctx_raw_self_parallel(void)
+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)
 {
-  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;
+  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)
 {
-  INFO0("Using raw contexts. Because the glibc is just not good enough for us.");
+  VERB0("Using raw contexts. Because the glibc is just not good enough for us.");
   smx_ctx_base_factory_init(factory);
 
   (*factory)->finalize  = smx_ctx_raw_factory_finalize;
@@ -307,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(_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_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();
 }