-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2021. 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 "src/internal_config.h"
#include "src/surf/surf_private.hpp"
+#include "xbt/function_types.h"
#include <cmath>
#include <set>
extern XBT_PRIVATE double sg_weight_S_parameter;
extern XBT_PRIVATE std::vector<std::string> surf_path;
extern XBT_PRIVATE std::unordered_map<std::string, simgrid::kernel::profile::Profile*> traces_set_list;
-extern XBT_PRIVATE std::set<std::string> watched_hosts;
+
+/** set of hosts for which one want to be notified if they ever restart */
+inline auto& watched_hosts() // avoid static initialization order fiasco
+{
+ static std::set<std::string, std::less<>> value;
+ return value;
+}
static inline void double_update(double* variable, double value, double precision)
{
/** @ingroup SURF_models
* @brief Same as network model 'LagrangeVelho', only with different correction factors.
*
- * This model impelments a variant of the contention model on Infinband networks based on
+ * This model implements a variant of the contention model on Infiniband networks based on
* the works of Jérôme Vienne : http://mescal.imag.fr/membres/jean-marc.vincent/index.html/PhD/Vienne.pdf
*
* @see surf_host_model_init_IB()
/** @ingroup SURF_models
* @brief Initializes the platform with the network model CM02
*
- * You sould call this function by yourself only if you plan using surf_host_model_init_compound.
+ * You should call this function by yourself only if you plan using surf_host_model_init_compound.
* See comments in the code for more information.
*/
XBT_PUBLIC void surf_network_model_init_CM02();
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 seperates 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
*/
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();
/* --------------------
#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); \
+ simgrid_add_plugin_description(_XBT_STRINGIFY(id), (desc), (init)); \
}
XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun);
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_network_model_description;
/** @brief The list of all disk models (pick one with --cfg=disk/model) */
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_disk_model_description;
-/** @brief The list of all storage models (pick one with --cfg=storage/model) */
-XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_storage_model_description;
/** @brief The list of all host models (pick one with --cfg=host/model:) */
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_host_model_description;
-/**********
- * Action *
- **********/
-
#endif /* SURF_MODEL_H_ */