X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/403af5e6247ce6452b721f418a5b41e4548efac4..d3c605045fe8c525f32393a054425d72edf47b18:/src/simgrid/sg_config.cpp

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 17bb94fc35..6c6dfec814 100644
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -1,21 +1,20 @@
-/* Copyright (c) 2009-2010, 2012-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-/* sg_config: configuration infrastructure for the simulation world       */
+/* sg_config: configuration infrastructure for the simulation world         */
 
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
 #include "instr/instr_interface.h"
 #include "mc/mc.h"
 #include "simgrid/instr.h"
 #include "simgrid/simix.h"
 #include "simgrid_config.h" /* what was compiled in? */
-#include "src/mc/mc_replay.h"
+#include "src/kernel/lmm/maxmin.hpp"
+#include "src/mc/mc_replay.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "surf/maxmin.hpp"
-#include "surf/surf.h"
+#include "surf/surf.hpp"
 #include "xbt/config.h"
 #include "xbt/config.hpp"
 #include "xbt/log.h"
@@ -361,11 +360,11 @@ void sg_config_init(int *argc, char **argv)
 
   xbt_cfg_register_boolean("cpu/maxmin-selective-update", "no", nullptr, "Update the constraint set propagating "
                                                                          "recursively to others constraints (off by "
-                                                                         "default when optim is set to lazy)");
+                                                                         "default unless optim is set to lazy)");
   xbt_cfg_register_alias("cpu/maxmin-selective-update", "cpu/maxmin_selective_update");
   xbt_cfg_register_boolean("network/maxmin-selective-update", "no", nullptr, "Update the constraint set propagating "
                                                                              "recursively to others constraints (off "
-                                                                             "by default when optim is set to lazy)");
+                                                                             "by default unless optim is set to lazy)");
   xbt_cfg_register_alias("network/maxmin-selective-update", "network/maxmin_selective_update");
   /* Replay (this part is enabled even if MC it disabled) */
   xbt_cfg_register_string("model-check/replay", nullptr, _sg_cfg_cb_model_check_replay,
@@ -552,13 +551,8 @@ void sg_config_init(int *argc, char **argv)
         "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end.");
     xbt_cfg_register_alias("clean-atexit","clean_atexit");
 
-    if (surf_path.empty()) {
-      /* retrieves the current directory of the current process */
-      const char *initial_path = __surf_get_initial_path();
-      xbt_assert((initial_path), "__surf_get_initial_path() failed! Can't resolve current Windows directory");
-
-      xbt_cfg_setdefault_string("path", initial_path);
-    }
+    if (surf_path.empty())
+      xbt_cfg_setdefault_string("path", "./");
 
     _sg_cfg_init_status = 1;