Keep an int parameter to SIMIX_context_get_nthreads

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

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 1170709..9faef0e 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -18,7 +18,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mecanism");
 
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
-XBT_PUBLIC(smx_ctx_factory_initializer_t) smx_factory_initializer_to_use = NULL;
+smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
 int smx_context_stack_size = 128 * 1024;
 
 #ifdef HAVE_THREAD_LOCAL_STORAGE
@@ -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,7 +132,7 @@ 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
@@ -181,22 +182,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;
 }
 
 /**
@@ -205,19 +191,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;
 }
 
 /**