X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0152467306643146e97a6dc26d1e3b264f915d6f..0adbb90374b4ca8d4f0aa463f3fa0e9a55e98f21:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 39b93d2490..e321afc296 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-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -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 #include #include @@ -35,10 +37,10 @@ struct HostCreationArgs { 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 = ""; + std::unordered_map* properties = nullptr; }; class HostLinkCreationArgs { @@ -52,12 +54,12 @@ class LinkCreationArgs { public: std::string id; double bandwidth = 0; - tmgr_trace_t bandwidth_trace = nullptr; + profile::Profile* 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; + 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; }; class PeerCreationArgs { @@ -67,18 +69,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 }; @@ -100,10 +102,10 @@ public: double limiter_link = 0; ClusterTopology topology; 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; + simgrid::s4u::Link::SharingPolicy sharing_policy; + simgrid::s4u::Link::SharingPolicy bb_sharing_policy; }; class CabinetCreationArgs { @@ -122,7 +124,7 @@ public: std::string id; std::string type_id; std::string content; - std::map* properties; + std::unordered_map* properties; std::string attach; }; @@ -131,8 +133,8 @@ public: std::string id; std::string model; std::string content; - std::map* properties; - std::map* model_properties; + std::unordered_map* properties; + std::unordered_map* model_properties; sg_size_t size; }; @@ -142,7 +144,7 @@ public: std::string name; }; -class TraceCreationArgs { +class ProfileCreationArgs { public: std::string id; std::string file; @@ -164,7 +166,7 @@ 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 = nullptr; const char* host = nullptr; const char* function = nullptr; double start_time = 0.0; @@ -179,16 +181,12 @@ 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 simgrid::kernel::routing::NetZoneImpl* +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 @@ -197,13 +195,13 @@ XBT_PUBLIC void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* li 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::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::TraceCreationArgs* trace); +XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* 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); @@ -225,12 +223,11 @@ 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; +extern XBT_PRIVATE simgrid::xbt::signal on_cluster; } }