Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Put xbt_cfg_register for smpi into surf_config.c file
authornavarro <navarro@caraja.(none)>
Mon, 16 Jan 2012 16:37:09 +0000 (17:37 +0100)
committernavarro <navarro@caraja.(none)>
Mon, 16 Jan 2012 17:56:51 +0000 (18:56 +0100)
src/smpi/smpi_global.c
src/surf/surf_config.c

index 470be9c..c43f3f2 100644 (file)
@@ -246,24 +246,6 @@ int MAIN__(void)
 {
   srand(SMPI_RAND_SEED);
 
-  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);
-
   if(getenv("SMPI_PRETEND_CC") != NULL) {
        /* Hack to ensure that smpicc can pretend to be a simple compiler. Particularly handy to pass it to the configuration tools */
     return 0;
index a136ff9..25f9a04 100644 (file)
@@ -514,6 +514,28 @@ 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);
+//END SMPI
+
+
     if (!surf_path) {
       /* retrieves the current directory of the        current process */
       const char *initial_path = __surf_get_initial_path();