X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b24aba0295501c73c2e057fda75108808cdad4..8344f32ee2339f2b53a6e79ac0e9aa3a93384f58:/src/simgrid/module.hpp

diff --git a/src/simgrid/module.hpp b/src/simgrid/module.hpp
index 89b0f153b4..771fe09c92 100644
--- a/src/simgrid/module.hpp
+++ b/src/simgrid/module.hpp
@@ -19,7 +19,7 @@ struct Module {
   const char* description_;
   std::function<void()> init;
   Module(const char* id, const char* desc, std::function<void()> init_fun)
-      : name_(id), description_(desc), init(init_fun)
+      : name_(id), description_(desc), init(std::move(init_fun))
   {
   }
 };
@@ -27,16 +27,19 @@ struct Module {
 class ModuleGroup {
   std::vector<Module> table_;
   const std::string kind_; // either 'plugin' or 'CPU model' or whatever. Used in error messages only
+  std::string opt_name_;
+
 public:
-  ModuleGroup(const std::string& kind) : kind_(kind) {}
+  explicit ModuleGroup(const std::string& kind) : kind_(kind) {}
 
   ModuleGroup& add(const char* id, const char* desc, std::function<void()> init);
   Module const& by_name(const std::string& name) const;
   void help() const;
-  const std::string get_kind() const { return kind_; }
+  const std::string& get_kind() const { return kind_; }
   std::string existing_values() const;
   void create_flag(const std::string& opt_name, const std::string& descr, const std::string& default_value,
                    bool init_now);
+  void init_from_flag_value() const;
 };
 
 }; // namespace simgrid
@@ -46,7 +49,6 @@ public:
   {                                                                                                                    \
     simgrid_plugins().add(_XBT_STRINGIFY(id), (desc), (init));                                                         \
   }
-
 /** @brief The list of all available plugins */
 inline auto& simgrid_plugins() // Function to avoid static initialization order fiasco
 {
@@ -59,7 +61,7 @@ inline auto& simgrid_plugins() // Function to avoid static initialization order
   {                                                                                                                    \
     simgrid_network_models().add(_XBT_STRINGIFY(id), (desc), (init));                                                  \
   }
-/** @brief The list of all available network model (pick one with --cfg=network/model) */
+/** @brief The list of all available network models (pick one with --cfg=network/model) */
 inline auto& simgrid_network_models() // Function to avoid static initialization order fiasco
 {
   static simgrid::ModuleGroup models("network model");
@@ -71,10 +73,37 @@ inline auto& simgrid_network_models() // Function to avoid static initialization
   {                                                                                                                    \
     simgrid_cpu_models().add(_XBT_STRINGIFY(id), (desc), (init));                                                      \
   }
-/** @brief The list of all available CPU model (pick one with --cfg=cpu/model) */
+/** @brief The list of all available CPU models (pick one with --cfg=cpu/model) */
 inline auto& simgrid_cpu_models() // Function to avoid static initialization order fiasco
 {
   static simgrid::ModuleGroup models("CPU model");
   return models;
 }
-#endif
\ No newline at end of file
+
+#define SIMGRID_REGISTER_DISK_MODEL(id, desc, init)                                                                    \
+  static void XBT_ATTRIB_CONSTRUCTOR(800) _XBT_CONCAT3(simgrid_, id, _disk_model_register)()                           \
+  {                                                                                                                    \
+    simgrid_disk_models().add(_XBT_STRINGIFY(id), (desc), (init));                                                     \
+  }
+/** @brief The list of all available disk models (pick one with --cfg=disk/model) */
+inline auto& simgrid_disk_models() // Function to avoid static initialization order fiasco
+{
+  static simgrid::ModuleGroup models("disk model");
+  return models;
+}
+
+#define SIMGRID_REGISTER_HOST_MODEL(id, desc, init)                                                                    \
+  static void XBT_ATTRIB_CONSTRUCTOR(800) _XBT_CONCAT3(simgrid_, id, _host_model_register)()                           \
+  {                                                                                                                    \
+    simgrid_host_models().add(_XBT_STRINGIFY(id), (desc), (init));                                                     \
+  }
+/** @brief The list of all available host models (pick one with --cfg=host/model) */
+inline auto& simgrid_host_models() // Function to avoid static initialization order fiasco
+{
+  static simgrid::ModuleGroup models("host model");
+  return models;
+}
+
+XBT_PUBLIC void simgrid_vm_model_init_HL13();
+
+#endif