X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5089a0a98b27f5eeee62321dff4f025f1648f025..c8c2ca62f763f7872f2cecb38531705ed526fd5b:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 3f3dc80b45..4eec01adc6 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2021. 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. */ @@ -9,12 +9,11 @@ #include "simgrid/sg_config.hpp" #include "src/kernel/resource/profile/FutureEvtSet.hpp" #include "src/kernel/resource/profile/Profile.hpp" -#include "src/simgrid/version.h" #include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf.hpp" -#include "src/xbt_modinter.h" /* whether initialization was already done */ #include "surf/surf.hpp" #include "xbt/module.h" +#include "xbt/xbt_modinter.h" /* whether initialization was already done */ #include #include @@ -30,13 +29,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke * Utils * *********/ -std::vector all_existing_models; /* to destroy models correctly */ - simgrid::kernel::profile::FutureEvtSet future_evt_set; std::vector surf_path; -/** set of hosts for which one want to be notified if they ever restart. */ -std::set watched_hosts; -extern std::map storage_types; std::vector* surf_plugin_description = nullptr; @@ -49,7 +43,7 @@ static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description() XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun) { if (not surf_plugin_description) - surf_plugin_description = new std::vector; + surf_plugin_description = new std::vector(); surf_plugin_description->emplace_back(surf_model_description_t{name, description, init_fun}); } @@ -77,16 +71,19 @@ const std::vector surf_network_model_description = { &surf_network_model_init_NS3}, }; -#if ! HAVE_SMPI -void surf_network_model_init_SMPI() { +#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() { +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() { +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 @@ -106,8 +103,9 @@ const std::vector surf_host_model_description = { 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).", + {"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}, }; @@ -116,10 +114,6 @@ const std::vector surf_disk_model_description = { {"default", "Simplistic disk model.", &surf_disk_model_init_default}, }; -const std::vector surf_storage_model_description = { - {"default", "Simplistic storage model.", &surf_storage_model_init_default}, -}; - double NOW = 0; double surf_get_clock() @@ -127,7 +121,7 @@ double surf_get_clock() return NOW; } -/* returns whether #file_path is a absolute file path. Surprising, isn't it ? */ +/* returns whether #file_path is an absolute file path. Surprising, isn't it ? */ static bool is_absolute_file_path(const std::string& file_path) { #ifdef _WIN32 @@ -148,7 +142,7 @@ std::ifstream* surf_ifsopen(const std::string& name) { xbt_assert(not name.empty()); - std::ifstream* fs = new std::ifstream(); + 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); } @@ -169,7 +163,7 @@ std::ifstream* surf_ifsopen(const std::string& name) FILE* surf_fopen(const std::string& name, const char* mode) { - FILE *file = nullptr; + FILE* file = nullptr; if (is_absolute_file_path(name)) /* don't mess with absolute file names */ return fopen(name.c_str(), mode); @@ -198,7 +192,7 @@ int find_model_description(const std::vector& table, c auto pos = std::find_if(table.begin(), table.end(), [&name](const surf_model_description_t& item) { return item.name == name; }); if (pos != table.end()) - return std::distance(table.begin(), pos); + return static_cast(std::distance(table.begin(), pos)); if (table.empty()) xbt_die("No model is valid! This is a bug."); @@ -214,83 +208,7 @@ int find_model_description(const std::vector& table, c 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 > 89 || lib_version_patch > 89) { - 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() -{ - XBT_HELP("This program was linked against %s (git: %s), found in %s.", SIMGRID_VERSION_STRING, SIMGRID_GIT_VERSION, - SIMGRID_INSTALL_PREFIX); - -#if SIMGRID_HAVE_MC - XBT_HELP(" Model-checking support compiled in."); -#else - XBT_HELP(" Model-checking support disabled at compilation."); -#endif - -#if SIMGRID_HAVE_NS3 - XBT_HELP(" ns-3 support compiled in."); -#else - XBT_HELP(" ns-3 support disabled at compilation."); -#endif - -#if SIMGRID_HAVE_JEDULE - XBT_HELP(" Jedule support compiled in."); -#else - XBT_HELP(" Jedule support disabled at compilation."); -#endif - -#if SIMGRID_HAVE_LUA - XBT_HELP(" Lua support compiled in."); -#else - XBT_HELP(" Lua support disabled at compilation."); -#endif - -#if SIMGRID_HAVE_MALLOCATOR - XBT_HELP(" Mallocator support compiled in."); -#else - XBT_HELP(" Mallocator support disabled at compilation."); -#endif - - XBT_HELP("\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" - "The pdf file and a BibTeX entry for LaTeX users can be found at http://hal.inria.fr/hal-01017319"); -} - -void surf_init(int *argc, char **argv) +void surf_init(int* argc, char** argv) { if (xbt_initialized > 0) return; @@ -298,26 +216,14 @@ void surf_init(int *argc, char **argv) xbt_init(argc, argv); sg_config_init(argc, argv); - - if (MC_is_active()) - MC_memory_init(); } void surf_exit() { simgrid::s4u::Engine::shutdown(); - for (auto const& e : storage_types) { - simgrid::kernel::resource::StorageType* stype = e.second; - delete stype->properties; - delete stype->model_properties; - delete stype; - } - - for (auto const& model : all_existing_models) - delete model; tmgr_finalize(); sg_platf_exit(); - NOW = 0; /* Just in case the user plans to restart the simulation afterward */ + NOW = 0; /* Just in case the user plans to restart the simulation afterward */ }