remove surf_routing.hpp

[simgrid.git] / src / surf / xml / platf_private.hpp

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 976fa05..add8c25 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -11,6 +11,7 @@
 
 #include "simgrid/host.h"
 #include "src/surf/xml/platf.hpp"
+#include <vector>
 
 SG_BEGIN_DECL()
 #include "src/surf/xml/simgrid_dtd.h"
@@ -20,8 +21,6 @@ SG_BEGIN_DECL()
 typedef size_t yy_size_t;
 #endif
 
-XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char *name);
-
 typedef enum {
   SURF_CLUSTER_DRAGONFLY=3,
   SURF_CLUSTER_FAT_TREE=2,
@@ -81,7 +80,7 @@ typedef struct s_sg_platf_peer_cbarg {
   double bw_out;
   double lat;
   const char* coord;
-  tmgr_trace_t availability_trace;
+  tmgr_trace_t speed_trace;
   tmgr_trace_t state_trace;
 } s_sg_platf_peer_cbarg_t;
 
@@ -100,7 +99,7 @@ typedef struct s_sg_platf_cluster_cbarg {
   const char* id;
   const char* prefix;
   const char* suffix;
-  const char* radical;
+  std::vector<int>* radicals;
   double speed;
   int core_amount;
   double bw;
@@ -123,7 +122,7 @@ typedef struct s_sg_platf_cabinet_cbarg {
   const char* id;
   const char* prefix;
   const char* suffix;
-  const char* radical;
+  std::vector<int>* radicals;
   double speed;
   double bw;
   double lat;
@@ -201,7 +200,7 @@ void routing_cluster_add_backbone(Link* bb);
 XBT_PUBLIC(void) sg_platf_begin();  // Start a new platform
 XBT_PUBLIC(void) sg_platf_end(); // Finish the creation of the platform
 
-XBT_PUBLIC(simgrid::s4u::As*) sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS); // Begin description of new AS
+XBT_PUBLIC(simgrid::s4u::NetZone*) sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS); // Begin description of new AS
 XBT_PUBLIC(void) sg_platf_new_AS_seal();                     // That AS is fully described
 
 XBT_PUBLIC(void) sg_platf_new_host   (sg_platf_host_cbarg_t   host);   // Add an host   to the currently described AS
@@ -247,15 +246,9 @@ XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route);
 /********** Instr. **********/
 XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS);
 XBT_PRIVATE void sg_instr_new_router(sg_platf_router_cbarg_t router);
-XBT_PRIVATE void sg_instr_new_host(sg_platf_host_cbarg_t host);
+XBT_PRIVATE void sg_instr_new_host(simgrid::s4u::Host& host);
 XBT_PRIVATE void sg_instr_AS_end();
 
-typedef struct s_surf_parsing_link_up_down *surf_parsing_link_up_down_t;
-typedef struct s_surf_parsing_link_up_down {
-  Link* linkUp;
-  Link* linkDown;
-} s_surf_parsing_link_up_down_t;
-
 SG_END_DECL()
 
 namespace simgrid {