X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9cce835f104d243b0fc0a42cfdb8314181000c9..94a5e6c017fdcf4882fe6cb518b6005d4c8dd8ae:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 94746b7d91..39d77bda01 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -10,7 +10,7 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
-#include "src/simix/private.h"
+#include "smx_private.h"
 #include "simix/context.h"
 #include "gras_config.h"
 
@@ -29,6 +29,7 @@ static xbt_os_thread_key_t smx_current_context_key = 0;
 static smx_context_t smx_current_context_serial;
 static int smx_parallel_contexts = 1;
 static int smx_parallel_threshold = 2;
+static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_FUTEX;
 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.
@@ -131,30 +132,24 @@ XBT_INLINE int SIMIX_context_get_nthreads(void) {
  * for the user contexts.
  *
  * This function should be called before initializing SIMIX.
- * A value of 1 means no parallelism.
+ * A value of 1 means no parallelism (1 thread only).
  * If the value is greater than 1, the thread support must be enabled.
  *
  * \param nb_threads the number of threads to use
  */
-XBT_INLINE void SIMIX_context_set_nthreads(char* str_nb_threads) {
-
-  int nb_threads;
-
-  if(!strcmp(str_nb_threads,"auto")){
-      nb_threads = PROCESSOR_COUNT;
-      XBT_DEBUG("Auto-setting threads to %d",nb_threads);
-  }
-  else
-    nb_threads = atoi(str_nb_threads);
-
-  xbt_assert(nb_threads > 0, "Invalid number of parallel threads: %d", nb_threads);
+XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads) {
 
+  if (nb_threads<=0) {	
+     nb_threads = xbt_os_get_numcores();
+     XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
+  }   
+	
   if (nb_threads > 1) {
 #ifndef CONTEXT_THREADS
     THROWF(arg_error, 0, "The thread factory cannot be run in parallel");
 #endif
   }
-
+ 
   smx_parallel_contexts = nb_threads;
 }
 
@@ -190,22 +185,7 @@ XBT_INLINE void SIMIX_context_set_parallel_threshold(int threshold) {
  * \return how threads are synchronized if processes are run in parallel
  */
 XBT_INLINE e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode(void) {
-  e_xbt_parmap_mode_t mode = XBT_PARMAP_FUTEX;
-  const char* mode_name = xbt_cfg_get_string(_surf_cfg_set, "contexts/synchro");
-  if (!strcmp(mode_name, "posix")) {
-	  mode = XBT_PARMAP_POSIX;
-  }
-  else if (!strcmp(mode_name, "futex")) {
-	  mode = XBT_PARMAP_FUTEX;
-  }
-  else if (!strcmp(mode_name, "busy_wait")) {
-	  mode = XBT_PARMAP_BUSY_WAIT;
-  }
-  else {
-    XBT_WARN("Command line setting of the parallel synchronization mode should "
-        "be one of \"posix\", \"futex\" or \"busy_wait\"");
-  }
-  return mode;
+  return smx_parallel_synchronization_mode;
 }
 
 /**
@@ -214,19 +194,7 @@ XBT_INLINE e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode(void) {
  * \param mode how to synchronize threads if processes are run in parallel
  */
 XBT_INLINE void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) {
-  if (mode == XBT_PARMAP_POSIX) {
-	  xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "posix");
-  }
-  else if (mode == XBT_PARMAP_FUTEX) {
-	  xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "futex");
-  }
-  else if (XBT_PARMAP_BUSY_WAIT) {
-	  xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "busy_wait");
-  }
-  else {
-    XBT_WARN("Command line setting of the parallel synchronization mode should "
-        "be one of \"posix\", \"futex\" or \"busy_wait\"");
-  }
+  smx_parallel_synchronization_mode = mode;
 }
 
 /**