A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove deprecated features for next release.
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
3497b4e
..
a9ee7a8
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-20
21
. 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. */
/* 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 "src/internal_config.h"
#include "src/surf/surf_private.hpp"
#include "src/internal_config.h"
#include "src/surf/surf_private.hpp"
+#include "xbt/function_types.h"
#include <cmath>
#include <set>
#include <cmath>
#include <set>
@@
-29,7
+30,13
@@
extern XBT_PRIVATE double sg_bandwidth_factor;
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 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)
{
static inline void double_update(double* variable, double value, double precision)
{
@@
-81,7
+88,7
@@
XBT_PUBLIC void surf_network_model_init_SMPI();
/** @ingroup SURF_models
* @brief Same as network model 'LagrangeVelho', only with different correction factors.
*
/** @ingroup SURF_models
* @brief Same as network model 'LagrangeVelho', only with different correction factors.
*
- * This model imp
elments a variant of the contention model on Infin
band networks based on
+ * This model imp
lements a variant of the contention model on Infini
band 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()
* 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()
@@
-115,7
+122,7
@@
XBT_PUBLIC void surf_network_model_init_Constant();
/** @ingroup SURF_models
* @brief Initializes the platform with the network model CM02
*
/** @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 s
h
ould 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();
* See comments in the code for more information.
*/
XBT_PUBLIC void surf_network_model_init_CM02();
@@
-134,14
+141,14
@@
XBT_ATTRIB_NORETURN
XBT_PUBLIC void surf_network_model_init_NS3();
/** @ingroup SURF_models
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!
*/
* 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
/** @ingroup SURF_models
* @brief Initializes the platform with a compound host model
@@
-168,11
+175,6
@@
XBT_PUBLIC void surf_host_model_init_current_default();
*/
XBT_PUBLIC void surf_host_model_init_ptask_L07();
*/
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();
/* --------------------
XBT_PUBLIC void surf_disk_model_init_default();
/* --------------------
@@
-191,7
+193,7
@@
XBT_PUBLIC void model_help(const char* category, const std::vector<surf_model_de
#define SIMGRID_REGISTER_PLUGIN(id, desc, init) \
static void XBT_ATTRIB_CONSTRUCTOR(800) _XBT_CONCAT3(simgrid_, id, _plugin_register)() \
{ \
#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 void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun);
@@
-205,13
+207,9
@@
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_optimization_mo
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_cpu_model_description;
/** @brief The list of all network models (pick one with --cfg=network/model) */
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_network_model_description;
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_cpu_model_description;
/** @brief The list of all network models (pick one with --cfg=network/model) */
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_network_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
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 host models (pick one with --cfg=host/model:) */
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_host_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_ */
#endif /* SURF_MODEL_H_ */