the model descriptions also don't need to be public

diff --git a/src/include/surf/surf.hpp b/src/include/surf/surf.hpp
index 0330f60..a936a3b 100644 (file)
--- a/src/include/surf/surf.hpp
+++ b/src/include/surf/surf.hpp
@@ -9,18 +9,6 @@
 #include "simgrid/forward.h"
 #include "xbt/graph.h"
 
 #include "simgrid/forward.h"
 #include "xbt/graph.h"
 

-/** \brief Resource model description
- */
-struct surf_model_description {
-  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, std::string name);
-XBT_PUBLIC void model_help(const char* category, s_surf_model_description_t* table);
-

 /***************************/
 /* Generic model object */
 /***************************/
 /***************************/
 /* Generic model object */
 /***************************/


@@ -78,33 +66,6 @@ XBT_PUBLIC_DATA simgrid::surf::CpuModel* surf_cpu_model_pm;
  */
 XBT_PUBLIC_DATA simgrid::surf::CpuModel* surf_cpu_model_vm;
 
  */
 XBT_PUBLIC_DATA simgrid::surf::CpuModel* surf_cpu_model_vm;
 

-/** \ingroup SURF_models
- *  \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[];
-
-/** \ingroup SURF_plugins
- *  \brief The list of all available surf plugins
- */
-XBT_PUBLIC_DATA s_surf_model_description_t surf_plugin_description[];
-
-/** \ingroup SURF_models
- *  \brief The list of all available cpu model models
- */
-XBT_PUBLIC_DATA s_surf_model_description_t surf_cpu_model_description[];
-
-/** \ingroup SURF_models
- *  \brief The list of all available network model models
- */
-XBT_PUBLIC_DATA s_surf_model_description_t surf_network_model_description[];
-
-/** \ingroup SURF_models
- *  \brief The list of all available storage modes.
- *  This storage mode can be set using --cfg=storage/model:...
- */
-XBT_PUBLIC_DATA s_surf_model_description_t surf_storage_model_description[];
-

 XBT_PUBLIC_DATA simgrid::surf::StorageModel* surf_storage_model;
 
 /** \ingroup SURF_models
 XBT_PUBLIC_DATA simgrid::surf::StorageModel* surf_storage_model;
 
 /** \ingroup SURF_models


@@ -115,10 +76,6 @@ XBT_PUBLIC_DATA simgrid::surf::StorageModel* surf_storage_model;
  */
 XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
 
  */
 XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
 

-/** \ingroup SURF_models
- *  \brief The list of all available host model models
- */
-XBT_PUBLIC_DATA s_surf_model_description_t surf_host_model_description[];

 
 /*** SURF Globals **************************/
 
 
 /*** SURF Globals **************************/
 

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 80ebe02..75c69dd 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -207,6 +207,34 @@ XBT_PUBLIC void surf_host_model_init_ptask_L07();
  */
 XBT_PUBLIC void surf_storage_model_init_default();
 
  */
 XBT_PUBLIC void surf_storage_model_init_default();
 

+/* --------------------
+ *  Model Descriptions
+ * -------------------- */
+/** \brief Resource model description */
+struct surf_model_description {
+  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, std::string name);
+XBT_PUBLIC void model_help(const char* category, s_surf_model_description_t* table);
+
+/** @brief The list of all available plugins */
+XBT_PUBLIC_DATA s_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:... */
+XBT_PUBLIC_DATA s_surf_model_description_t surf_optimization_mode_description[];
+/** @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[];
+/** @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[];
+/** @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[];
+/** @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[];
+

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