X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26cc914ea54fae16e353aa561b46fa6fa26d2ebc..0b0306fee606608373a16c77c67ee52fbca2525c:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index ab3ba0396c..cca996252f 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -15,7 +15,9 @@ #include /* DBL_MAX */ #include #include +#if not defined(__APPLE__) #include +#endif #include #if HAVE_SENDFILE @@ -54,7 +56,7 @@ static int smpi_exit_status = 0; int smpi_universe_size = 0; extern double smpi_total_benched_time; xbt_os_timer_t global_timer; -static char* privatize_lib_path=nullptr; +static std::vector privatize_libs_paths; /** * Setting MPI_COMM_WORLD to MPI_COMM_UNINITIALIZED (it's a variable) * is important because the implementation of MPI_Comm checks @@ -447,44 +449,43 @@ static smpi_entry_point_type smpi_resolve_function(void* handle) return smpi_entry_point_type(); } -static void smpi_copy_file(std::string src,std::string target, off_t fdin_size, int rank){ - - int fdin = open(src.c_str(), O_RDONLY); - xbt_assert(fdin >= 0, "Cannot read from %s. Please make sure that the file exists and is executable.", - src.c_str()); - int fdout = open(target.c_str(), O_CREAT | O_RDWR, S_IRWXU); - xbt_assert(fdout >= 0, "Cannot write into %s", target.c_str()); +static void smpi_copy_file(std::string src, std::string target, off_t fdin_size) +{ + int fdin = open(src.c_str(), O_RDONLY); + xbt_assert(fdin >= 0, "Cannot read from %s. Please make sure that the file exists and is executable.", src.c_str()); + int fdout = open(target.c_str(), O_CREAT | O_RDWR, S_IRWXU); + xbt_assert(fdout >= 0, "Cannot write into %s", target.c_str()); - XBT_DEBUG("Copy %ld bytes into %s", static_cast(fdin_size), target.c_str()); + XBT_DEBUG("Copy %ld bytes into %s", static_cast(fdin_size), target.c_str()); #if HAVE_SENDFILE - ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size); - xbt_assert(sent_size == fdin_size, - "Error while copying %s: only %zd bytes copied instead of %ld (errno: %d -- %s)", - target.c_str(), sent_size, fdin_size, errno, strerror(errno)); + ssize_t sent_size = sendfile(fdout, fdin, NULL, fdin_size); + xbt_assert(sent_size == fdin_size, "Error while copying %s: only %zd bytes copied instead of %ld (errno: %d -- %s)", + target.c_str(), sent_size, fdin_size, errno, strerror(errno)); #else - const int bufsize = 1024 * 1024 * 4; - char buf[bufsize]; - while (int got = read(fdin, buf, bufsize)) { - if (got == -1) { - xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str()); - } else { - char* p = buf; - int todo = got; - while (int done = write(fdout, p, todo)) { - if (done == -1) { - xbt_assert(errno == EINTR, "Cannot write into %s", target.c_str()); - } else { - p += done; - todo -= done; - } + const int bufsize = 1024 * 1024 * 4; + char buf[bufsize]; + while (int got = read(fdin, buf, bufsize)) { + if (got == -1) { + xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str()); + } else { + char* p = buf; + int todo = got; + while (int done = write(fdout, p, todo)) { + if (done == -1) { + xbt_assert(errno == EINTR, "Cannot write into %s", target.c_str()); + } else { + p += done; + todo -= done; } } } + } #endif - close(fdin); - close(fdout); + close(fdin); + close(fdout); } +#if not defined(__APPLE__) static int visit_libs (struct dl_phdr_info *info, size_t size, void *data){ char* libname = (char*)(data); @@ -496,6 +497,7 @@ static int visit_libs (struct dl_phdr_info *info, return 0; } +#endif int smpi_main(const char* executable, int argc, char *argv[]) { @@ -536,21 +538,30 @@ int smpi_main(const char* executable, int argc, char *argv[]) static std::size_t rank = 0; - std::string libname = simgrid::config::get_value("smpi/privatize-lib"); - std::string target_lib; - if(not libname.empty()){ - //load the library once to add it to the local libs, to get the absolute path - void* libhandle = dlopen(libname.c_str(), RTLD_LAZY); - //get library name from path - char fullpath[512]={'\0'}; - strcpy(fullpath, libname.c_str()); - int ret = dl_iterate_phdr(visit_libs, fullpath); - if(ret==0) - xbt_die("Can't find a linked %s - check the setting you gave to smpi/privatize-lib", fullpath); - else - XBT_DEBUG("Extra lib to privatize found : %s", fullpath); - privatize_lib_path=strdup(fullpath); - dlclose(libhandle); + std::string libnames = simgrid::config::get_value("smpi/privatize-libs"); + if(not libnames.empty()){ + //split option + std::vector privatize_libs; + boost::split(privatize_libs,libnames, boost::is_any_of(";")); + + for (auto const& libname : privatize_libs) { + //load the library once to add it to the local libs, to get the absolute path + void* libhandle = dlopen(libname.c_str(), RTLD_LAZY); + //get library name from path + char fullpath[512]={'\0'}; + strcpy(fullpath, libname.c_str()); +#if not defined(__APPLE__) + int ret = dl_iterate_phdr(visit_libs, fullpath); + if(ret==0) + xbt_die("Can't find a linked %s - check the setting you gave to smpi/privatize-libs", fullpath); + else + XBT_DEBUG("Extra lib to privatize found : %s", fullpath); +#else + xbt_die("smpi/privatize-libs is not (yet) compatible with OSX"); +#endif + privatize_libs_paths.push_back(fullpath); + dlclose(libhandle); + } } simix_global->default_function = [executable_copy, fdin_size](std::vector args) { @@ -561,32 +572,38 @@ int smpi_main(const char* executable, int argc, char *argv[]) + "_" + std::to_string(getpid()) + "_" + std::to_string(rank) + ".so"; - smpi_copy_file(executable_copy, target_executable, fdin_size, rank); - - //if smpi/privatize-lib is set, duplicate pointed lib and link each executable to a different one. - //TODO : extend to multiple libs - std::string libname = simgrid::config::get_value("smpi/privatize-lib"); - //if we were given a full path, strip it - size_t index = libname.find_last_of("/\\"); - if(index!=std::string::npos) - libname=libname.substr(index+1); - std::string target_lib; - if(not libname.empty()){ - //load the library to add it to the local libs, to get the absolute path - struct stat fdin_stat2; - stat(privatize_lib_path, &fdin_stat2); - off_t fdin_size2 = fdin_stat2.st_size; - - // Copy the dynamic library, the new name must be the same length as the old one - // just replace the name with 0s and the rank. - target_lib = std::string(libname.length() - std::to_string(rank).length(), '0')+std::to_string(rank); - XBT_DEBUG("copy lib %s to %s, with size %zd", privatize_lib_path, target_lib.c_str(), fdin_size2); - smpi_copy_file(privatize_lib_path, target_lib, fdin_size2, rank); - - std::string sedcommand = "sed -i -e 's/"+libname+"/"+target_lib+"/g' "+target_executable; - int ret = system(sedcommand.c_str()); - if(ret!=0) xbt_die ("error while applying sed command %s \n", sedcommand.c_str()); + smpi_copy_file(executable_copy, target_executable, fdin_size); + //if smpi/privatize-libs is set, duplicate pointed lib and link each executable copy to a different one. + std::string target_lib; + for (auto const& libpath : privatize_libs_paths){ + //if we were given a full path, strip it + size_t index = libpath.find_last_of("/\\"); + std::string libname; + if(index!=std::string::npos) + libname=libpath.substr(index+1); + + if(not libname.empty()){ + //load the library to add it to the local libs, to get the absolute path + struct stat fdin_stat2; + stat(libpath.c_str(), &fdin_stat2); + off_t fdin_size2 = fdin_stat2.st_size; + + // Copy the dynamic library, the new name must be the same length as the old one + // just replace the name with 7 digits for the rank and the rest of the name. + unsigned int pad=7; + if(libname.length()