X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 85b2bd3cdd..8beb759567 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. */ @@ -8,6 +8,7 @@ #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" @@ -27,24 +28,29 @@ 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; -#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 = 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; -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_load", "Cpu load.", &sg_host_load_plugin_init}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ -}; + /* no need to check for plugin name conflict: the compiler already ensures that the generated + * simgrid_##id##_plugin_register() is unique */ + + plugin_amount++; + surf_plugin_description = static_cast( + xbt_realloc(surf_plugin_description, sizeof(s_surf_model_description_t) * (plugin_amount + 2))); + + surf_plugin_description[plugin_amount - 1] = {name, description, init_fun}; + surf_plugin_description[plugin_amount] = {nullptr, nullptr, nullptr}; // this array must be null 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[] = { @@ -120,11 +126,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); } @@ -142,14 +166,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) { @@ -162,26 +184,6 @@ 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) { @@ -190,7 +192,7 @@ void model_help(const char *category, s_surf_model_description_t * table) printf(" %s: %s\n", table[i].name, table[i].description); } -int find_model_description(s_surf_model_description_t* table, std::string name) +int find_model_description(s_surf_model_description_t* table, const std::string& name) { for (int i = 0; table[i].name; i++) if (name == table[i].name) @@ -217,7 +219,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, " @@ -292,10 +294,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); @@ -306,20 +304,17 @@ void surf_init(int *argc, char **argv) void surf_exit() { 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; - delete future_evt_set; - future_evt_set = nullptr; + xbt_free(surf_plugin_description); tmgr_finalize(); sg_platf_exit();