X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/477fc68ab3dd1b5210d7db49144d90d0d9e57993..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 5b7a510a27..99b2dd15f8 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -1,6 +1,6 @@ /* platf_private.h - Interface to the SimGrid platforms which visibility should be limited to this directory */ -/* Copyright (c) 2004-2020. The SimGrid Team. +/* Copyright (c) 2004-2022. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,16 +11,13 @@ #include "simgrid/host.h" #include "simgrid/s4u/Link.hpp" -#include "src/surf/xml/platf.hpp" #include "src/surf/xml/simgrid_dtd.h" #include #include #include -namespace simgrid { -namespace kernel { -namespace routing { +namespace simgrid::kernel::routing { /* ***************************************** */ /* * Platform creation functions. Instead of passing 123 arguments to the creation functions @@ -41,8 +38,6 @@ public: profile::Profile* speed_trace = nullptr; profile::Profile* state_trace = nullptr; std::string coord = ""; - std::unordered_map* properties = nullptr; - std::vector disks; }; class HostLinkCreationArgs { @@ -57,11 +52,11 @@ public: std::string id; std::vector bandwidths; profile::Profile* bandwidth_trace = nullptr; - double latency = 0; + double latency = 0; profile::Profile* latency_trace = nullptr; profile::Profile* state_trace = nullptr; - simgrid::s4u::Link::SharingPolicy policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; - std::unordered_map* properties = nullptr; + s4u::Link::SharingPolicy policy = s4u::Link::SharingPolicy::FATPIPE; + std::unordered_map properties; }; class PeerCreationArgs { @@ -82,7 +77,7 @@ public: NetPoint* dst = nullptr; NetPoint* gw_src = nullptr; NetPoint* gw_dst = nullptr; - std::vector link_list; + std::vector link_list; }; enum class ClusterTopology { DRAGONFLY = 3, FAT_TREE = 2, FLAT = 1, TORUS = 0 }; @@ -92,7 +87,7 @@ public: std::string id; std::string prefix; std::string suffix; - std::vector* radicals = nullptr; + std::vector radicals; std::vector speeds; int core_amount = 0; double bw = 0; @@ -102,12 +97,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; std::string router_id; - simgrid::s4u::Link::SharingPolicy sharing_policy; - simgrid::s4u::Link::SharingPolicy bb_sharing_policy; + s4u::Link::SharingPolicy sharing_policy = s4u::Link::SharingPolicy::SPLITDUPLEX; + s4u::Link::SharingPolicy bb_sharing_policy = s4u::Link::SharingPolicy::SHARED; }; class CabinetCreationArgs { @@ -115,47 +110,28 @@ public: std::string id; std::string prefix; std::string suffix; - std::vector* radicals; + std::vector radicals; double speed; double bw; double lat; }; -class StorageCreationArgs { +class ClusterZoneCreationArgs { public: - std::string filename; - int lineno; - std::string id; - std::string type_id; - std::string content; - std::unordered_map* properties; - std::string attach; -}; - -class StorageTypeCreationArgs { -public: - std::string id; - std::string model; - std::string content; - std::unordered_map* properties; - std::unordered_map* model_properties; - sg_size_t size; + std::string routing; + std::vector host_links; + std::vector cabinets; + std::unique_ptr backbone; }; class DiskCreationArgs { public: std::string id; - std::unordered_map* properties; + std::unordered_map properties; double read_bw; double write_bw; }; -class MountCreationArgs { -public: - std::string storageId; - std::string name; -}; - class ProfileCreationArgs { public: std::string id; @@ -176,7 +152,7 @@ public: class ActorCreationArgs { public: std::vector args; - std::unordered_map* properties = nullptr; + std::unordered_map properties; const char* host = nullptr; const char* function = nullptr; double start_time = 0.0; @@ -187,49 +163,45 @@ public: class ZoneCreationArgs { public: std::string id; - int routing; + std::string routing; }; extern XBT_PRIVATE xbt::signal on_cluster_creation; -} // namespace routing -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::routing /********** Routing **********/ -void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb); +void routing_cluster_add_backbone(std::unique_ptr link); /*** END of the parsing cruft ***/ XBT_PUBLIC simgrid::kernel::routing::NetZoneImpl* -sg_platf_new_Zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone); // Begin description of new 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 +sg_platf_new_zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone); // Begin description of new 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(const simgrid::kernel::routing::HostCreationArgs* host); // Add a host to the current Zone +sg_platf_new_host_begin(const simgrid::kernel::routing::HostCreationArgs* host); // Add a host to the current Zone +XBT_PUBLIC void sg_platf_new_host_set_properties(const std::unordered_map& props); +XBT_PUBLIC void sg_platf_new_host_seal(int pstate); // That Host is fully described + XBT_PUBLIC void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* h); // Add a host_link to the current Zone XBT_PUBLIC void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link); // Add a link to the current Zone XBT_PUBLIC void +sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk); // Add a disk to the current host +XBT_PUBLIC void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer); // Add a peer to the current Zone -XBT_PUBLIC void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* clust); // Add a cluster to the current Zone +XBT_PUBLIC void sg_platf_new_tag_cluster( + simgrid::kernel::routing::ClusterCreationArgs* clust); // Add a regular cluster to the current Zone +XBT_PUBLIC simgrid::kernel::routing::NetPoint* // Add a router to the current Zone +sg_platf_new_router(const std::string&, const std::string& coords); XBT_PUBLIC void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet); // Add a cabinet to the current Zone -XBT_PUBLIC simgrid::kernel::routing::NetPoint* // Add a router to the current Zone - sg_platf_new_router(const std::string&, const char* coords); - XBT_PUBLIC void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route); // Add a route -XBT_PUBLIC void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreationArgs* bypassroute); // Add a bypassRoute - -XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* trace); - -XBT_PUBLIC simgrid::kernel::resource::DiskImpl* -sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk); // Add a disk to the current host +XBT_PUBLIC void sg_platf_new_bypass_route(simgrid::kernel::routing::RouteCreationArgs* route); // Add a bypass route -XBT_PUBLIC void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage); // Add a storage to the current Zone -XBT_PUBLIC void sg_platf_new_storage_type(const simgrid::kernel::routing::StorageTypeCreationArgs* storage_type); -XBT_PUBLIC void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount); +XBT_PUBLIC void sg_platf_new_trace(const simgrid::kernel::routing::ProfileCreationArgs* trace); XBT_PUBLIC void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor); XBT_PRIVATE void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect);