X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9735863c1ccb1ae8b55853262d6e1c3ee3a8698f..5e0b70c4585952ce9b329721b6ef17bf35cab3a1:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index f80fb196ad..3e0cfe68ed 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -11,6 +11,8 @@ #include "simgrid/host.h" #include "src/surf/xml/platf.hpp" +#include +#include SG_BEGIN_DECL() #include "src/surf/xml/simgrid_dtd.h" @@ -20,9 +22,8 @@ SG_BEGIN_DECL() typedef size_t yy_size_t; #endif -XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char *name); - typedef enum { + SURF_CLUSTER_DRAGONFLY=3, SURF_CLUSTER_FAT_TREE=2, SURF_CLUSTER_FLAT = 1, SURF_CLUSTER_TORUS = 0 @@ -41,7 +42,7 @@ typedef enum { typedef struct { const char* id; - xbt_dynar_t speed_peak; + std::vector speed_per_pstate; int pstate; int core_amount; tmgr_trace_t speed_trace; @@ -50,39 +51,23 @@ typedef struct { xbt_dict_t properties; } s_sg_platf_host_cbarg_t, *sg_platf_host_cbarg_t; -#define SG_PLATF_HOST_INITIALIZER { \ - NULL, 0, 1, 1, NULL, NULL, NULL, NULL \ -} - typedef struct { const char* id; const char* link_up; const char* link_down; } s_sg_platf_host_link_cbarg_t, *sg_platf_host_link_cbarg_t; -#define SG_PLATF_HOST_LINK_INITIALIZER {NULL,NULL,NULL} - -typedef struct { - const char* id; - const char* coord; -} s_sg_platf_router_cbarg_t, *sg_platf_router_cbarg_t; - -#define SG_PLATF_ROUTER_INITIALIZER {NULL,NULL} - -typedef struct { - const char* id; - double bandwidth; - tmgr_trace_t bandwidth_trace; - double latency; - tmgr_trace_t latency_trace; - tmgr_trace_t state_trace; - e_surf_link_sharing_policy_t policy; - xbt_dict_t properties; -} s_sg_platf_link_cbarg_t, *sg_platf_link_cbarg_t; - -#define SG_PLATF_LINK_INITIALIZER {\ - NULL, 0., NULL, 0., NULL, NULL, SURF_LINK_SHARED, NULL \ -} +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; + xbt_dict_t properties = nullptr; +}; typedef struct s_sg_platf_peer_cbarg *sg_platf_peer_cbarg_t; typedef struct s_sg_platf_peer_cbarg { @@ -90,33 +75,28 @@ typedef struct s_sg_platf_peer_cbarg { double speed; double bw_in; double bw_out; - double lat; const char* coord; - tmgr_trace_t availability_trace; + tmgr_trace_t speed_trace; tmgr_trace_t state_trace; } s_sg_platf_peer_cbarg_t; -#define SG_PLATF_PEER_INITIALIZER {NULL,0.0,0.0,0.0,0.0,NULL,NULL,NULL} - typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t; typedef struct s_sg_platf_route_cbarg { - int symmetrical; - const char *src; - const char *dst; - sg_netcard_t gw_src; - sg_netcard_t gw_dst; - std::vector *link_list; + 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; -#define SG_PLATF_ROUTE_INITIALIZER {1,NULL,NULL,NULL,NULL,NULL} - 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; - const char* radical; - double speed; + std::vector* radicals; + std::vector speeds; int core_amount; double bw; double lat; @@ -131,29 +111,19 @@ typedef struct s_sg_platf_cluster_cbarg { const char* router_id; e_surf_link_sharing_policy_t sharing_policy; e_surf_link_sharing_policy_t bb_sharing_policy; - const char* availability_trace; //don't convert to tmgr_trace_t since there is a trace per host and some rewriting is needed - const char* state_trace; } s_sg_platf_cluster_cbarg_t; -#define SG_PLATF_CLUSTER_INITIALIZER {NULL,NULL,NULL,NULL,0.0,1 \ - ,1.,1.,0.,0.,0.,0.,0. \ - ,SURF_CLUSTER_FLAT,NULL,NULL,NULL, \ - SURF_LINK_SHARED,SURF_LINK_SHARED,NULL \ - ,NULL} - 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; - const char* radical; + std::vector* radicals; double speed; double bw; double lat; } s_sg_platf_cabinet_cbarg_t; -#define SG_PLATF_CABINET_INITIALIZER {NULL,NULL,NULL,NULL,0.0,0.0,0.0} - typedef struct { const char* id; const char* type_id; @@ -163,8 +133,6 @@ typedef struct { const char* attach; } s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t; -#define SG_PLATF_STORAGE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL} - typedef struct { const char* id; const char* model; @@ -175,30 +143,17 @@ typedef struct { sg_size_t size; } s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t; -#define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL,0} - -typedef struct { - const char* type_id; - const char* name; -} s_sg_platf_mstorage_cbarg_t, *sg_platf_mstorage_cbarg_t; - -#define SG_PLATF_MSTORAGE_INITIALIZER {NULL,NULL} - typedef struct { const char* storageId; const char* name; } s_sg_platf_mount_cbarg_t, *sg_platf_mount_cbarg_t; -#define SG_PLATF_MOUNT_INITIALIZER {NULL,NULL} - 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; -#define SG_PLATF_PROP_INITIALIZER {NULL,NULL} - typedef struct s_sg_platf_trace_cbarg *sg_platf_trace_cbarg_t; typedef struct s_sg_platf_trace_cbarg { const char *id; @@ -207,8 +162,6 @@ typedef struct s_sg_platf_trace_cbarg { const char *pc_data; } s_sg_platf_trace_cbarg_t; -#define SG_PLATF_TRACE_INITIALIZER {NULL,NULL,0.0,NULL} - typedef struct s_sg_platf_trace_connect_cbarg *sg_platf_trace_connect_cbarg_t; typedef struct s_sg_platf_trace_connect_cbarg { e_surf_trace_connect_kind_t kind; @@ -216,8 +169,6 @@ typedef struct s_sg_platf_trace_connect_cbarg { const char *element; } s_sg_platf_trace_connect_cbarg_t; -#define SG_PLATF_TRACE_CONNECT_INITIALIZER {SURF_TRACE_CONNECT_KIND_LATENCY,NULL,NULL} - typedef struct s_sg_platf_process_cbarg *sg_platf_process_cbarg_t; typedef struct s_sg_platf_process_cbarg { const char **argv; @@ -230,35 +181,29 @@ typedef struct s_sg_platf_process_cbarg { e_surf_process_on_failure_t on_failure; } s_sg_platf_process_cbarg_t; -#define SG_PLATF_PROCESS_INITIALIZER {NULL,0,NULL,NULL,NULL,-1.0,-1.0,SURF_PROCESS_ON_FAILURE_DIE} - typedef struct s_sg_platf_AS_cbarg *sg_platf_AS_cbarg_t; typedef struct s_sg_platf_AS_cbarg { const char *id; int routing; } s_sg_platf_AS_cbarg_t; -#define SG_PLATF_AS_INITIALIZER {NULL,0} - -/** opaque structure defining a event generator for availability based on a probability distribution */ -typedef struct probabilist_event_generator *probabilist_event_generator_t; +#define SG_PLATF_AS_INITIALIZER {nullptr,0} /********** Routing **********/ -void routing_AS_begin(sg_platf_AS_cbarg_t AS); -void routing_AS_end(void); -void routing_cluster_add_backbone(Link* bb); +void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb); /*** END of the parsing cruft ***/ -XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform -XBT_PUBLIC(void) sg_platf_end(void); // Finish the creation of the platform +XBT_PUBLIC(void) sg_platf_begin(); // Start a new platform +XBT_PUBLIC(void) sg_platf_end(); // Finish the creation of the platform -XBT_PUBLIC(void) sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS); // Begin description of new AS -XBT_PUBLIC(void) sg_platf_new_AS_end(void); // That AS is fully described +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(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(void) sg_platf_new_router (sg_platf_router_cbarg_t router); // Add a router to the currently described AS -XBT_PUBLIC(void) sg_platf_new_link (sg_platf_link_cbarg_t link); // Add a 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 @@ -269,7 +214,6 @@ XBT_PUBLIC(void) sg_platf_new_bypassRoute (sg_platf_route_cbarg_t bypassroute); XBT_PUBLIC(void) sg_platf_new_trace(sg_platf_trace_cbarg_t 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_mstorage(sg_platf_mstorage_cbarg_t mstorage); 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); @@ -277,18 +221,18 @@ 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); /* Prototypes of the functions offered by flex */ -XBT_PUBLIC(int) surf_parse_lex(void); -XBT_PUBLIC(int) surf_parse_get_lineno(void); -XBT_PUBLIC(FILE *) surf_parse_get_in(void); -XBT_PUBLIC(FILE *) surf_parse_get_out(void); -XBT_PUBLIC(yy_size_t) surf_parse_get_leng(void); -XBT_PUBLIC(char *) surf_parse_get_text(void); +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(void); +XBT_PUBLIC(int) surf_parse_get_debug(); XBT_PUBLIC(void) surf_parse_set_debug(int bdebug); -XBT_PUBLIC(int) surf_parse_lex_destroy(void); +XBT_PUBLIC(int) surf_parse_lex_destroy(); /* To include files (?) */ XBT_PRIVATE void surfxml_bufferstack_push(int _new); @@ -298,23 +242,15 @@ 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(sg_platf_router_cbarg_t router); -XBT_PRIVATE void sg_instr_new_host(sg_platf_host_cbarg_t host); -XBT_PRIVATE void sg_instr_AS_end(void); - -typedef struct s_surf_parsing_link_up_down *surf_parsing_link_up_down_t; -typedef struct s_surf_parsing_link_up_down { - Link* link_up; - Link* link_down; -} s_surf_parsing_link_up_down_t; - +XBT_PRIVATE void sg_instr_new_router(const char* name); +XBT_PRIVATE void sg_instr_new_host(simgrid::s4u::Host& host); +XBT_PRIVATE void sg_instr_AS_end(); SG_END_DECL() namespace simgrid { namespace surf { -extern XBT_PRIVATE simgrid::xbt::signal on_link; extern XBT_PRIVATE simgrid::xbt::signal on_cluster; }