X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c27325f7854de16164de674d7428d6487c7501db..0adbb90374b4ca8d4f0aa463f3fa0e9a55e98f21:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 03e3ed1f93..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-2015. 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,26 +10,17 @@ #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 -SG_BEGIN_DECL() -#include "src/surf/xml/simgrid_dtd.h" - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -typedef enum { - SURF_CLUSTER_DRAGONFLY=3, - SURF_CLUSTER_FAT_TREE=2, - SURF_CLUSTER_FLAT = 1, - SURF_CLUSTER_TORUS = 0 -} e_surf_cluster_topology_t; - +namespace simgrid { +namespace kernel { +namespace routing { /* ***************************************** */ /* * Platform creation functions. Instead of passing 123 arguments to the creation functions @@ -41,17 +32,16 @@ typedef enum { * used, instead of malloced structures. */ -typedef struct { - const char* id; +struct HostCreationArgs { + const char* id = nullptr; std::vector speed_per_pstate; - int pstate; - int core_amount; - tmgr_trace_t speed_trace; - tmgr_trace_t state_trace; - const char* coord; - std::map* properties; -} s_sg_platf_host_cbarg_t; -typedef s_sg_platf_host_cbarg_t* sg_platf_host_cbarg_t; + int pstate = 0; + int core_amount = 0; + profile::Profile* speed_trace = nullptr; + profile::Profile* state_trace = nullptr; + std::string coord = ""; + std::unordered_map* properties = nullptr; +}; class HostLinkCreationArgs { public: @@ -64,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 { @@ -79,42 +69,44 @@ 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; }; -typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t; -typedef struct s_sg_platf_route_cbarg { - bool symmetrical; - sg_netpoint_t src; - sg_netpoint_t dst; - sg_netpoint_t gw_src; - sg_netpoint_t gw_dst; - std::vector* link_list; -} s_sg_platf_route_cbarg_t; - -typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t; -typedef struct s_sg_platf_cluster_cbarg { - const char* id; - const char* prefix; - const char* suffix; - std::vector* radicals; +class RouteCreationArgs { +public: + 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 }; + +class ClusterCreationArgs { +public: + std::string id; + std::string prefix; + std::string suffix; + std::vector* radicals = nullptr; std::vector speeds; - int core_amount; - double bw; - double lat; - double bb_bw; - double bb_lat; - double loopback_bw; - double loopback_lat; - double limiter_link; - e_surf_cluster_topology_t topology; - const char* topo_parameters; - std::map* properties; - const char* router_id; - e_surf_link_sharing_policy_t sharing_policy; - e_surf_link_sharing_policy_t bb_sharing_policy; -} s_sg_platf_cluster_cbarg_t; + int core_amount = 0; + double bw = 0; + double lat = 0; + double bb_bw = 0; + double bb_lat = 0; + double loopback_bw = 0; + double loopback_lat = 0; + double limiter_link = 0; + ClusterTopology topology; + std::string topo_parameters; + std::unordered_map* properties; + std::string router_id; + simgrid::s4u::Link::SharingPolicy sharing_policy; + simgrid::s4u::Link::SharingPolicy bb_sharing_policy; +}; class CabinetCreationArgs { public: @@ -132,7 +124,7 @@ public: std::string id; std::string type_id; std::string content; - std::map* properties; + std::unordered_map* properties; std::string attach; }; @@ -141,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; }; @@ -152,13 +144,7 @@ public: std::string name; }; -typedef struct s_sg_platf_prop_cbarg *sg_platf_prop_cbarg_t; -typedef struct s_sg_platf_prop_cbarg { - const char *id; - const char *value; -} s_sg_platf_prop_cbarg_t; - -class TraceCreationArgs { +class ProfileCreationArgs { public: std::string id; std::string file; @@ -166,88 +152,82 @@ public: std::string pc_data; }; +enum class TraceConnectKind { HOST_AVAIL, SPEED, LINK_AVAIL, BANDWIDTH, LATENCY }; + class TraceConnectCreationArgs { public: - e_surf_trace_connect_kind_t kind; + TraceConnectKind kind; std::string trace; std::string element; }; -typedef struct s_sg_platf_process_cbarg *sg_platf_process_cbarg_t; -typedef struct s_sg_platf_process_cbarg { - const char **argv; - int argc; - std::map* properties; - const char *host; - const char *function; - double start_time; - double kill_time; - e_surf_process_on_failure_t on_failure; -} s_sg_platf_process_cbarg_t; +enum class ActorOnFailure { DIE, RESTART }; // FIXME: move to a better namespace + +class ActorCreationArgs { +public: + std::vector args; + std::unordered_map* properties = nullptr; + const char* host = nullptr; + const char* function = nullptr; + double start_time = 0.0; + double kill_time = 0.0; + ActorOnFailure on_failure; +}; class ZoneCreationArgs { public: std::string id; int routing; }; - -/* The default current property receiver. Setup in the corresponding opening callbacks. */ -extern std::map* current_property_set; +}}} /********** 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(ZoneCreationArgs* zone); // Begin description of new Zone -XBT_PUBLIC(void) sg_platf_new_Zone_seal(); // That Zone is fully described +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(sg_platf_host_cbarg_t host); // Add a host to the current Zone -XBT_PUBLIC(void) sg_platf_new_hostlink(HostLinkCreationArgs* h); // Add a host_link to the current Zone -XBT_PUBLIC(void) sg_platf_new_link(LinkCreationArgs* link); // Add a link to the current Zone -XBT_PUBLIC(void) sg_platf_new_peer(PeerCreationArgs* peer); // Add a peer to the current Zone -XBT_PUBLIC(void) sg_platf_new_cluster(sg_platf_cluster_cbarg_t clust); // Add a cluster to the current Zone -XBT_PUBLIC(void) sg_platf_new_cabinet(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 char* name, const char* coords); +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(const std::string&, const char* coords); -XBT_PUBLIC(void) sg_platf_new_route (sg_platf_route_cbarg_t route); // Add a route -XBT_PUBLIC(void) sg_platf_new_bypassRoute (sg_platf_route_cbarg_t bypassroute); // Add a bypassRoute +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(TraceCreationArgs* trace); +XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* trace); -XBT_PUBLIC(void) sg_platf_new_storage(StorageCreationArgs* storage); // Add a storage to the current Zone -XBT_PUBLIC(void) sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type); -XBT_PUBLIC(void) sg_platf_new_mount(MountCreationArgs* mount); +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_process(sg_platf_process_cbarg_t process); -XBT_PRIVATE void sg_platf_trace_connect(TraceConnectCreationArgs* trace_connect); +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); /* Prototypes of the functions offered by flex */ -XBT_PUBLIC(int) surf_parse_lex(); -XBT_PUBLIC(int) surf_parse_get_lineno(); -XBT_PUBLIC(FILE *) surf_parse_get_in(); -XBT_PUBLIC(FILE *) surf_parse_get_out(); -XBT_PUBLIC(int) surf_parse_get_leng(); -XBT_PUBLIC(char *) surf_parse_get_text(); -XBT_PUBLIC(void) surf_parse_set_lineno(int line_number); -XBT_PUBLIC(void) surf_parse_set_in(FILE * in_str); -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(); - -XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route); - -SG_END_DECL() +XBT_PUBLIC int surf_parse_lex(); +XBT_PUBLIC int surf_parse_get_lineno(); +XBT_PUBLIC FILE* surf_parse_get_in(); +XBT_PUBLIC FILE* surf_parse_get_out(); +XBT_PUBLIC int surf_parse_get_leng(); +XBT_PUBLIC char* surf_parse_get_text(); +XBT_PUBLIC void surf_parse_set_lineno(int line_number); +XBT_PUBLIC void surf_parse_set_in(FILE* in_str); +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; } }