X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1fcc0c0597c993b03448f6244bbdfef3c6850e4..d50a590cfb08f9f45bab9fd355eed8dbdcf765ea:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index ed1bd2a8a7..21b718bcd8 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,11 +7,12 @@ #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" -#include "src/instr/instr_private.hpp" // TRACE_end(). FIXME: remove by subscribing tracing to the surf signals #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" +#include "xbt/module.h" #include #include @@ -27,33 +28,31 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke * Utils * *********/ -std::vector* all_existing_models = nullptr; /* to destroy models correctly */ +std::vector all_existing_models; /* 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; +extern std::map storage_types; -namespace simgrid { -namespace surf { +std::vector* surf_plugin_description = nullptr; -simgrid::xbt::signal surfExitCallbacks; -} +static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description() +{ + delete surf_plugin_description; + surf_plugin_description = nullptr; } -#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[] = { - {"Energy", "Cpu energy consumption.", &sg_host_energy_plugin_init}, - {"Load", "Cpu load.", &sg_host_load_plugin_init}, - {nullptr, nullptr, nullptr} /* this array must be nullptr 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 +77,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 +93,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; @@ -126,11 +125,29 @@ double surf_get_clock() return NOW; } -std::ifstream* surf_ifsopen(std::string name) +/* returns whether #file_path is a absolute file path. Surprising, isn't it ? */ +static bool is_absolute_file_path(const std::string& file_path) +{ +#ifdef _WIN32 + WIN32_FIND_DATA wfd = {0}; + HANDLE hFile = FindFirstFile(file_path.c_str(), &wfd); + + if (INVALID_HANDLE_VALUE == hFile) + return false; + + FindClose(hFile); + return true; +#else + return (file_path.c_str()[0] == '/'); +#endif +} + +std::ifstream* surf_ifsopen(const std::string& name) { - std::ifstream* fs = new std::ifstream(); xbt_assert(not name.empty()); - if (__surf_is_absolute_file_path(name.c_str())) { /* don't mess with absolute file names */ + + std::ifstream* 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); } @@ -148,14 +165,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); - - if (__surf_is_absolute_file_path(name)) /* don't mess with absolute file names */ - return fopen(name, mode); + if (is_absolute_file_path(name)) /* don't mess with absolute file names */ + return fopen(name.c_str(), mode); /* search relative files in the path */ for (auto const& path_elm : surf_path) { @@ -168,46 +183,30 @@ FILE *surf_fopen(const char *name, const char *mode) return nullptr; } -/* The __surf_is_absolute_file_path() returns 1 if - * file_path is a absolute file path, in the other - * case the function returns 0. - */ -int __surf_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 0; - - FindClose(hFile); - return 1; -#else - return (file_path[0] == '/'); -#endif -} - /** 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); + for (auto const& item : table) + printf(" %s: %s\n", 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; @@ -223,7 +222,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, " @@ -298,10 +297,6 @@ void surf_init(int *argc, char **argv) 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); @@ -311,26 +306,16 @@ void surf_init(int *argc, char **argv) void surf_exit() { - TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */ - simgrid::s4u::Engine::shutdown(); - sg_link_exit(); 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; } - for (auto const& model : *all_existing_models) + for (auto const& model : all_existing_models) delete model; - delete all_existing_models; - - - if (future_evt_set) { - delete future_evt_set; - future_evt_set = nullptr; - } tmgr_finalize(); sg_platf_exit();