C++ify some forgotten part of surf

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

diff --git a/src/include/surf/surf.hpp b/src/include/surf/surf.hpp
index 0330f60..7fb194e 100644 (file)
--- a/src/include/surf/surf.hpp
+++ b/src/include/surf/surf.hpp
@@ -9,42 +9,12 @@
 #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 */
 /***************************/
 
 /** @{ @ingroup SURF_c_bindings */
 
-/**
- * @brief Pop an action from the done actions set
- *
- * @param model The model from which the action is extracted
- * @return An action in done state
- */
-XBT_PUBLIC simgrid::kernel::resource::Action*
-surf_model_extract_done_action_set(simgrid::kernel::resource::Model* model);
-
-/**
- * @brief Pop an action from the failed actions set
- *
- * @param model The model from which the action is extracted
- * @return An action in failed state
- */
-XBT_PUBLIC simgrid::kernel::resource::Action*
-surf_model_extract_failed_action_set(simgrid::kernel::resource::Model* model);
-
 /**
  * @brief Get the size of the running action set of a model
  *
@@ -78,33 +48,6 @@ XBT_PUBLIC_DATA simgrid::surf::CpuModel* surf_cpu_model_pm;
  */
 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
@@ -115,10 +58,6 @@ XBT_PUBLIC_DATA simgrid::surf::StorageModel* surf_storage_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 **************************/
 
@@ -172,10 +111,4 @@ XBT_PUBLIC void surf_exit();
 /* surf parse file related (public because called from a test suite) */
 XBT_PUBLIC void parse_platform_file(const char* file);
 
-/********** Tracing **********/
-
-/* instr_routing.c */
-xbt_graph_t instr_routing_platform_graph();
-void instr_routing_platform_graph_export_graphviz(xbt_graph_t g, const char* filename);
-
 #endif