#include "src/smpi/include/smpi_actor.hpp"
#include "xbt/config.hpp"
+#include <algorithm>
#include <cfloat> /* DBL_MAX */
#include <dlfcn.h>
#include <fcntl.h>
#if SMPI_IFORT
extern "C" void for_rtl_init_ (int *, char **);
+ extern "C" void for_rtl_finish_ ();
#elif SMPI_FLANG
extern "C" void __io_set_argc(int);
extern "C" void __io_set_argv(char **);
static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector<std::string> args)
{
- char noarg[] = {'\0'};
- int argc = args.size();
- std::unique_ptr<char*[]> argv(new char*[argc + 1]);
- for (int i = 0; i != argc; ++i)
- argv[i] = args[i].empty() ? noarg : &args[i].front();
- argv[argc] = nullptr;
- char ** argvptr=argv.get();
- simgrid::smpi::ActorExt::init(&argc, &argvptr);
+ // 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()); });
+
+ // take a copy of args4argv to keep reference of the allocated strings
+ const std::vector<char*> args2str(*args4argv);
+ int argc = args4argv->size();
+ args4argv->push_back(nullptr);
+ char** argv = args4argv->data();
+
+ simgrid::smpi::ActorExt::init(&argc, &argv);
#if SMPI_IFORT
- for_rtl_init_ (&argc, argvptr);
+ for_rtl_init_ (&argc, argv);
#elif SMPI_FLANG
__io_set_argc(argc);
- __io_set_argv(argvptr);
+ __io_set_argv(argv);
#elif SMPI_GFORTRAN
- _gfortran_set_args(argc, argvptr);
+ _gfortran_set_args(argc, argv);
#endif
- int res = entry_point(argc, argvptr);
+ int res = entry_point(argc, argv);
+
+#if SMPI_IFORT
+ for_rtl_finish_ ();
+#else
+ for (char* s : args2str)
+ xbt_free(s);
+ delete args4argv;
+#endif
+
if (res != 0){
XBT_WARN("SMPI process did not return 0. Return value : %d", res);
if (smpi_exit_status == 0)