X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c19a107a096f503e67217fb178fa98eb742ceb4d..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 2ff3eb33c1..9349d6664a 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,19 +1,17 @@ -/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2023. 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. */ -#include "surf_interface.hpp" +#include +#include + #include "mc/mc.h" -#include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" #include "src/kernel/resource/profile/FutureEvtSet.hpp" #include "src/kernel/resource/profile/Profile.hpp" #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 "src/surf/surf_interface.hpp" #include #include @@ -29,27 +27,9 @@ 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; -std::vector* surf_plugin_description = nullptr; - -static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description() -{ - delete surf_plugin_description; - surf_plugin_description = nullptr; -} - -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 */ const std::vector surf_network_model_description = { {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; " @@ -73,16 +53,15 @@ const std::vector surf_network_model_description = { &surf_network_model_init_NS3}, }; -#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() { +#if !HAVE_SMPI +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 @@ -91,34 +70,28 @@ const std::vector surf_cpu_model_description = { {"Cas01", "Simplistic CPU model (time=size/speed).", &surf_cpu_model_init_Cas01}, }; +const std::vector surf_disk_model_description = { + {"S19", "Simplistic disk model.", &surf_disk_model_init_S19}, +}; + const std::vector surf_host_model_description = { - {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", + {"default", "Default host model. Currently, CPU:Cas01, network:LV08 (with cross traffic enabled), and disk:S19", &surf_host_model_init_current_default}, - {"compound", "Host model that is automatically chosen if you change the network and CPU models", + {"compound", "Host model that is automatically chosen if you change the CPU, network, and disk models", &surf_host_model_init_compound}, - {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", + {"ptask_L07", "Host model somehow similar to Cas01+CM02+S19 but allowing parallel tasks", &surf_host_model_init_ptask_L07}, }; 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}, }; -const std::vector surf_disk_model_description = { - {"default", "Simplistic disk model.", &surf_disk_model_init_default}, -}; - -double NOW = 0; - -double surf_get_clock() -{ - return NOW; -} - /* returns whether #file_path is an absolute file path. Surprising, isn't it ? */ static bool is_absolute_file_path(const std::string& file_path) { @@ -161,7 +134,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); @@ -185,15 +158,13 @@ void model_help(const char* category, const std::vector& table, const std::string& name) +const surf_model_description_t* find_model_description(const std::vector& table, + const std::string& name) { - 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 static_cast(std::distance(table.begin(), pos)); - - if (table.empty()) - xbt_die("No model is valid! This is a bug."); + if (auto pos = std::find_if(table.begin(), table.end(), + [&name](const surf_model_description_t& item) { return item.name == name; }); + pos != table.end()) + return &*pos; std::string sep; std::string name_list; @@ -201,31 +172,5 @@ int find_model_description(const std::vector& table, c 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; -} - - -void surf_init(int *argc, char **argv) -{ - if (xbt_initialized > 0) - return; - - xbt_init(argc, argv); - - sg_config_init(argc, argv); -} - -void surf_exit() -{ - simgrid::s4u::Engine::shutdown(); - - 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 */ }