X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0152467306643146e97a6dc26d1e3b264f915d6f..149757f655ffaf7bc403d634de3ef04b72b7a067:/src/surf/xml/platf_private.hpp

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 39b93d2490..793941dbc9 100644
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -10,8 +10,10 @@
 #define SG_PLATF_H
 
 #include "simgrid/host.h"
+#include "simgrid/s4u/Link.hpp"
 #include "src/surf/xml/platf.hpp"
 #include "src/surf/xml/simgrid_dtd.h"
+
 #include <map>
 #include <string>
 #include <vector>
@@ -56,7 +58,7 @@ public:
   double latency                      = 0;
   tmgr_trace_t latency_trace          = nullptr;
   tmgr_trace_t state_trace            = nullptr;
-  e_surf_link_sharing_policy_t policy = SURF_LINK_FATPIPE;
+  simgrid::s4u::Link::SharingPolicy policy       = simgrid::s4u::Link::SharingPolicy::FATPIPE;
   std::map<std::string, std::string>* properties = nullptr;
 };
 
@@ -73,12 +75,12 @@ public:
 
 class RouteCreationArgs {
 public:
-  bool symmetrical     = false;
-  sg_netpoint_t src    = nullptr;
-  sg_netpoint_t dst    = nullptr;
-  sg_netpoint_t gw_src = nullptr;
-  sg_netpoint_t gw_dst = nullptr;
-  std::vector<simgrid::surf::LinkImpl*> link_list;
+  bool symmetrical = false;
+  NetPoint* src    = nullptr;
+  NetPoint* dst    = nullptr;
+  NetPoint* gw_src = nullptr;
+  NetPoint* gw_dst = nullptr;
+  std::vector<simgrid::kernel::resource::LinkImpl*> link_list;
 };
 
 enum class ClusterTopology { DRAGONFLY = 3, FAT_TREE = 2, FLAT = 1, TORUS = 0 };
@@ -102,8 +104,8 @@ public:
   std::string topo_parameters;
   std::map<std::string, std::string>* properties;
   std::string router_id;
-  e_surf_link_sharing_policy_t sharing_policy;
-  e_surf_link_sharing_policy_t bb_sharing_policy;
+  simgrid::s4u::Link::SharingPolicy sharing_policy;
+  simgrid::s4u::Link::SharingPolicy bb_sharing_policy;
 };
 
 class CabinetCreationArgs {
@@ -179,15 +181,10 @@ public:
 };
 }}}
 
-extern "C" {
-
 /********** Routing **********/
-void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb);
+void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb);
 /*** END of the parsing cruft ***/
 
-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::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone); // Begin description of new Zone
 XBT_PUBLIC void sg_platf_new_Zone_seal();                                          // That Zone is fully described
 
@@ -225,7 +222,6 @@ XBT_PUBLIC void surf_parse_set_out(FILE* out_str);
 XBT_PUBLIC int surf_parse_get_debug();
 XBT_PUBLIC void surf_parse_set_debug(int bdebug);
 XBT_PUBLIC int surf_parse_lex_destroy();
-}
 
 namespace simgrid {
 namespace surf {