X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27ea8d78c124dd6b7cdb649b8d2bb95dc16f4cde..3be0396ca83e510e42adc8e3eb12f4befb2f1fff:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 82137d8682..87bee13be9 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2022. 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. */ @@ -6,11 +6,14 @@ #ifndef SURF_MODEL_H_ #define SURF_MODEL_H_ +#include +#include + #include "src/internal_config.h" -#include "src/surf/surf_private.hpp" -#include "xbt/function_types.h" +#include #include +#include #include #include #include @@ -19,15 +22,14 @@ /********* * Utils * *********/ +XBT_PRIVATE FILE* surf_fopen(const std::string& name, const char* mode); +XBT_PRIVATE std::ifstream* surf_ifsopen(const std::string& name); /* user-visible parameters */ XBT_PUBLIC_DATA double sg_maxmin_precision; XBT_PUBLIC_DATA double sg_surf_precision; XBT_PUBLIC_DATA int sg_concurrency_limit; -extern XBT_PRIVATE double sg_latency_factor; -extern XBT_PRIVATE double sg_bandwidth_factor; -extern XBT_PRIVATE double sg_weight_S_parameter; extern XBT_PRIVATE std::vector surf_path; extern XBT_PRIVATE std::unordered_map traces_set_list; @@ -40,11 +42,13 @@ inline auto& watched_hosts() // avoid static initialization order fiasco static inline void double_update(double* variable, double value, double precision) { - // printf("Updating %g -= %g +- %g\n",*variable,value,precision); - // xbt_assert(value==0 || value>precision); - // Check that precision is higher than the machine-dependent size of the mantissa. If not, brutal rounding may - // happen, and the precision mechanism is not active... - // xbt_assert(*variable< (2< precision); + // Check that precision is higher than the machine-dependent size of the mantissa. If not, brutal rounding may + // happen, and the precision mechanism is not active... + xbt_assert(FLT_RADIX == 2 && *variable < precision * exp2(DBL_MANT_DIG)); + } *variable -= value; if (*variable < precision) *variable = 0.0; @@ -71,6 +75,9 @@ static inline int double_equals(double value1, double value2, double precision) */ XBT_PUBLIC void surf_cpu_model_init_Cas01(); +XBT_ATTRIB_DEPRECATED_v337 ("Please use surf_disk_model_init_S19()") XBT_PUBLIC void surf_disk_model_init_default(); +XBT_PUBLIC void surf_disk_model_init_S19(); + /** @ingroup SURF_models * @brief Same as network model 'LagrangeVelho', only with different correction factors. * @@ -80,9 +87,6 @@ XBT_PUBLIC void surf_cpu_model_init_Cas01(); * * @see surf_host_model_init_SMPI() */ -#if !HAVE_SMPI -XBT_ATTRIB_NORETURN -#endif XBT_PUBLIC void surf_network_model_init_SMPI(); /** @ingroup SURF_models @@ -141,14 +145,14 @@ XBT_ATTRIB_NORETURN XBT_PUBLIC void surf_network_model_init_NS3(); /** @ingroup SURF_models - * @brief Initializes the platform with the current best network and cpu models at hand + * @brief Initializes the VM model used in the platform + * + * A VM model depends on the physical CPU model to share the resources inside the VM + * It will also creates the CPU model for actions running inside the VM * - * This platform model separates the host model and the network model. - * The host model will be initialized with the model compound, the network model with the model LV08 (with cross - * traffic support) and the CPU model with the model Cas01. * Such model is subject to modification with warning in the ChangeLog so monitor it! */ -XBT_PUBLIC void surf_vm_model_init_HL13(); +XBT_PUBLIC void surf_vm_model_init_HL13(simgrid::kernel::resource::CpuModel* cpu_pm_model); /** @ingroup SURF_models * @brief Initializes the platform with a compound host model @@ -175,13 +179,6 @@ XBT_PUBLIC void surf_host_model_init_current_default(); */ XBT_PUBLIC void surf_host_model_init_ptask_L07(); -/** @ingroup SURF_models - * @brief The storage model - */ -XBT_PUBLIC void surf_storage_model_init_default(); - -XBT_PUBLIC void surf_disk_model_init_default(); - /* -------------------- * Model Descriptions * -------------------- */ @@ -189,22 +186,25 @@ XBT_PUBLIC void surf_disk_model_init_default(); struct surf_model_description_t { const char* name; const char* description; - void_f_void_t model_init_preparse; + std::function model_init_preparse; }; -XBT_PUBLIC int find_model_description(const std::vector& table, const std::string& name); +XBT_PUBLIC const surf_model_description_t* find_model_description(const std::vector& table, + const std::string& name); XBT_PUBLIC void model_help(const char* category, const std::vector& table); #define SIMGRID_REGISTER_PLUGIN(id, desc, init) \ static void XBT_ATTRIB_CONSTRUCTOR(800) _XBT_CONCAT3(simgrid_, id, _plugin_register)() \ { \ - simgrid_add_plugin_description(_XBT_STRINGIFY(id), (desc), (init)); \ + surf_plugin_description().emplace_back(surf_model_description_t{_XBT_STRINGIFY(id), (desc), (init)}); \ } -XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun); - /** @brief The list of all available plugins */ -XBT_PUBLIC_DATA std::vector* surf_plugin_description; +inline auto& surf_plugin_description() // Function to avoid static initialization order fiasco +{ + static std::vector plugin_description_table; + return plugin_description_table; +} /** @brief The list of all available optimization modes (both for cpu and networks). * These optimization modes can be set using --cfg=cpu/optim:... and --cfg=network/optim:... */ XBT_PUBLIC_DATA const std::vector surf_optimization_mode_description; @@ -214,8 +214,6 @@ XBT_PUBLIC_DATA const std::vector surf_cpu_model_descr XBT_PUBLIC_DATA const std::vector surf_network_model_description; /** @brief The list of all disk models (pick one with --cfg=disk/model) */ XBT_PUBLIC_DATA const std::vector surf_disk_model_description; -/** @brief The list of all storage models (pick one with --cfg=storage/model) */ -XBT_PUBLIC_DATA const std::vector surf_storage_model_description; /** @brief The list of all host models (pick one with --cfg=host/model:) */ XBT_PUBLIC_DATA const std::vector surf_host_model_description;