X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c27325f7854de16164de674d7428d6487c7501db..4e1034f2699881431dbd65b0d4d1af6131a60302:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 03e3ed1f93..13b3012cff 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-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -15,7 +15,7 @@ #include #include -SG_BEGIN_DECL() +extern "C" { #include "src/surf/xml/simgrid_dtd.h" #ifndef YY_TYPEDEF_YY_SIZE_T @@ -23,12 +23,12 @@ SG_BEGIN_DECL() 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; +enum e_surf_cluster_topology_t { + SURF_CLUSTER_DRAGONFLY = 3, + SURF_CLUSTER_FAT_TREE = 2, + SURF_CLUSTER_FLAT = 1, + SURF_CLUSTER_TORUS = 0 +}; /* ***************************************** */ /* @@ -41,16 +41,16 @@ typedef enum { * used, instead of malloced structures. */ -typedef struct { - const char* id; +struct s_sg_platf_host_cbarg_t { + 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; + 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; +}; typedef s_sg_platf_host_cbarg_t* sg_platf_host_cbarg_t; class HostLinkCreationArgs { @@ -83,38 +83,38 @@ public: tmgr_trace_t 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; +struct s_sg_platf_route_cbarg_t { + 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; +}; +typedef s_sg_platf_route_cbarg_t* sg_platf_route_cbarg_t; + +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; + 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; e_surf_cluster_topology_t topology; - const char* topo_parameters; + std::string topo_parameters; std::map* properties; - const char* router_id; + std::string 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; +}; class CabinetCreationArgs { public: @@ -152,11 +152,11 @@ public: std::string name; }; -typedef struct s_sg_platf_prop_cbarg *sg_platf_prop_cbarg_t; -typedef struct s_sg_platf_prop_cbarg { +struct s_sg_platf_prop_cbarg_t { const char *id; const char *value; -} s_sg_platf_prop_cbarg_t; +}; +typedef s_sg_platf_prop_cbarg_t* sg_platf_prop_cbarg_t; class TraceCreationArgs { public: @@ -173,17 +173,16 @@ public: 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; +struct s_sg_platf_process_cbarg_t { + std::vector args; + std::map* properties = nullptr; + const char* host = nullptr; + const char* function = nullptr; + double start_time = 0.0; + double kill_time = 0.0; + e_surf_process_on_failure_t on_failure = {}; +}; +typedef s_sg_platf_process_cbarg_t* sg_platf_process_cbarg_t; class ZoneCreationArgs { public: @@ -191,9 +190,6 @@ public: 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); /*** END of the parsing cruft ***/ @@ -208,10 +204,10 @@ XBT_PUBLIC(void) sg_platf_new_host(sg_platf_host_cbarg_t host); // Add a 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_cluster(ClusterCreationArgs* 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); +sg_platf_new_router(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 @@ -238,16 +234,12 @@ 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() +} namespace simgrid { namespace surf { -extern XBT_PRIVATE simgrid::xbt::signal on_cluster; - +extern XBT_PRIVATE simgrid::xbt::signal on_cluster; } }