- int argc = args.size();
- char** argv = new char*[argc + 1];
- for (int i = 0; i != argc; ++i)
- argv[i] = xbt_strdup(args[i].c_str());
- argv[argc] = nullptr;
- simgrid::smpi::ActorExt::init(&argc, &argv);
+ // copy C strings, we need them writable
+ std::vector<char*>* args4argv = new std::vector<char*>(args.size());
+ std::transform(begin(args), end(args), begin(*args4argv), [](const std::string& s) { return xbt_strdup(s.c_str()); });
+
+ // set argv[0] to executable_path
+ xbt_free((*args4argv)[0]);
+ (*args4argv)[0] = xbt_strdup(executable_path.c_str());
+
+#if !SMPI_IFORT
+ // take a copy of args4argv to keep reference of the allocated strings
+ const std::vector<char*> args2str(*args4argv);
+#endif
+ int argc = args4argv->size();
+ args4argv->push_back(nullptr);
+ char** argv = args4argv->data();
+
+ simgrid::smpi::ActorExt::init();