X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ca3fd4750612349590e3489edbf1f6d40fa73be..3736e0252d96679e19cfbe41f3c09833d3734386:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index a5ce2d9c63..aec18201b2 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -8,7 +8,7 @@ #include "xbt/log.h" #include "xbt/str.h" #include "xbt/dict.h" -#include "surf/surfxml_parse_private.h" +#include "surf/surfxml_parse.h" #include "surf/surf_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, @@ -21,7 +21,7 @@ int ETag_surfxml_include_state(void); /* * Helping functions */ -void surf_parse_error(char *msg) { +void surf_parse_error(const char *msg) { xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg); } @@ -58,8 +58,6 @@ xbt_dynar_t STag_surfxml_argument_cb_list = NULL; xbt_dynar_t ETag_surfxml_argument_cb_list = NULL; xbt_dynar_t STag_surfxml_prop_cb_list = NULL; xbt_dynar_t ETag_surfxml_prop_cb_list = NULL; -xbt_dynar_t STag_surfxml_cluster_cb_list = NULL; -xbt_dynar_t ETag_surfxml_cluster_cb_list = NULL; xbt_dynar_t STag_surfxml_peer_cb_list = NULL; xbt_dynar_t ETag_surfxml_peer_cb_list = NULL; xbt_dynar_t STag_surfxml_trace_cb_list = NULL; @@ -68,8 +66,6 @@ xbt_dynar_t STag_surfxml_trace_connect_cb_list = NULL; xbt_dynar_t ETag_surfxml_trace_connect_cb_list = NULL; xbt_dynar_t STag_surfxml_random_cb_list = NULL; xbt_dynar_t ETag_surfxml_random_cb_list = NULL; -xbt_dynar_t STag_surfxml_AS_cb_list = NULL; -xbt_dynar_t ETag_surfxml_AS_cb_list = NULL; xbt_dynar_t STag_surfxml_ASroute_cb_list = NULL; xbt_dynar_t ETag_surfxml_ASroute_cb_list = NULL; xbt_dynar_t STag_surfxml_bypassRoute_cb_list = NULL; @@ -88,10 +84,6 @@ static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t); YY_BUFFER_STATE surf_input_buffer; FILE *surf_file_to_parse = NULL; -static void parse_Stag_trace(void); -static void parse_Etag_trace(void); -static void parse_Stag_trace_connect(void); - static void init_randomness(void); static void add_randomness(void); @@ -136,7 +128,7 @@ int ETag_surfxml_include_state(void) { fflush(NULL); XBT_INFO("ETag_surfxml_include_state '%s'",A_surfxml_include_file); - if(xbt_dynar_length(surf_input_buffer_stack)!= 0) + if(!xbt_dynar_is_empty(surf_input_buffer_stack)) return 1; fclose(surf_file_to_parse); xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse); @@ -174,8 +166,6 @@ void surf_parse_init_callbacks(void) xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_AS_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_AS_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_ASroute_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_ASroute_cb_list = @@ -184,10 +174,6 @@ void surf_parse_init_callbacks(void) xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_bypassRoute_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_cluster_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_cluster_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_peer_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_peer_cb_list = @@ -224,14 +210,10 @@ void surf_parse_free_callbacks(void) xbt_dynar_free(&ETag_surfxml_trace_connect_cb_list); xbt_dynar_free(&STag_surfxml_random_cb_list); xbt_dynar_free(&ETag_surfxml_random_cb_list); - xbt_dynar_free(&STag_surfxml_AS_cb_list); - xbt_dynar_free(&ETag_surfxml_AS_cb_list); xbt_dynar_free(&STag_surfxml_ASroute_cb_list); xbt_dynar_free(&ETag_surfxml_ASroute_cb_list); xbt_dynar_free(&STag_surfxml_bypassRoute_cb_list); xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list); - xbt_dynar_free(&STag_surfxml_cluster_cb_list); - xbt_dynar_free(&ETag_surfxml_cluster_cb_list); xbt_dynar_free(&STag_surfxml_peer_cb_list); xbt_dynar_free(&ETag_surfxml_peer_cb_list); xbt_dynar_free(&STag_surfxml_include_cb_list); @@ -264,10 +246,10 @@ void STag_surfxml_platform(void) { "This program is installed automatically with SimGrid, or " "available in the tools/ directory of the source archive."); - sg_platf_open(); + sg_platf_begin(); } void ETag_surfxml_platform(void){ - sg_platf_close(); + sg_platf_end(); } void STag_surfxml_host(void){ @@ -308,67 +290,77 @@ void STag_surfxml_router(void){ } void STag_surfxml_cluster(void){ - struct_cluster = xbt_new0(s_surf_parsing_cluster_arg_t, 1); - struct_cluster->id = A_surfxml_cluster_id; - struct_cluster->prefix = A_surfxml_cluster_prefix; - struct_cluster->suffix = A_surfxml_cluster_suffix; - struct_cluster->radical = A_surfxml_cluster_radical; - struct_cluster->power= surf_parse_get_double(A_surfxml_cluster_power); - struct_cluster->core_amount = surf_parse_get_int(A_surfxml_cluster_core); - struct_cluster->bw = surf_parse_get_double(A_surfxml_cluster_bw); - struct_cluster->lat = surf_parse_get_double(A_surfxml_cluster_lat); + s_sg_platf_cluster_cbarg_t cluster; + memset(&cluster,0,sizeof(cluster)); + cluster.id = A_surfxml_cluster_id; + cluster.prefix = A_surfxml_cluster_prefix; + cluster.suffix = A_surfxml_cluster_suffix; + cluster.radical = A_surfxml_cluster_radical; + cluster.power= surf_parse_get_double(A_surfxml_cluster_power); + cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core); + cluster.bw = surf_parse_get_double(A_surfxml_cluster_bw); + cluster.lat = surf_parse_get_double(A_surfxml_cluster_lat); if(strcmp(A_surfxml_cluster_bb_bw,"")) - struct_cluster->bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw); + cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw); if(strcmp(A_surfxml_cluster_bb_lat,"")) - struct_cluster->bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat); - if(!strcmp(A_surfxml_cluster_router_id,"")) - struct_cluster->router_id = bprintf("%s%s_router%s", - struct_cluster->prefix, - struct_cluster->id, - struct_cluster->suffix); - else - struct_cluster->router_id = A_surfxml_cluster_router_id; - - struct_cluster->sharing_policy = AX_surfxml_cluster_sharing_policy; - struct_cluster->bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy; - - struct_cluster->availability_trace = xbt_strdup(A_surfxml_cluster_availability_file); - struct_cluster->state_trace = xbt_strdup(A_surfxml_cluster_state_file); + cluster.bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat); + cluster.router_id = A_surfxml_cluster_router_id; + + switch (AX_surfxml_cluster_sharing_policy) { + case A_surfxml_cluster_sharing_policy_SHARED: + cluster.sharing_policy = SURF_LINK_SHARED; + break; + case A_surfxml_cluster_sharing_policy_FULLDUPLEX: + cluster.sharing_policy = SURF_LINK_FULLDUPLEX; + break; + case A_surfxml_cluster_sharing_policy_FATPIPE: + cluster.sharing_policy = SURF_LINK_FATPIPE; + break; + default: + surf_parse_error(bprintf + ("Invalid cluster sharing policy for cluster %s", + cluster.id)); + break; + } + switch (AX_surfxml_cluster_bb_sharing_policy) { + case A_surfxml_cluster_bb_sharing_policy_FATPIPE: + cluster.bb_sharing_policy = SURF_LINK_FATPIPE; + break; + case A_surfxml_cluster_bb_sharing_policy_SHARED: + cluster.bb_sharing_policy = SURF_LINK_SHARED; + break; + default: + surf_parse_error(bprintf + ("Invalid bb sharing policy in cluster %s", + cluster.id)); + break; + } - surfxml_call_cb_functions(STag_surfxml_cluster_cb_list); + cluster.availability_trace = A_surfxml_cluster_availability_file; + cluster.state_trace = A_surfxml_cluster_state_file; + sg_platf_new_cluster(&cluster); } void ETag_surfxml_cluster(void){ - surfxml_call_cb_functions(ETag_surfxml_cluster_cb_list); - if( !strcmp(A_surfxml_cluster_router_id,"")) - xbt_free(struct_cluster->router_id); - xbt_free(struct_cluster->availability_trace); - xbt_free(struct_cluster->state_trace); - xbt_free(struct_cluster); + /* nothing I can think of */ } void STag_surfxml_peer(void){ - struct_peer = xbt_new0(s_surf_parsing_peer_arg_t, 1); - struct_peer->id = xbt_strdup(A_surfxml_peer_id); - struct_peer->power = xbt_strdup(A_surfxml_peer_power); - struct_peer->bw_in = xbt_strdup(A_surfxml_peer_bw_in); - struct_peer->bw_out = xbt_strdup(A_surfxml_peer_bw_out); - struct_peer->lat = xbt_strdup(A_surfxml_peer_lat); - struct_peer->coord = xbt_strdup(A_surfxml_peer_coordinates); - struct_peer->availability_trace = xbt_strdup(A_surfxml_peer_availability_file); - struct_peer->state_trace = xbt_strdup(A_surfxml_peer_state_file); + s_sg_platf_peer_cbarg_t peer; + memset(&peer,0,sizeof(peer)); + peer.id = A_surfxml_peer_id; + peer.power = surf_parse_get_double(A_surfxml_peer_power); + peer.bw_in = surf_parse_get_double(A_surfxml_peer_bw_in); + peer.bw_out = surf_parse_get_double(A_surfxml_peer_bw_out); + peer.lat = surf_parse_get_double(A_surfxml_peer_lat); + peer.coord = A_surfxml_peer_coordinates; + peer.availability_trace = tmgr_trace_new(A_surfxml_peer_availability_file); + peer.state_trace = tmgr_trace_new(A_surfxml_peer_state_file); + surfxml_call_cb_functions(STag_surfxml_peer_cb_list); + sg_platf_new_peer(&peer); } void ETag_surfxml_peer(void){ - surfxml_call_cb_functions(ETag_surfxml_peer_cb_list); - xbt_free(struct_peer->id); - xbt_free(struct_peer->power); - xbt_free(struct_peer->bw_in); - xbt_free(struct_peer->bw_out); - xbt_free(struct_peer->lat); - xbt_free(struct_peer->coord); - xbt_free(struct_peer->availability_trace); - xbt_free(struct_peer->state_trace); - xbt_free(struct_peer); + /* nothing to do here */ } void STag_surfxml_link(void){ s_sg_platf_link_cbarg_t link; @@ -437,7 +429,10 @@ void STag_surfxml_trace_connect(void){ surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list); } void STag_surfxml_AS(void){ - surfxml_call_cb_functions(STag_surfxml_AS_cb_list); + sg_platf_new_AS_begin(A_surfxml_AS_id,A_surfxml_AS_routing); +} +void ETag_surfxml_AS(void){ + sg_platf_new_AS_end(); } void STag_surfxml_ASroute(void){ surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list); @@ -482,7 +477,6 @@ parse_method(E, prop); parse_method(E, trace); parse_method(E, trace_connect); parse_method(E, random); -parse_method(E, AS); parse_method(E, ASroute); parse_method(E, bypassRoute); @@ -515,10 +509,8 @@ void surf_parse_open(const char *file) void surf_parse_close(void) { - if (surf_input_buffer_stack) - xbt_dynar_free(&surf_input_buffer_stack); - if (surf_file_to_parse_stack) - xbt_dynar_free(&surf_file_to_parse_stack); + xbt_dynar_free(&surf_input_buffer_stack); + xbt_dynar_free(&surf_file_to_parse_stack); if (surf_file_to_parse) { surf_parse__delete_buffer(surf_input_buffer); @@ -567,38 +559,22 @@ static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list) unsigned int iterator; void_f_void_t fun; xbt_dynar_foreach(cb_list, iterator, fun) { - if (fun) (*fun) (); + if (fun) fun(); } } /* Prop tag functions */ -void parse_properties(const char* prop_id, const char* prop_value) -{ - if (!current_property_set) - current_property_set = xbt_dict_new(); // Maybe, it should raise an error - if(!strcmp(prop_id,"coordinates")){ - if(!strcmp(prop_value,"yes") && !COORD_HOST_LEVEL) - { - XBT_INFO("Configuration change: Set '%s' to '%s'", prop_id, prop_value); - COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp); - COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp); - } - if(strcmp(A_surfxml_prop_value,"yes")) - xbt_die("Setting XML prop coordinates must be \"yes\""); - } - else{ - xbt_dict_set(current_property_set, prop_id, xbt_strdup(prop_value), free); - } -} - /** * With XML parser */ -void parse_properties_XML(void) +void parse_properties(void) { - parse_properties(A_surfxml_prop_id, A_surfxml_prop_value); + if (!current_property_set) + current_property_set = xbt_dict_new(); // Maybe, it should raise an error + + xbt_dict_set(current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), free); } @@ -651,122 +627,3 @@ static void add_randomness(void) &xbt_free_ref); } -/** - * create CPU resource via CPU Model - */ -void* surf_host_create_resource(char *name, double power_peak, - double power_scale, - tmgr_trace_t power_trace, int core, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) -{ - return surf_cpu_model->extension.cpu.create_resource(name, power_peak, - power_scale, - power_trace, - core, - state_initial, - state_trace, - cpu_properties); -} - -/** - * create CPU resource via worsktation_ptask_L07 model - */ - -void* surf_wsL07_host_create_resource(char *name, double power_peak, - double power_scale, - tmgr_trace_t power_trace, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) -{ - return surf_workstation_model->extension.workstation.cpu_create_resource(name, - power_peak, - power_scale, - power_trace, - state_initial, - state_trace, - cpu_properties); -} - -/** - * create link resource via network Model - */ -void* surf_link_create_resource(char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_resource_state_t - state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t policy, - xbt_dict_t properties) -{ - return surf_network_model->extension.network.create_resource(name, - bw_initial, - bw_trace, - lat_initial, - lat_trace, - state_initial, - state_trace, - policy, - properties); -} - -/** - * create link resource via workstation_ptask_L07 model - */ - -void* surf_wsL07_link_create_resource(char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_resource_state_t - state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t - policy, xbt_dict_t properties) -{ - return surf_workstation_model->extension.workstation. - link_create_resource(name, bw_initial, bw_trace, lat_initial, - lat_trace, state_initial, state_trace, policy, - properties); -} - -/** - * set route - */ -void surf_routing_add_route(const char *src_id, const char *dst_id, - xbt_dynar_t links_id) -{ - unsigned int i; - const char *link_id; - routing_set_route(src_id, dst_id); - xbt_dynar_foreach(links_id, i, link_id) { - routing_add_link(link_id); - } - - //store the route - routing_store_route(); -} - -/** - * Add Traces - */ -void surf_add_host_traces(void) -{ - return surf_cpu_model->extension.cpu.add_traces(); -} - -void surf_add_link_traces(void) -{ - return surf_network_model->extension.network.add_traces(); -} - -void surf_wsL07_add_traces(void) -{ - return surf_workstation_model->extension.workstation.add_traces(); -}