X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d648ebbbe5705878080b9cbf1ca61497323c592..a88d4f2d2d1d5cce8f3cc1350f41d0dd52d55a31:/src/simgrid/sg_config.cpp
diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 6358b596a1..57d131191c 100644
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -12,6 +12,7 @@
#include "src/kernel/lmm/maxmin.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_replay.hpp"
+#include "src/smpi/include/smpi_config.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include "xbt/config.hpp"
@@ -41,15 +42,6 @@ void sg_config_continue_after_help()
*/
int _sg_cfg_init_status = 0;
-/* instruct the upper layer (simix or simdag) to exit as soon as possible */
-bool _sg_cfg_exit_asap = false;
-
-#define sg_cfg_exit_early() \
- do { \
- _sg_cfg_exit_asap = true; \
- return; \
- } while (0)
-
/* Parse the command line, looking for options */
static void sg_config_cmd_line(int *argc, char **argv)
{
@@ -72,41 +64,39 @@ static void sg_config_cmd_line(int *argc, char **argv)
sg_version();
shall_exit = true;
} else if (parse_args && (not strcmp(argv[i], "--cfg-help") || not strcmp(argv[i], "--help"))) {
- printf("Description of the configuration accepted by this simulator:\n");
+ XBT_HELP("Description of the configuration accepted by this simulator:");
simgrid::config::help();
- printf(
- "\n"
- "Each of these configurations can be used by adding\n"
- " --cfg=