X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29d98d1ceb682fbc4c734a92353be4b0bcd5d17b..f7b9503676707b287df659c8dfa38fc7b657792c:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 2bc61f3f77..aedd266489 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -49,7 +49,7 @@ typedef struct { tmgr_trace_t speed_trace; tmgr_trace_t state_trace; const char* coord; - xbt_dict_t properties; + std::map* properties; } s_sg_platf_host_cbarg_t; typedef s_sg_platf_host_cbarg_t* sg_platf_host_cbarg_t; @@ -69,19 +69,19 @@ public: tmgr_trace_t latency_trace = nullptr; tmgr_trace_t state_trace = nullptr; e_surf_link_sharing_policy_t policy = SURF_LINK_FATPIPE; - xbt_dict_t properties = nullptr; + std::map* properties = nullptr; }; -typedef struct s_sg_platf_peer_cbarg *sg_platf_peer_cbarg_t; -typedef struct s_sg_platf_peer_cbarg { - const char* id; +class PeerCreationArgs { +public: + std::string id; double speed; double bw_in; double bw_out; - const char* coord; + std::string coord; tmgr_trace_t speed_trace; tmgr_trace_t state_trace; -} s_sg_platf_peer_cbarg_t; +}; typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t; typedef struct s_sg_platf_route_cbarg { @@ -110,47 +110,47 @@ typedef struct s_sg_platf_cluster_cbarg { double limiter_link; e_surf_cluster_topology_t topology; const char* topo_parameters; - xbt_dict_t properties; + 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; -typedef struct s_sg_platf_cabinet_cbarg* sg_platf_cabinet_cbarg_t; -typedef struct s_sg_platf_cabinet_cbarg { - const char* id; - const char* prefix; - const char* suffix; +class CabinetCreationArgs { +public: + std::string id; + std::string prefix; + std::string suffix; std::vector* radicals; double speed; double bw; double lat; -} s_sg_platf_cabinet_cbarg_t; +}; -typedef struct s_sg_platf_storage_cbarg* sg_platf_storage_cbarg_t; -typedef struct s_sg_platf_storage_cbarg { - const char* id; - const char* type_id; - const char* content; - xbt_dict_t properties; - const char* attach; -} s_sg_platf_storage_cbarg_t; - -typedef struct s_sg_platf_storage_type_cbarg* sg_platf_storage_type_cbarg_t; -typedef struct s_sg_platf_storage_type_cbarg { - const char* id; - const char* model; - const char* content; - xbt_dict_t properties; +class StorageCreationArgs { +public: + std::string id; + std::string type_id; + std::string content; + std::map* properties; + std::string attach; +}; + +class StorageTypeCreationArgs { +public: + std::string id; + std::string model; + std::string content; + std::map* properties; std::map* model_properties; sg_size_t size; -} s_sg_platf_storage_type_cbarg_t; +}; -typedef struct s_sg_platf_mount_cbarg* sg_platf_mount_cbarg_t; -typedef struct s_sg_platf_mount_cbarg { - const char* storageId; - const char* name; -} s_sg_platf_mount_cbarg_t; +class MountCreationArgs { +public: + std::string storageId; + std::string name; +}; typedef struct s_sg_platf_prop_cbarg *sg_platf_prop_cbarg_t; typedef struct s_sg_platf_prop_cbarg { @@ -158,26 +158,26 @@ typedef struct s_sg_platf_prop_cbarg { const char *value; } s_sg_platf_prop_cbarg_t; -typedef struct s_sg_platf_trace_cbarg *sg_platf_trace_cbarg_t; -typedef struct s_sg_platf_trace_cbarg { - const char *id; - const char *file; +class TraceCreationArgs { +public: + std::string id; + std::string file; double periodicity; - const char *pc_data; -} s_sg_platf_trace_cbarg_t; + std::string pc_data; +}; -typedef struct s_sg_platf_trace_connect_cbarg *sg_platf_trace_connect_cbarg_t; -typedef struct s_sg_platf_trace_connect_cbarg { +class TraceConnectCreationArgs { +public: e_surf_trace_connect_kind_t kind; - const char *trace; - const char *element; -} s_sg_platf_trace_connect_cbarg_t; + 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; - xbt_dict_t properties; + std::map* properties; const char *host; const char *function; double start_time; @@ -185,13 +185,14 @@ typedef struct s_sg_platf_process_cbarg { e_surf_process_on_failure_t on_failure; } s_sg_platf_process_cbarg_t; -typedef struct s_sg_platf_AS_cbarg *sg_platf_AS_cbarg_t; -typedef struct s_sg_platf_AS_cbarg { - const char *id; +class ZoneCreationArgs { +public: + std::string id; int routing; -} s_sg_platf_AS_cbarg_t; +}; -#define SG_PLATF_AS_INITIALIZER {nullptr,0} +/* 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); @@ -200,29 +201,29 @@ void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb); 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_AS_begin(sg_platf_AS_cbarg_t AS); // Begin description of new AS -XBT_PUBLIC(void) sg_platf_new_AS_seal(); // That AS is fully described +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(void) sg_platf_new_host (sg_platf_host_cbarg_t host); // Add an host to the currently described AS -XBT_PUBLIC(void) sg_platf_new_hostlink(sg_platf_host_link_cbarg_t h); // Add an host_link to the currently described AS -XBT_PUBLIC(simgrid::kernel::routing::NetPoint*) -sg_platf_new_router(const char* name, const char* coords); // Add a router to the currently described AS -XBT_PUBLIC(void) sg_platf_new_link(LinkCreationArgs* link); // Add a link to the currently described AS -XBT_PUBLIC(void) sg_platf_new_peer (sg_platf_peer_cbarg_t peer); // Add a peer to the currently described AS -XBT_PUBLIC(void) sg_platf_new_cluster(sg_platf_cluster_cbarg_t clust); // Add a cluster to the currently described AS -XBT_PUBLIC(void) sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet); // Add a cabinet to the currently described AS +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(sg_platf_host_link_cbarg_t 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_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_trace(sg_platf_trace_cbarg_t trace); +XBT_PUBLIC(void) sg_platf_new_trace(TraceCreationArgs* trace); -XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS -XBT_PUBLIC(void) sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type); -XBT_PUBLIC(void) sg_platf_new_mount(sg_platf_mount_cbarg_t mount); +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_process(sg_platf_process_cbarg_t process); -XBT_PRIVATE void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect); +XBT_PRIVATE void sg_platf_trace_connect(TraceConnectCreationArgs* trace_connect); /* Prototypes of the functions offered by flex */ XBT_PUBLIC(int) surf_parse_lex(); @@ -238,16 +239,7 @@ XBT_PUBLIC(int) surf_parse_get_debug(); XBT_PUBLIC(void) surf_parse_set_debug(int bdebug); XBT_PUBLIC(int) surf_parse_lex_destroy(); -/* To include files (?) */ -XBT_PRIVATE void surfxml_bufferstack_push(int _new); -XBT_PRIVATE void surfxml_bufferstack_pop(int _new); -XBT_PUBLIC_DATA(int) surfxml_bufferstack_size; - XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route); -/********** Instr. **********/ -XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS); -XBT_PRIVATE void sg_instr_new_router(const char* name); -XBT_PRIVATE void sg_instr_AS_end(); SG_END_DECL()