X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29202b3071fe6d3b7146dcd47218ab699ece7a62..eb205f1bc5310adb939db1e08fe8bc1d02a37f8f:/src/surf/surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index eceaaa7fb0..dd4c08c88c 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -199,9 +199,14 @@ static void _surf_cfg_cb_context_stack_size(const char *name, int pos)
   smx_context_stack_size = xbt_cfg_get_int(_surf_cfg_set, name) * 1024;
 }
 
-static void _surf_cfg_cb_parallel_contexts(const char *name, int pos)
+static void _surf_cfg_cb_contexts_nthreads(const char *name, int pos)
 {
-  SIMIX_context_set_parallel_threads(xbt_cfg_get_int(_surf_cfg_set, name));
+  SIMIX_context_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name));
+}
+
+static void _surf_cfg_cb_contexts_parallel_threshold(const char *name, int pos)
+{
+  SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(_surf_cfg_set, name));
 }
 
 static void _surf_cfg_cb__surf_network_fullduplex(const char *name,
@@ -360,10 +365,17 @@ void surf_config_init(int *argc, char **argv)
 
     /* number of parallel threads for user processes */
     default_value_int = 1;
-    xbt_cfg_register(&_surf_cfg_set, "contexts/parallel",
+    xbt_cfg_register(&_surf_cfg_set, "contexts/nthreads",
                      "Number of parallel threads for user contexts (EXPERIMENTAL)",
                      xbt_cfgelm_int, &default_value_int, 1, 1,
-                     _surf_cfg_cb_parallel_contexts, NULL);
+                     _surf_cfg_cb_contexts_nthreads, NULL);
+
+    /* minimal number of user contexts to be run in parallel */
+    default_value_int = 1;
+    xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_threshold",
+        "Minimal number of user contexts to be run in parallel",
+        xbt_cfgelm_int, &default_value_int, 1, 1,
+        _surf_cfg_cb_contexts_parallel_threshold, NULL);
 
     default_value_int = 0;
     xbt_cfg_register(&_surf_cfg_set, "fullduplex",