From b5545f5600ada39b54a57fa643746c99b3fe01b7 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Thu, 26 Jul 2018 14:52:17 +0200 Subject: [PATCH] make a copy of args for each process Not optimal as it's only for fortran (ifort) that it's useful. Done this way to see if it helps flang as well --- src/smpi/internals/smpi_global.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 66a4be23ca..de959a9891 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -44,6 +44,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke #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 **); @@ -427,21 +428,28 @@ static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector argv(new char*[argc + 1]); + char** argv = new char*[argc + 1]; for (int i = 0; i != argc; ++i) - argv[i] = args[i].empty() ? noarg : &args[i].front(); + argv[i] = args[i].empty() ? noarg : xbt_strdup(&args[i].front()); argv[argc] = nullptr; - char ** argvptr=argv.get(); - simgrid::smpi::ActorExt::init(&argc, &argvptr); + 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); #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_ (); +#endif + + for (int i = 0; i != argc; ++i) + xbt_free(argv[i]); + xbt_free(argv); if (res != 0){ XBT_WARN("SMPI process did not return 0. Return value : %d", res); if (smpi_exit_status == 0) -- 2.20.1