X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 39b93d2490..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-2018. 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 @@ -10,15 +10,14 @@ #define SG_PLATF_H #include "simgrid/host.h" -#include "src/surf/xml/platf.hpp" +#include "simgrid/s4u/Link.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 @@ -30,15 +29,15 @@ namespace routing { * used, instead of malloced structures. */ -struct HostCreationArgs { - const char* id = nullptr; +class HostCreationArgs { +public: + std::string id; std::vector speed_per_pstate; int pstate = 0; int core_amount = 0; - tmgr_trace_t speed_trace = nullptr; - tmgr_trace_t state_trace = nullptr; - const char* coord = nullptr; - std::map* properties = nullptr; + profile::Profile* speed_trace = nullptr; + profile::Profile* state_trace = nullptr; + std::string coord = ""; }; class HostLinkCreationArgs { @@ -51,13 +50,13 @@ public: class LinkCreationArgs { public: std::string id; - double bandwidth = 0; - tmgr_trace_t bandwidth_trace = nullptr; - 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; - std::map* properties = nullptr; + std::vector bandwidths; + profile::Profile* bandwidth_trace = nullptr; + double latency = 0; + profile::Profile* latency_trace = nullptr; + profile::Profile* state_trace = nullptr; + s4u::Link::SharingPolicy policy = s4u::Link::SharingPolicy::FATPIPE; + std::unordered_map properties; }; class PeerCreationArgs { @@ -67,18 +66,18 @@ public: double bw_in; double bw_out; std::string coord; - tmgr_trace_t speed_trace; - tmgr_trace_t state_trace; + profile::Profile* speed_trace; + profile::Profile* state_trace; }; 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 link_list; + bool symmetrical = false; + NetPoint* src = nullptr; + NetPoint* dst = nullptr; + NetPoint* gw_src = nullptr; + NetPoint* gw_dst = nullptr; + std::vector link_list; }; enum class ClusterTopology { DRAGONFLY = 3, FAT_TREE = 2, FLAT = 1, TORUS = 0 }; @@ -88,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; @@ -98,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::map* properties; + std::unordered_map properties; std::string router_id; - e_surf_link_sharing_policy_t sharing_policy; - e_surf_link_sharing_policy_t bb_sharing_policy; + s4u::Link::SharingPolicy sharing_policy = s4u::Link::SharingPolicy::SPLITDUPLEX; + s4u::Link::SharingPolicy bb_sharing_policy = s4u::Link::SharingPolicy::SHARED; }; class CabinetCreationArgs { @@ -111,38 +110,29 @@ 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 id; - std::string type_id; - std::string content; - std::map* properties; - std::string attach; + std::string routing; + std::vector host_links; + std::vector cabinets; + std::unique_ptr backbone; }; -class StorageTypeCreationArgs { +class DiskCreationArgs { public: std::string id; - std::string model; - std::string content; - std::map* properties; - std::map* model_properties; - sg_size_t size; + std::unordered_map properties; + double read_bw; + double write_bw; }; -class MountCreationArgs { -public: - std::string storageId; - std::string name; -}; - -class TraceCreationArgs { +class ProfileCreationArgs { public: std::string id; std::string file; @@ -159,55 +149,59 @@ public: std::string element; }; -enum class ActorOnFailure { DIE, RESTART }; // FIXME: move to a better namespace - class ActorCreationArgs { public: std::vector args; - std::map* properties = nullptr; + std::unordered_map properties; const char* host = nullptr; const char* function = nullptr; double start_time = 0.0; double kill_time = 0.0; - ActorOnFailure on_failure; + bool restart_on_failure = false; }; class ZoneCreationArgs { public: std::string id; - int routing; + std::string routing; }; -}}} -extern "C" { +extern XBT_PRIVATE xbt::signal on_cluster_creation; + +} // namespace simgrid::kernel::routing /********** Routing **********/ -void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb); +void routing_cluster_add_backbone(std::unique_ptr link); /*** 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 - -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_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* h); // Add a host_link to the current Zone -XBT_PUBLIC void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link); // Add a link to the current Zone -XBT_PUBLIC void sg_platf_new_peer(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_cabinet(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(std::string, const char* coords); - +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 + +XBT_PUBLIC void +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_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 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_bypass_route(simgrid::kernel::routing::RouteCreationArgs* route); // Add a bypass route -XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace); - -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(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); @@ -225,13 +219,5 @@ 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 { - -extern XBT_PRIVATE simgrid::xbt::signal on_cluster; -} -} #endif /* SG_PLATF_H */