X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..cff982bd049d26d7acbd0e23324e0de051b06d0d:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index d06bfe0171..abcc2fbe7f 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -102,12 +102,12 @@ public: double loopback_bw = 0; double loopback_lat = 0; double limiter_link = 0; - ClusterTopology topology; + ClusterTopology topology = ClusterTopology::FLAT; std::string topo_parameters; - std::unordered_map* properties; + std::unordered_map* properties = nullptr; std::string router_id; - simgrid::s4u::Link::SharingPolicy sharing_policy; - simgrid::s4u::Link::SharingPolicy bb_sharing_policy; + simgrid::s4u::Link::SharingPolicy sharing_policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; + simgrid::s4u::Link::SharingPolicy bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED; }; class CabinetCreationArgs { @@ -123,6 +123,8 @@ public: class StorageCreationArgs { public: + std::string filename; + int lineno; std::string id; std::string type_id; std::string content; @@ -185,7 +187,7 @@ public: class ZoneCreationArgs { public: std::string id; - int routing; + std::string routing; }; extern XBT_PRIVATE xbt::signal on_cluster_creation; @@ -203,7 +205,8 @@ sg_platf_new_Zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone); XBT_PUBLIC void sg_platf_new_Zone_set_properties(const std::unordered_map* props); XBT_PUBLIC void sg_platf_new_Zone_seal(); // That Zone is fully described -XBT_PUBLIC void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* host); // Add a host to the current Zone +XBT_PUBLIC void +sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* host); // Add a host to the current Zone XBT_PUBLIC void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* h); // Add a host_link to the current Zone XBT_PUBLIC void