#include "xbt/function_types.h"
#include <cmath>
+#include <functional>
#include <set>
#include <string>
#include <unordered_map>
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
*/
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();
/* --------------------
struct surf_model_description_t {
const char* name;
const char* description;
- void_f_void_t model_init_preparse;
+ std::function<void()> model_init_preparse;
};
-XBT_PUBLIC int find_model_description(const std::vector<surf_model_description_t>& table, const std::string& name);
+XBT_PUBLIC const surf_model_description_t* find_model_description(const std::vector<surf_model_description_t>& table,
+ const std::string& name);
XBT_PUBLIC void model_help(const char* category, const std::vector<surf_model_description_t>& 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_model_description_t>* surf_plugin_description;
+inline auto& surf_plugin_description() // Function to avoid static initialization order fiasco
+{
+ static std::vector<surf_model_description_t> 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_model_description_t> surf_optimization_mode_description;
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;