Use std::vector for lists of model descriptions.

[simgrid.git] / src / surf / surf_interface.hpp

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 38fad62..82ca23e 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -206,15 +206,14 @@ XBT_PUBLIC void surf_storage_model_init_default();
  *  Model Descriptions
  * -------------------- */
 /** @brief Resource model description */
  *  Model Descriptions
  * -------------------- */
 /** @brief Resource model description */

-struct surf_model_description {
+struct surf_model_description_t {

   const char* name;
   const char* description;
   void_f_void_t model_init_preparse;
 };
   const char* name;
   const char* description;
   void_f_void_t model_init_preparse;
 };

-typedef struct surf_model_description s_surf_model_description_t;

 
 

-XBT_PUBLIC int find_model_description(s_surf_model_description_t* table, const std::string& name);
-XBT_PUBLIC void model_help(const char* category, s_surf_model_description_t* table);
+XBT_PUBLIC int 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) simgrid_##id##_plugin_register()                                             \
 
 #define SIMGRID_REGISTER_PLUGIN(id, desc, init)                                                                        \
   static void XBT_ATTRIB_CONSTRUCTOR(800) simgrid_##id##_plugin_register()                                             \


@@ -225,18 +224,18 @@ XBT_PUBLIC void model_help(const char* category, s_surf_model_description_t* tab
 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 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 s_surf_model_description_t* surf_plugin_description;
+XBT_PUBLIC_DATA std::vector<surf_model_description_t>* surf_plugin_description;

 /** @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:... */
 /** @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 s_surf_model_description_t surf_optimization_mode_description[];
+XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_optimization_mode_description;

 /** @brief The list of all cpu models (pick one with --cfg=cpu/model) */
 /** @brief The list of all cpu models (pick one with --cfg=cpu/model) */

-XBT_PUBLIC_DATA s_surf_model_description_t surf_cpu_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) */
 /** @brief The list of all network models (pick one with --cfg=network/model) */

-XBT_PUBLIC_DATA s_surf_model_description_t surf_network_model_description[];
+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) */
 /** @brief The list of all storage models (pick one with --cfg=storage/model) */

-XBT_PUBLIC_DATA s_surf_model_description_t surf_storage_model_description[];
+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:) */
 /** @brief The list of all host models (pick one with --cfg=host/model:) */

-XBT_PUBLIC_DATA s_surf_model_description_t surf_host_model_description[];
+XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_host_model_description;

 
 /**********
  * Action *
 
 /**********
  * Action *