X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..71b6a2765baf41eb658e9f4ed80843de82c7bcfd:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 34f2b68270..f10b47cedc 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -20,6 +20,7 @@ #include #include /* split */ #include +#include #include #include #include /* intmax_t */ @@ -64,27 +65,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke #endif #if HAVE_PAPI -std::string papi_default_config_name = "default"; std::map> units2papi_setup; #endif std::unordered_map location2speedup; static int smpi_exit_status = 0; -extern double smpi_total_benched_time; xbt_os_timer_t global_timer; 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 - * "this == MPI_COMM_UNINITIALIZED"? If yes, it uses smpi_process()->comm_world() - * instead of "this". - * This is basically how we only have one global variable but all processes have - * different communicators (the one their SMPI instance uses). - * - * See smpi_comm.cpp and the functions therein for details. - */ -MPI_Comm MPI_COMM_WORLD = MPI_COMM_UNINITIALIZED; + // No instance gets manually created; check also the smpirun.in script as // this default name is used there as well (when the tag is generated). static const std::string smpi_default_instance_name("smpirun"); @@ -362,8 +351,8 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of { 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()); - XBT_ATTRIB_UNUSED int unlink_status = unlink(target.c_str()); - xbt_assert(unlink_status == 0 || errno == ENOENT, "Failed to unlink file %s: %s", target.c_str(), strerror(errno)); + xbt_assert(unlink(target.c_str()) == 0 || errno == ENOENT, "Failed to unlink file %s: %s", target.c_str(), + strerror(errno)); int fdout = open(target.c_str(), O_CREAT | O_RDWR | O_EXCL, S_IRWXU); xbt_assert(fdout >= 0, "Cannot write into %s: %s", target.c_str(), strerror(errno)); @@ -374,10 +363,10 @@ static void smpi_copy_file(const std::string& src, const std::string& target, of close(fdin); close(fdout); return; - } else if (sent_size != -1 || errno != ENOSYS) { - xbt_die("Error while copying %s: only %zd bytes copied instead of %" PRIdMAX " (errno: %d -- %s)", target.c_str(), - sent_size, static_cast(fdin_size), errno, strerror(errno)); } + xbt_assert(sent_size == -1 && errno == ENOSYS, + "Error while copying %s: only %zd bytes copied instead of %" PRIdMAX " (errno: %d -- %s)", target.c_str(), + sent_size, static_cast(fdin_size), errno, strerror(errno)); #endif // If this point is reached, sendfile() actually is not available. Copy file by hand. std::vector buf(1024 * 1024 * 4); @@ -430,14 +419,13 @@ static void smpi_init_privatization_dlopen(const std::string& executable) 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); - xbt_assert(libhandle != nullptr, - "Cannot dlopen %s - check your settings in smpi/privatize-libs", libname.c_str()); + xbt_assert(libhandle != nullptr, "Cannot dlopen %s - check your settings in smpi/privatize-libs", + libname.c_str()); // get library name from path std::string fullpath = libname; #if not defined(__APPLE__) && not defined(__HAIKU__) - XBT_ATTRIB_UNUSED int dl_iterate_res = dl_iterate_phdr(visit_libs, &fullpath); - xbt_assert(dl_iterate_res != 0, "Can't find a linked %s - check your settings in smpi/privatize-libs", - fullpath.c_str()); + xbt_assert(dl_iterate_phdr(visit_libs, &fullpath) != 0, + "Can't find a linked %s - check your settings in smpi/privatize-libs", fullpath.c_str()); XBT_DEBUG("Extra lib to privatize '%s' found", fullpath.c_str()); #else xbt_die("smpi/privatize-libs is not (yet) compatible with OSX nor with Haiku"); @@ -473,9 +461,7 @@ static void smpi_init_privatization_dlopen(const std::string& executable) // 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() < pad) - pad = libname.length(); + auto pad = std::min(7, libname.length()); std::string target_libname = std::string(pad - std::to_string(rank).length(), '0') + std::to_string(rank) + libname.substr(pad); std::string target_lib = simgrid::config::get_value("smpi/tmpdir") + "/" + target_libname; target_libs.push_back(target_lib); @@ -497,8 +483,10 @@ static void smpi_init_privatization_dlopen(const std::string& executable) for (const std::string& target_lib : target_libs) unlink(target_lib.c_str()); } - xbt_assert(handle != nullptr, "dlopen failed: %s (errno: %d -- %s)", dlerror(), saved_errno, - strerror(saved_errno)); + xbt_assert(handle != nullptr, + "dlopen failed: %s (errno: %d -- %s).\nError: Did you compile the program with a SMPI-specific " + "compiler (spmicc or friends)?", + dlerror(), saved_errno, strerror(saved_errno)); smpi_entry_point_type entry_point = smpi_resolve_function(handle); xbt_assert(entry_point, "Could not resolve entry point"); @@ -547,7 +535,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) sg_storage_file_system_init(); // parse the platform file: get the host list engine->load_platform(argv[1]); - SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback); + simgrid::kernel::activity::CommImpl::set_copy_data_callback(smpi_comm_copy_buffer_callback); if (smpi_cfg_privatization() == SmpiPrivStrategies::DLOPEN) smpi_init_privatization_dlopen(executable); @@ -580,17 +568,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) SIMIX_run(); xbt_os_walltimer_stop(global_timer); - if (simgrid::config::get_value("smpi/display-timing")) { - double global_time = xbt_os_timer_elapsed(global_timer); - XBT_INFO("Simulated time: %g seconds. \n\n" - "The simulation took %g seconds (after parsing and platform setup)\n" - "%g seconds were actual computation of the application", - SIMIX_get_clock(), global_time , smpi_total_benched_time); - - if (smpi_total_benched_time/global_time>=0.75) - XBT_INFO("More than 75%% of the time was spent inside the application code.\n" - "You may want to use sampling functions or trace replay to reduce this."); - } + simgrid::smpi::utils::print_time_analysis(xbt_os_timer_elapsed(global_timer)); } SMPI_finalize(); @@ -634,8 +612,8 @@ void SMPI_finalize() if (smpi_cfg_privatization() == SmpiPrivStrategies::MMAP) smpi_destroy_global_memory_segments(); - if (simgrid::smpi::F2C::lookup() != nullptr) - simgrid::smpi::F2C::delete_lookup(); + + simgrid::smpi::utils::print_memory_analysis(); } void smpi_mpi_init() {