X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b188a3ca7fe91cf125a08229fb4fe51eee26e6d..adf35dcadfd3b7c53d51a13f4accba378ea5965e:/src/surf/surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index a136ff96c2..617bffc175 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -247,11 +247,16 @@ static void _surf_cfg_cb_contexts_parallel_mode(const char *name, int pos)
     SIMIX_context_set_parallel_mode(XBT_PARMAP_BUSY_WAIT);
   }
   else {
-    XBT_WARN("Command line setting of the parallel synchronization mode should "
+    xbt_die("Command line setting of the parallel synchronization mode should "
         "be one of \"posix\", \"futex\" or \"busy_wait\"");
   }
 }
 
+static void _surf_cfg_cb_surf_nthreads(const char *name, int pos)
+{
+  surf_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name));
+}
+
 static void _surf_cfg_cb__surf_network_coordinates(const char *name,
                                                    int pos)
 {
@@ -469,7 +474,7 @@ void surf_config_init(int *argc, char **argv)
         xbt_cfgelm_int, &default_value_int, 1, 1,
         _surf_cfg_cb_contexts_parallel_threshold, NULL);
 
-    /* minimal number of user contexts to be run in parallel */
+    /* synchronization mode for parallel user contexts */
 #ifdef HAVE_FUTEX_H
     default_value = xbt_strdup("futex");
 #else //No futex on mac and posix is unimplememted yet
@@ -480,6 +485,13 @@ void surf_config_init(int *argc, char **argv)
         xbt_cfgelm_string, &default_value, 1, 1,
         _surf_cfg_cb_contexts_parallel_mode, NULL);
 
+    /* number of parallel threads for Surf */
+    default_value_int = surf_get_nthreads();
+    xbt_cfg_register(&_surf_cfg_set, "surf/nthreads",
+                     "Number of parallel threads used to update Surf models",
+                     xbt_cfgelm_int, &default_value_int, 1, 1,
+                     _surf_cfg_cb_surf_nthreads, NULL);
+
     default_value = xbt_strdup("no");
     xbt_cfg_register(&_surf_cfg_set, "network/coordinates",
                      "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)",
@@ -514,6 +526,45 @@ void surf_config_init(int *argc, char **argv)
                      NULL, NULL);
     xbt_cfg_setdefault_string(_surf_cfg_set, "ns3/TcpModel", "default");
 #endif
+
+//SMPI
+    double default_reference_speed = 20000.0;
+    xbt_cfg_register(&_surf_cfg_set, "smpi/running_power",
+                     "Power of the host running the simulation (in flop/s). Used to bench the operations.",
+                     xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL,
+                     NULL);
+
+    int default_display_timing = 0;
+    xbt_cfg_register(&_surf_cfg_set, "smpi/display_timing",
+                     "Boolean indicating whether we should display the timing after simulation.",
+                     xbt_cfgelm_int, &default_display_timing, 1, 1, NULL,
+                     NULL);
+
+    double default_threshold = 1e-6;
+    xbt_cfg_register(&_surf_cfg_set, "smpi/cpu_threshold",
+                     "Minimal computation time (in seconds) not discarded.",
+                     xbt_cfgelm_double, &default_threshold, 1, 1, NULL,
+                     NULL);
+
+    //For smpi/bw_factor and smpi/lat_factor
+    //Default value have to be "threshold0:value0;threshold1:value1;...;thresholdN:valueN"
+    //test is if( size >= thresholdN ) return valueN;
+    //Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN"
+    //	or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
+    xbt_cfg_register(&_surf_cfg_set, "smpi/bw_factor",
+                     "Bandwidth factors for smpi.",
+                     xbt_cfgelm_string, NULL, 1, 1, NULL,
+                     NULL);
+    xbt_cfg_setdefault_string(_surf_cfg_set, "smpi/bw_factor", "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084");
+
+    xbt_cfg_register(&_surf_cfg_set, "smpi/lat_factor",
+                     "Latency factors for smpi.",
+                     xbt_cfgelm_string, NULL, 1, 1, NULL,
+                     NULL);
+    xbt_cfg_setdefault_string(_surf_cfg_set, "smpi/lat_factor", "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467");
+//END SMPI
+
+
     if (!surf_path) {
       /* retrieves the current directory of the        current process */
       const char *initial_path = __surf_get_initial_path();