int shall_exit = 0;
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")) {
+ } 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(
"\n"
);
shall_exit = 1;
- } else if (not strcmp(argv[i], "--help-aliases")) {
+ } 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")) {
+ } 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);
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")) {
+ } else if (parse_args && not strcmp(argv[i], "--help-tracing")) {
TRACE_help();
shall_exit = 1;
} else {
simgrid::config::declare_flag<std::string>("smpi/alltoallv", "Which collective to use for alltoallv", "");
simgrid::config::declare_flag<std::string>("smpi/bcast", "Which collective to use for bcast", "");
simgrid::config::declare_flag<std::string>("smpi/reduce", "Which collective to use for reduce", "");
-
- simgrid::config::declare_flag<int>("smpi/plugin/lb/migration-frequency", "After how many migrations should the load balancer"
- "compute a new mapping?", 10);
#endif // HAVE_SMPI
/* Others */