Some cleanup around model description tables.

* save a new/delete for plugin descriptions;
* use sdt::function for model_init_preparse;
* return a pointer from find_model_description().

diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp
index b9efafc..76bf13a 100644 (file)
--- a/src/kernel/routing/NetZoneImpl.cpp
+++ b/src/kernel/routing/NetZoneImpl.cpp
@@ -41,16 +41,16 @@ static void surf_config_models_setup()
     xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model");
     xbt_assert(not network_model_name.empty(), "Set a network model to use with the 'compound' host model");
 
-    int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name);
-    surf_cpu_model_description[cpu_id].model_init_preparse();
+    const auto* cpu_model = find_model_description(surf_cpu_model_description, cpu_model_name);
+    cpu_model->model_init_preparse();
 
-    int network_id = find_model_description(surf_network_model_description, network_model_name);
-    surf_network_model_description[network_id].model_init_preparse();
+    const auto* network_model = find_model_description(surf_network_model_description, network_model_name);
+    network_model->model_init_preparse();
   }
 
   XBT_DEBUG("Call host_model_init");
-  int host_id = find_model_description(surf_host_model_description, host_model_name);
-  surf_host_model_description[host_id].model_init_preparse();
+  const auto* host_model = find_model_description(surf_host_model_description, host_model_name);
+  host_model->model_init_preparse();
 
   XBT_DEBUG("Call vm_model_init");
   /* ideally we should get back the pointer to CpuModel from model_init_preparse(), but this
@@ -60,8 +60,8 @@ static void surf_config_models_setup()
       simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get());
 
   XBT_DEBUG("Call disk_model_init");
-  int disk_id = find_model_description(surf_disk_model_description, disk_model_name);
-  surf_disk_model_description[disk_id].model_init_preparse();
+  const auto* disk_model = find_model_description(surf_disk_model_description, disk_model_name);
+  disk_model->model_init_preparse();
 }
 
 NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name)

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 5f4e66d..d7e6bdb 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -122,12 +122,12 @@ static void _sg_cfg_cb__plugin(const std::string& value)
     return;
 
   if (value == "help") {
-    model_help("plugin", *surf_plugin_description);
+    model_help("plugin", surf_plugin_description());
     exit(0);
   }
 
-  int plugin_id = find_model_description(*surf_plugin_description, value);
-  (*surf_plugin_description)[plugin_id].model_init_preparse();
+  const auto* plugin = find_model_description(surf_plugin_description(), value);
+  plugin->model_init_preparse();
 }
 
 /* callback of the host/model variable */
@@ -238,7 +238,7 @@ void sg_config_init(int *argc, char **argv)
   }
 
   /* Plugins configuration */
-  declare_model_flag("plugin", "", &_sg_cfg_cb__plugin, *surf_plugin_description, "plugin", "The plugins");
+  declare_model_flag("plugin", "", &_sg_cfg_cb__plugin, surf_plugin_description(), "plugin", "The plugins");
 
   declare_model_flag("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, surf_cpu_model_description, "model",
                      "The model to use for the CPU");

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 3e020d7..27ff69a 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -32,21 +32,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke
 simgrid::kernel::profile::FutureEvtSet future_evt_set;
 std::vector<std::string> surf_path;
 
-std::vector<surf_model_description_t>* 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_model_description_t>();
-  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_model_description_t> surf_network_model_description = {
     {"LV08",
@@ -187,14 +172,13 @@ void model_help(const char* category, const std::vector<surf_model_description_t
     XBT_HELP("  %s: %s", item.name, item.description);
 }
 
-int find_model_description(const std::vector<surf_model_description_t>& table, const std::string& name)
+const surf_model_description_t* find_model_description(const std::vector<surf_model_description_t>& 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<int>(std::distance(table.begin(), pos));
-
-  xbt_assert(not table.empty(), "No model is valid! This is a bug.");
+    return &*pos;
 
   std::string sep;
   std::string name_list;
@@ -202,9 +186,7 @@ int find_model_description(const std::vector<surf_model_description_t>& 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)

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index a9ee7a8..af27388 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -11,6 +11,7 @@
 #include "xbt/function_types.h"
 
 #include <cmath>
+#include <functional>
 #include <set>
 #include <string>
 #include <unordered_map>
@@ -184,22 +185,25 @@ 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;