X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a89700266146941b0bd63a7cdbb65bd72c30903f..5ec2b80b686983f84ebab7c7398a29e73286deee:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 93a3b170e4..77046196b4 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,25 +1,21 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "surf_interface.hpp" +#include +#include + #include "mc/mc.h" -#include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" -#include "src/internal_config.h" +#include "src/kernel/resource/profile/FutureEvtSet.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/xml/platf.hpp" -#include "surf/surf.hpp" -#include "xbt/module.h" +#include "src/surf/surf_interface.hpp" #include #include -#ifdef _WIN32 -#include -#endif - XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); @@ -27,124 +23,83 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke * Utils * *********/ -std::vector* all_existing_models = nullptr; /* to destroy models correctly */ - -simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr; +simgrid::kernel::profile::FutureEvtSet future_evt_set; std::vector surf_path; -std::vector host_that_restart; -/** set of hosts for which one want to be notified if they ever restart. */ -std::set watched_hosts; -extern std::map storage_types; -#include // FIXME: this plug-in should not be linked to the core -#include // FIXME: this plug-in should not be linked to the core -#include // FIXME: this plug-in should not be linked to the core - -s_surf_model_description_t surf_plugin_description[] = { - {"host_energy", "Cpu energy consumption.", &sg_host_energy_plugin_init}, - {"link_energy", "Link energy consumption.", &sg_link_energy_plugin_init}, - {"host_dvfs", "Dvfs support", &sg_host_dvfs_plugin_init}, - {"host_load", "Cpu load.", &sg_host_load_plugin_init}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ -}; - -/* Don't forget to update the option description in smx_config when you change this */ -s_surf_model_description_t surf_network_model_description[] = { - {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; " - "bottleneck sharing uses a payload of S=20537 for evaluating RTT). ", +const std::vector surf_network_model_description = { + {"LV08", + "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; " + "bottleneck sharing uses a payload of S=20537 for evaluating RTT). ", &surf_network_model_init_LegrandVelho}, - {"Constant", "Simplistic network model where all communication take a constant time (one second). This model " - "provides the lowest realism, but is (marginally) faster.", + {"Constant", + "Simplistic network model where all communication take a constant time (one second). This model " + "provides the lowest realism, but is (marginally) faster.", &surf_network_model_init_Constant}, - {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with " - "correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", + {"SMPI", + "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with " + "correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", &surf_network_model_init_SMPI}, {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model", &surf_network_model_init_IB}, - {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of " - "small messages are thus poorly modeled).", + {"CM02", + "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of " + "small messages are thus poorly modeled).", &surf_network_model_init_CM02}, - {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", &surf_network_model_init_NS3}, - {"Reno", - "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Reno}, - {"Reno2", - "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Reno2}, - {"Vegas", - "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Vegas}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ + {"ns-3", "Network pseudo-model using the ns-3 tcp model instead of an analytic model", + &surf_network_model_init_NS3}, }; -#if ! HAVE_SMPI -void surf_network_model_init_SMPI() { - xbt_die("Please activate SMPI support in cmake to use the SMPI network model."); -} -void surf_network_model_init_IB() { +#if !HAVE_SMPI +void surf_network_model_init_IB() +{ xbt_die("Please activate SMPI support in cmake to use the IB network model."); } #endif #if !SIMGRID_HAVE_NS3 -void surf_network_model_init_NS3() { - xbt_die("Please activate NS3 support in cmake and install the dependencies to use the NS3 network model."); +void surf_network_model_init_NS3() +{ + xbt_die("Please activate ns-3 support in cmake and install the dependencies to use the NS3 network model."); } #endif -s_surf_model_description_t surf_cpu_model_description[] = { - {"Cas01", "Simplistic CPU model (time=size/power).", &surf_cpu_model_init_Cas01}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ +const std::vector surf_cpu_model_description = { + {"Cas01", "Simplistic CPU model (time=size/speed).", &surf_cpu_model_init_Cas01}, }; -s_surf_model_description_t surf_host_model_description[] = { - {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", &surf_host_model_init_current_default}, - {"compound", "Host model that is automatically chosen if you change the network and CPU models", &surf_host_model_init_compound}, - {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", &surf_host_model_init_ptask_L07}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ +const std::vector surf_disk_model_description = { + {"S19", "Simplistic disk model.", &surf_disk_model_init_S19}, }; -s_surf_model_description_t surf_optimization_mode_description[] = { - {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr}, - {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", nullptr}, - {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ +const std::vector surf_host_model_description = { + {"default", "Default host model. Currently, CPU:Cas01, network:LV08 (with cross traffic enabled), and disk:S19", + &surf_host_model_init_current_default}, + {"compound", "Host model that is automatically chosen if you change the CPU, network, and disk models", + &surf_host_model_init_compound}, + {"ptask_L07", "Host model somehow similar to Cas01+CM02+S19 but allowing parallel tasks", + &surf_host_model_init_ptask_L07}, }; -s_surf_model_description_t surf_storage_model_description[] = { - {"default", "Simplistic storage model.", &surf_storage_model_init_default}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ +const std::vector surf_optimization_mode_description = { + {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr}, + {"TI", + "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU " + "model for now).", + nullptr}, + {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr}, }; -double NOW = 0; - -double surf_get_clock() +/* returns whether #file_path is an absolute file path. Surprising, isn't it ? */ +static bool is_absolute_file_path(const std::string& file_path) { - return NOW; -} - -/* returns whether #file_path is a absolute file path. Surprising, isn't it ? */ -static bool is_absolute_file_path(const char* file_path) -{ -#ifdef _WIN32 - WIN32_FIND_DATA wfd = {0}; - HANDLE hFile = FindFirstFile(file_path, &wfd); - - if (INVALID_HANDLE_VALUE == hFile) - return false; - - FindClose(hFile); - return true; -#else - return (file_path[0] == '/'); -#endif + return (file_path.c_str()[0] == '/'); } -std::ifstream* surf_ifsopen(std::string name) +std::ifstream* surf_ifsopen(const std::string& name) { xbt_assert(not name.empty()); - std::ifstream* fs = new std::ifstream(); - if (is_absolute_file_path(name.c_str())) { /* don't mess with absolute file names */ + auto* fs = new std::ifstream(); + if (is_absolute_file_path(name)) { /* don't mess with absolute file names */ fs->open(name.c_str(), std::ifstream::in); } @@ -162,14 +117,12 @@ std::ifstream* surf_ifsopen(std::string name) return fs; } -FILE *surf_fopen(const char *name, const char *mode) +FILE* surf_fopen(const std::string& name, const char* mode) { - FILE *file = nullptr; - - xbt_assert(name); + FILE* file = nullptr; if (is_absolute_file_path(name)) /* don't mess with absolute file names */ - return fopen(name, mode); + return fopen(name.c_str(), mode); /* search relative files in the path */ for (auto const& path_elm : surf_path) { @@ -183,145 +136,26 @@ FILE *surf_fopen(const char *name, const char *mode) } /** Displays the long description of all registered models, and quit */ -void model_help(const char *category, s_surf_model_description_t * table) -{ - printf("Long description of the %s models accepted by this simulator:\n", category); - for (int i = 0; table[i].name; i++) - printf(" %s: %s\n", table[i].name, table[i].description); -} - -int find_model_description(s_surf_model_description_t* table, std::string name) -{ - for (int i = 0; table[i].name; i++) - if (name == table[i].name) - return i; - - if (not table[0].name) - xbt_die("No model is valid! This is a bug."); - - std::string name_list = std::string(table[0].name); - for (int i = 1; table[i].name; i++) - name_list = name_list + ", " + table[i].name; - - xbt_die("Model '%s' is invalid! Valid models are: %s.", name.c_str(), name_list.c_str()); - return -1; -} - -void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch) -{ - if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) { - fprintf(stderr, "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Please fix this.\n", - lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, - SIMGRID_VERSION_PATCH); - abort(); - } - if (lib_version_patch != SIMGRID_VERSION_PATCH) { - if (SIMGRID_VERSION_PATCH >= 90 || lib_version_patch >= 90) { - fprintf( - stderr, - "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. \n" - "One of them is a development version, and should not be mixed with the stable release. Please fix this.\n", - lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, - SIMGRID_VERSION_PATCH); - abort(); - } - fprintf(stderr, "Warning: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n", - lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, - SIMGRID_VERSION_PATCH); - } -} - -void sg_version_get(int* ver_major, int* ver_minor, int* ver_patch) -{ - *ver_major = SIMGRID_VERSION_MAJOR; - *ver_minor = SIMGRID_VERSION_MINOR; - *ver_patch = SIMGRID_VERSION_PATCH; -} - -void sg_version() -{ - std::printf("This program was linked against %s (git: %s), found in %s.\n", - SIMGRID_VERSION_STRING, SIMGRID_GIT_VERSION, SIMGRID_INSTALL_PREFIX); - -#if SIMGRID_HAVE_MC - std::printf(" Model-checking support compiled in.\n"); -#else - std::printf(" Model-checking support disabled at compilation.\n"); -#endif - -#if SIMGRID_HAVE_NS3 - std::printf(" NS3 support compiled in.\n"); -#else - std::printf(" NS3 support disabled at compilation.\n"); -#endif - -#if SIMGRID_HAVE_JEDULE - std::printf(" Jedule support compiled in.\n"); -#else - std::printf(" Jedule support disabled at compilation.\n"); -#endif - -#if SIMGRID_HAVE_LUA - std::printf(" Lua support compiled in.\n"); -#else - std::printf(" Lua support disabled at compilation.\n"); -#endif - -#if SIMGRID_HAVE_MALLOCATOR - std::printf(" Mallocator support compiled in.\n"); -#else - std::printf(" Mallocator support disabled at compilation.\n"); -#endif - - std::printf("\nTo cite SimGrid in a publication, please use:\n" - " Henri Casanova, Arnaud Giersch, Arnaud Legrand, Martin Quinson, Frédéric Suter. \n" - " Versatile, Scalable, and Accurate Simulation of Distributed Applications and Platforms. \n" - " Journal of Parallel and Distributed Computing, Elsevier, 2014, 74 (10), pp.2899-2917.\n"); - std::printf("The pdf file and a BibTeX entry for LaTeX users can be found at http://hal.inria.fr/hal-01017319\n"); -} - -void surf_init(int *argc, char **argv) +void model_help(const char* category, const std::vector& table) { - if (USER_HOST_LEVEL != -1) // Already initialized - return; - - XBT_DEBUG("Create all Libs"); - USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr); - - xbt_init(argc, argv); - if (not all_existing_models) - all_existing_models = new std::vector(); - if (not future_evt_set) - future_evt_set = new simgrid::trace_mgr::future_evt_set(); - - sg_config_init(argc, argv); - - if (MC_is_active()) - MC_memory_init(); + XBT_HELP("Long description of the %s models accepted by this simulator:", category); + for (auto const& item : table) + XBT_HELP(" %s: %s", item.name, item.description); } -void surf_exit() +const surf_model_description_t* find_model_description(const std::vector& table, + const std::string& name) { - simgrid::s4u::Engine::shutdown(); - for (auto const& e : storage_types) { - simgrid::surf::StorageType* stype = e.second; - delete stype->properties; - delete stype->model_properties; - delete stype; + if (auto pos = std::find_if(table.begin(), table.end(), + [&name](const surf_model_description_t& item) { return item.name == name; }); + pos != table.end()) + return &*pos; + + std::string sep; + std::string name_list; + for (auto const& item : table) { + name_list += sep + item.name; + sep = ", "; } - - for (auto const& model : *all_existing_models) - delete model; - delete all_existing_models; - - delete future_evt_set; - future_evt_set = nullptr; - - tmgr_finalize(); - sg_platf_exit(); - - NOW = 0; /* Just in case the user plans to restart the simulation afterward */ + xbt_die("Model '%s' is invalid! Valid models are: %s.", name.c_str(), name_list.c_str()); }