X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b872718938013e4f8ed157c19cda97679ca0df8d..97fa57103ccd60e8fc4c04ea6591904a7600a679:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 6c72ca57cb..3d21302f1a 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -20,16 +20,8 @@ SG_BEGIN_DECL() typedef size_t yy_size_t; #endif -static inline char* sg_storage_name(sg_storage_t storage) { - return storage->key; -} - XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char *name); -XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char *filename); -XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id, - const char *input, - double periodicity); typedef enum { SURF_CLUSTER_FAT_TREE=2, SURF_CLUSTER_FLAT = 1, @@ -49,7 +41,7 @@ typedef enum { typedef struct { const char* id; - xbt_dynar_t speed_peak; + xbt_dynar_t speed_per_pstate; int pstate; int core_amount; tmgr_trace_t speed_trace; @@ -58,25 +50,17 @@ 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; @@ -88,10 +72,6 @@ typedef struct { 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 \ -} - typedef struct s_sg_platf_peer_cbarg *sg_platf_peer_cbarg_t; typedef struct s_sg_platf_peer_cbarg { const char* id; @@ -104,20 +84,16 @@ typedef struct s_sg_platf_peer_cbarg { 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; + bool symmetrical; const char *src; const char *dst; sg_netcard_t gw_src; sg_netcard_t gw_dst; - xbt_dynar_t link_list; + 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; @@ -139,16 +115,8 @@ 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; @@ -160,8 +128,6 @@ typedef struct s_sg_platf_cabinet_cbarg { 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; @@ -171,8 +137,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; @@ -183,30 +147,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; @@ -215,8 +166,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; @@ -224,8 +173,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; @@ -238,8 +185,6 @@ 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; @@ -248,21 +193,15 @@ typedef struct s_sg_platf_AS_cbarg { #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; - /********** Routing **********/ -void routing_AS_begin(sg_platf_AS_cbarg_t AS); -void routing_AS_end(void); void routing_cluster_add_backbone(Link* bb); -surf_As* routing_get_current(); /*** 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_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::As*) sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS); // Begin description of new AS +XBT_PUBLIC(void) sg_platf_new_AS_seal(void); // 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 @@ -278,7 +217,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); @@ -304,6 +242,20 @@ 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(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; + + SG_END_DECL() namespace simgrid { @@ -311,7 +263,6 @@ namespace surf { extern XBT_PRIVATE simgrid::xbt::signal on_link; extern XBT_PRIVATE simgrid::xbt::signal on_cluster; -extern XBT_PRIVATE simgrid::xbt::signal on_postparse; } }