X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00898d8b975cc0795b004cd9235d6c76e3318da0..bd031688c75b0120d21a705ae3ee325ca0718530:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 30481fa6ee..dc56933077 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. 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. */ @@ -7,7 +7,7 @@ #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" -#include "src/internal_config.h" +#include "src/simgrid/version.h" #include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf.hpp" #include "surf/surf.hpp" @@ -29,31 +29,29 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke std::vector all_existing_models; /* to destroy models correctly */ -simgrid::trace_mgr::future_evt_set future_evt_set; +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; +extern std::map storage_types; -s_surf_model_description_t* surf_plugin_description = nullptr; -XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun) -{ - static int plugin_amount = 0; - - /* no need to check for plugin name conflict: the compiler already ensures that the generated - * simgrid_##id##_plugin_register() is unique */ +std::vector* surf_plugin_description = nullptr; - plugin_amount++; - surf_plugin_description = static_cast( - xbt_realloc(surf_plugin_description, sizeof(s_surf_model_description_t) * (plugin_amount + 2))); +static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description() +{ + delete surf_plugin_description; + surf_plugin_description = nullptr; +} - surf_plugin_description[plugin_amount - 1] = {name, description, init_fun}; - surf_plugin_description[plugin_amount] = {nullptr, nullptr, nullptr}; // this array must be null terminated +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->emplace_back(surf_model_description_t{name, description, init_fun}); } /* Don't forget to update the option description in smx_config when you change this */ -s_surf_model_description_t surf_network_model_description[] = { +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}, @@ -78,7 +76,6 @@ s_surf_model_description_t surf_network_model_description[] = { {"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 */ }; #if ! HAVE_SMPI @@ -95,28 +92,29 @@ void surf_network_model_init_NS3() { } #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/power).", &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_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}, }; -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_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}, }; -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_storage_model_description = { + {"default", "Simplistic storage model.", &surf_storage_model_init_default}, }; double NOW = 0; @@ -127,7 +125,7 @@ double surf_get_clock() } /* returns whether #file_path is a absolute file path. Surprising, isn't it ? */ -static bool is_absolute_file_path(std::string file_path) +static bool is_absolute_file_path(const std::string& file_path) { #ifdef _WIN32 WIN32_FIND_DATA wfd = {0}; @@ -143,7 +141,7 @@ static bool is_absolute_file_path(std::string file_path) #endif } -std::ifstream* surf_ifsopen(std::string name) +std::ifstream* surf_ifsopen(const std::string& name) { xbt_assert(not name.empty()); @@ -166,7 +164,7 @@ std::ifstream* surf_ifsopen(std::string name) return fs; } -FILE* surf_fopen(std::string name, const char* mode) +FILE* surf_fopen(const std::string& name, const char* mode) { FILE *file = nullptr; @@ -185,25 +183,29 @@ FILE* surf_fopen(std::string 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) +void model_help(const char* category, const std::vector& 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); + 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); } -int find_model_description(s_surf_model_description_t* table, std::string name) +int find_model_description(const std::vector& table, const std::string& name) { - for (int i = 0; table[i].name; i++) - if (name == table[i].name) - return i; + 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); - if (not table[0].name) + if (table.empty()) 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; + std::string sep; + std::string name_list; + for (auto const& item : table) { + name_list += sep + item.name; + sep = ", "; + } xbt_die("Model '%s' is invalid! Valid models are: %s.", name.c_str(), name_list.c_str()); return -1; @@ -219,7 +221,7 @@ void sg_version_check(int lib_version_major, int lib_version_minor, int lib_vers abort(); } if (lib_version_patch != SIMGRID_VERSION_PATCH) { - if (SIMGRID_VERSION_PATCH >= 90 || lib_version_patch >= 90) { + if (SIMGRID_VERSION_PATCH > 89 || lib_version_patch > 89) { fprintf( stderr, "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " @@ -245,44 +247,44 @@ void sg_version_get(int* ver_major, int* ver_minor, int* ver_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); + 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 - std::printf(" Model-checking support compiled in.\n"); + XBT_HELP(" Model-checking support compiled in."); #else - std::printf(" Model-checking support disabled at compilation.\n"); + XBT_HELP(" Model-checking support disabled at compilation."); #endif #if SIMGRID_HAVE_NS3 - std::printf(" NS3 support compiled in.\n"); + XBT_HELP(" NS3 support compiled in."); #else - std::printf(" NS3 support disabled at compilation.\n"); + XBT_HELP(" NS3 support disabled at compilation."); #endif #if SIMGRID_HAVE_JEDULE - std::printf(" Jedule support compiled in.\n"); + XBT_HELP(" Jedule support compiled in."); #else - std::printf(" Jedule support disabled at compilation.\n"); + XBT_HELP(" Jedule support disabled at compilation."); #endif #if SIMGRID_HAVE_LUA - std::printf(" Lua support compiled in.\n"); + XBT_HELP(" Lua support compiled in."); #else - std::printf(" Lua support disabled at compilation.\n"); + XBT_HELP(" Lua support disabled at compilation."); #endif #if SIMGRID_HAVE_MALLOCATOR - std::printf(" Mallocator support compiled in.\n"); + XBT_HELP(" Mallocator support compiled in."); #else - std::printf(" Mallocator support disabled at compilation.\n"); + XBT_HELP(" Mallocator support disabled at compilation."); #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"); + 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) @@ -305,7 +307,7 @@ void surf_exit() { simgrid::s4u::Engine::shutdown(); for (auto const& e : storage_types) { - simgrid::surf::StorageType* stype = e.second; + simgrid::kernel::resource::StorageType* stype = e.second; delete stype->properties; delete stype->model_properties; delete stype; @@ -314,8 +316,6 @@ void surf_exit() for (auto const& model : all_existing_models) delete model; - xbt_free(surf_plugin_description); - tmgr_finalize(); sg_platf_exit();