X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/620004c2a9db271a47d5c4df9b02633703afcb76..77498c371dfdd83317abbe8cf435a76e48bb038b:/src/simgrid/sg_config.cpp?ds=sidebyside

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index af10da4695..2e2db7fd78 100644
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -38,21 +38,25 @@ bool _sg_cfg_exit_asap = false;
 /* Parse the command line, looking for options */
 static void sg_config_cmd_line(int *argc, char **argv)
 {
-  int shall_exit = 0;
+  bool shall_exit = false;
   int i;
   int j;
+  bool parse_args = true; // Stop parsing the parameters once we found '--'
 
   for (j = i = 1; i < *argc; i++) {
-    if (not strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
+    if (not strcmp("--", argv[i])) {
+      parse_args = false;
+      // Remove that '--' from the arguments
+    } else if (parse_args && not strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
       char *opt = strchr(argv[i], '=');
       opt++;
 
       simgrid::config::set_parse(opt);
       XBT_DEBUG("Did apply '%s' as config setting", opt);
-    } else if (not strcmp(argv[i], "--version")) {
+    } else if (parse_args && not strcmp(argv[i], "--version")) {
       printf("%s\n", SIMGRID_VERSION_STRING);
-      shall_exit = 1;
-    } else if (not strcmp(argv[i], "--cfg-help") || not strcmp(argv[i], "--help")) {
+      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");
       simgrid::config::help();
       printf(
@@ -69,13 +73,13 @@ static void sg_config_cmd_line(int *argc, char **argv)
           "   --version to get SimGrid version information.\n"
           "\n"
         );
-      shall_exit = 1;
-    } else if (not strcmp(argv[i], "--help-aliases")) {
+      shall_exit = true;
+    } else if (parse_args && not strcmp(argv[i], "--help-aliases")) {
       printf("Here is a list of all deprecated option names, with their replacement.\n");
       simgrid::config::show_aliases();
       printf("Please consider using the recent names\n");
-      shall_exit = 1;
-    } else if (not strcmp(argv[i], "--help-models")) {
+      shall_exit = true;
+    } else if (parse_args && not strcmp(argv[i], "--help-models")) {
       model_help("host", surf_host_model_description);
       printf("\n");
       model_help("CPU", surf_cpu_model_description);
@@ -87,10 +91,10 @@ static void sg_config_cmd_line(int *argc, char **argv)
                surf_optimization_mode_description[k].name,
                surf_optimization_mode_description[k].description);
       printf("Both network and CPU models have 'Lazy' as default optimization level\n\n");
-      shall_exit = 1;
-    } else if (not strcmp(argv[i], "--help-tracing")) {
+      shall_exit = true;
+    } else if (parse_args && not strcmp(argv[i], "--help-tracing")) {
       TRACE_help();
-      shall_exit = 1;
+      shall_exit = true;
     } else {
       argv[j++] = argv[i];
     }
@@ -405,6 +409,9 @@ void sg_config_init(int *argc, char **argv)
       default_privatization);
   simgrid::config::alias("smpi/privatization", {"smpi/privatize_global_variables", "smpi/privatize-global-variables"});
 
+  simgrid::config::declare_flag<std::string>(
+      "smpi/privatize-libs", "Add libraries (; separated) to privatize (libgfortran for example). You need to provide the full names of the files (libgfortran.so.4), or its full path", "");
+
   simgrid::config::declare_flag<bool>("smpi/grow-injected-times",
                                       "Whether we want to make the injected time in MPI_Iprobe and MPI_Test grow, to "
                                       "allow faster simulation. This can make simulation less precise, though.",