X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2599ef96125066e141d69d3348c8b4c23d773938..1d558deeec797460abbfa5ed52f1e7ae784dcf7e:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 894e405d8c..7a7383ca8a 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -21,7 +21,7 @@ int ETag_surfxml_include_state(void); /* * Helping functions */ -static void surf_parse_error(char *msg) { +void surf_parse_error(char *msg) { xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg); } @@ -48,12 +48,6 @@ int surf_parse_get_int(const char *string) { */ /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */ -//xbt_dynar_t STag_surfxml_host_cb_list = NULL; -xbt_dynar_t STag_surfxml_platform_cb_list = NULL; -xbt_dynar_t ETag_surfxml_platform_cb_list = NULL; -xbt_dynar_t ETag_surfxml_router_cb_list = NULL; -xbt_dynar_t STag_surfxml_link_cb_list = NULL; -xbt_dynar_t ETag_surfxml_link_cb_list = NULL; xbt_dynar_t STag_surfxml_route_cb_list = NULL; xbt_dynar_t ETag_surfxml_route_cb_list = NULL; xbt_dynar_t STag_surfxml_link_ctn_cb_list = NULL; @@ -74,8 +68,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; @@ -154,15 +146,8 @@ int ETag_surfxml_include_state(void) void surf_parse_init_callbacks(void) { - STag_surfxml_platform_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_platform_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); + sg_platf_init(); // FIXME: move to a proper place? - sg_platf_init(); - ETag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_link_ctn_cb_list = @@ -187,8 +172,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 = @@ -219,13 +202,8 @@ void surf_parse_reset_callbacks(void) void surf_parse_free_callbacks(void) { - sg_platf_exit(); + sg_platf_exit(); // FIXME: better place? - xbt_dynar_free(&STag_surfxml_platform_cb_list); - xbt_dynar_free(&ETag_surfxml_platform_cb_list); - xbt_dynar_free(&ETag_surfxml_router_cb_list); - xbt_dynar_free(&STag_surfxml_link_cb_list); - xbt_dynar_free(&ETag_surfxml_link_cb_list); xbt_dynar_free(&STag_surfxml_route_cb_list); xbt_dynar_free(&ETag_surfxml_route_cb_list); xbt_dynar_free(&STag_surfxml_link_ctn_cb_list); @@ -242,8 +220,6 @@ 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); @@ -257,9 +233,9 @@ void surf_parse_free_callbacks(void) } /* Stag and Etag parse functions */ +void ETag_surfxml_router(void) { /* ignored -- do not add content here */ } -void STag_surfxml_platform(void) -{ +void STag_surfxml_platform(void) { _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version); xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n " @@ -282,7 +258,10 @@ void STag_surfxml_platform(void) "This program is installed automatically with SimGrid, or " "available in the tools/ directory of the source archive."); - surfxml_call_cb_functions(STag_surfxml_platform_cb_list); + sg_platf_open(); +} +void ETag_surfxml_platform(void){ + sg_platf_close(); } void STag_surfxml_host(void){ @@ -292,137 +271,126 @@ void STag_surfxml_host(void){ xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); host.properties = current_property_set = xbt_dict_new(); - host.V_host_id = A_surfxml_host_id; - host.V_host_power_peak = get_cpu_power(A_surfxml_host_power); - host.V_host_power_scale = surf_parse_get_double( A_surfxml_host_availability); - host.V_host_core = surf_parse_get_int(A_surfxml_host_core); - host.V_host_power_trace = tmgr_trace_new(A_surfxml_host_availability_file); - host.V_host_state_trace = tmgr_trace_new(A_surfxml_host_state_file); + host.id = A_surfxml_host_id; + host.power_peak = get_cpu_power(A_surfxml_host_power); + host.power_scale = surf_parse_get_double( A_surfxml_host_availability); + host.core_amount = surf_parse_get_int(A_surfxml_host_core); + host.power_trace = tmgr_trace_new(A_surfxml_host_availability_file); + host.state_trace = tmgr_trace_new(A_surfxml_host_state_file); xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) || (A_surfxml_host_state == A_surfxml_host_state_OFF), "Invalid state"); if (A_surfxml_host_state == A_surfxml_host_state_ON) - host.V_host_state_initial = SURF_RESOURCE_ON; + host.initial_state = SURF_RESOURCE_ON; if (A_surfxml_host_state == A_surfxml_host_state_OFF) - host.V_host_state_initial = SURF_RESOURCE_OFF; - host.V_host_coord = A_surfxml_host_coordinates; + host.initial_state = SURF_RESOURCE_OFF; + host.coord = A_surfxml_host_coordinates; sg_platf_new_host(&host); - +} +void ETag_surfxml_host(void) { current_property_set = NULL; } -void ETag_surfxml_host(void){ /* ignored -- do not add content here */ } - void STag_surfxml_router(void){ s_sg_platf_router_cbarg_t router; memset(&router, 0, sizeof(router)); - router.V_router_id = A_surfxml_router_id; - router.V_router_coord = A_surfxml_router_coordinates; - sg_platf_new_router(&router); -} -void ETag_surfxml_router(void){ - surfxml_call_cb_functions(ETag_surfxml_router_cb_list); + router.id = A_surfxml_router_id; + router.coord = A_surfxml_router_coordinates; + sg_platf_new_router(&router); } void STag_surfxml_cluster(void){ struct_cluster = xbt_new0(s_surf_parsing_cluster_arg_t, 1); - struct_cluster->V_cluster_id = A_surfxml_cluster_id; - struct_cluster->V_cluster_prefix = A_surfxml_cluster_prefix; - struct_cluster->V_cluster_suffix = A_surfxml_cluster_suffix; - struct_cluster->V_cluster_radical = A_surfxml_cluster_radical; - struct_cluster->S_cluster_power= surf_parse_get_double(A_surfxml_cluster_power); - struct_cluster->S_cluster_core = surf_parse_get_int(A_surfxml_cluster_core); - struct_cluster->S_cluster_bw = surf_parse_get_double(A_surfxml_cluster_bw); - struct_cluster->S_cluster_lat = surf_parse_get_double(A_surfxml_cluster_lat); + 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); if(strcmp(A_surfxml_cluster_bb_bw,"")) - struct_cluster->S_cluster_bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw); + struct_cluster->bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw); if(strcmp(A_surfxml_cluster_bb_lat,"")) - struct_cluster->S_cluster_bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat); - if(!strcmp(A_surfxml_cluster_router_id,"")) - struct_cluster->S_cluster_router_id = bprintf("%s%s_router%s", - struct_cluster->V_cluster_prefix, - struct_cluster->V_cluster_id, - struct_cluster->V_cluster_suffix); - else - struct_cluster->S_cluster_router_id = A_surfxml_cluster_router_id; + struct_cluster->bb_lat = surf_parse_get_double(A_surfxml_cluster_bb_lat); + struct_cluster->router_id = A_surfxml_cluster_router_id; - struct_cluster->V_cluster_sharing_policy = AX_surfxml_cluster_sharing_policy; - struct_cluster->V_cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy; + struct_cluster->sharing_policy = AX_surfxml_cluster_sharing_policy; + struct_cluster->bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy; - struct_cluster->V_cluster_availability_file = xbt_strdup(A_surfxml_cluster_availability_file); - struct_cluster->V_cluster_state_file = xbt_strdup(A_surfxml_cluster_state_file); + struct_cluster->availability_trace = A_surfxml_cluster_availability_file; + struct_cluster->state_trace = A_surfxml_cluster_state_file; surfxml_call_cb_functions(STag_surfxml_cluster_cb_list); } 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->S_cluster_router_id); - xbt_free(struct_cluster->V_cluster_availability_file); - xbt_free(struct_cluster->V_cluster_state_file); xbt_free(struct_cluster); } void STag_surfxml_peer(void){ - struct_peer = xbt_new0(s_surf_parsing_peer_arg_t, 1); - struct_peer->V_peer_id = xbt_strdup(A_surfxml_peer_id); - struct_peer->V_peer_power = xbt_strdup(A_surfxml_peer_power); - struct_peer->V_peer_bw_in = xbt_strdup(A_surfxml_peer_bw_in); - struct_peer->V_peer_bw_out = xbt_strdup(A_surfxml_peer_bw_out); - struct_peer->V_peer_lat = xbt_strdup(A_surfxml_peer_lat); - struct_peer->V_peer_coord = xbt_strdup(A_surfxml_peer_coordinates); - struct_peer->V_peer_availability_trace = xbt_strdup(A_surfxml_peer_availability_file); - struct_peer->V_peer_state_trace = xbt_strdup(A_surfxml_peer_state_file); + s_surf_parsing_peer_arg_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->V_peer_id); - xbt_free(struct_peer->V_peer_power); - xbt_free(struct_peer->V_peer_bw_in); - xbt_free(struct_peer->V_peer_bw_out); - xbt_free(struct_peer->V_peer_lat); - xbt_free(struct_peer->V_peer_coord); - xbt_free(struct_peer->V_peer_availability_trace); - xbt_free(struct_peer->V_peer_state_trace); - xbt_free(struct_peer); + /* nothing to do here */ } void STag_surfxml_link(void){ - struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1); - struct_lnk->V_link_id = A_surfxml_link_id; - struct_lnk->V_link_bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth); - struct_lnk->V_link_bandwidth_file = tmgr_trace_new(A_surfxml_link_bandwidth_file); - struct_lnk->V_link_latency = surf_parse_get_double(A_surfxml_link_latency); - struct_lnk->V_link_latency_file = tmgr_trace_new(A_surfxml_link_latency_file); - xbt_assert((A_surfxml_link_state == A_surfxml_link_state_ON) || - (A_surfxml_link_state == A_surfxml_link_state_OFF), "Invalid state"); - if (A_surfxml_link_state == A_surfxml_link_state_ON) - struct_lnk->V_link_state = SURF_RESOURCE_ON; - if (A_surfxml_link_state == A_surfxml_link_state_OFF) - struct_lnk->V_link_state = SURF_RESOURCE_OFF; - struct_lnk->V_link_state_file = tmgr_trace_new(A_surfxml_link_state_file); - struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy; - - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - struct_lnk->V_policy_initial_link = SURF_LINK_SHARED; - else - { - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) - struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE; - else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) - struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX; + s_sg_platf_link_cbarg_t link; + memset(&link,0,sizeof(link)); + + xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); + link.properties = current_property_set = xbt_dict_new(); + + link.id = A_surfxml_link_id; + link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth); + link.bandwidth_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); + link.latency = surf_parse_get_double(A_surfxml_link_latency); + link.latency_trace = tmgr_trace_new(A_surfxml_link_latency_file); + + switch (A_surfxml_link_state) { + case A_surfxml_link_state_ON: + link.state = SURF_RESOURCE_ON; + break; + case A_surfxml_link_state_OFF: + link.state = SURF_RESOURCE_OFF; + break; + default: + surf_parse_error(bprintf("invalid state for link %s",link.id)); + } + link.state_trace = tmgr_trace_new(A_surfxml_link_state_file); + + switch (A_surfxml_link_sharing_policy) { + case A_surfxml_link_sharing_policy_SHARED: + link.policy = SURF_LINK_SHARED; + break; + case A_surfxml_link_sharing_policy_FATPIPE: + link.policy = SURF_LINK_FATPIPE; + break; + case A_surfxml_link_sharing_policy_FULLDUPLEX: + link.policy = SURF_LINK_FULLDUPLEX; + break; + default: + surf_parse_error(bprintf("Invalid sharing policy in link %s",link.id)); } - surf_parse_link(); -} -void surf_parse_link(void){ - surfxml_call_cb_functions(STag_surfxml_link_cb_list); + sg_platf_new_link(&link); } void ETag_surfxml_link(void){ - surfxml_call_cb_functions(ETag_surfxml_link_cb_list); - xbt_free(struct_lnk); + current_property_set = NULL; } void STag_surfxml_route(void){ @@ -447,7 +415,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_open(A_surfxml_AS_id,A_surfxml_AS_routing); +} +void ETag_surfxml_AS(void){ + sg_platf_new_AS_close(); } void STag_surfxml_ASroute(void){ surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list); @@ -475,7 +446,7 @@ void ETag_surfxml_config(void){ free(cfg); } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); - current_property_set = NULL; + xbt_dict_free(¤t_property_set); } void STag_surfxml_random(void){ surfxml_call_cb_functions(STag_surfxml_random_cb_list); @@ -484,7 +455,6 @@ void STag_surfxml_random(void){ #define parse_method(type,name) \ void type##Tag_surfxml_##name(void) \ { surfxml_call_cb_functions(type##Tag_surfxml_##name##_cb_list); } -parse_method(E, platform); parse_method(E, route); parse_method(E, link_ctn); parse_method(E, process); @@ -493,7 +463,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); @@ -587,7 +556,6 @@ static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list) void parse_properties(const char* prop_id, const char* prop_value) { - char *value = NULL; if (!current_property_set) current_property_set = xbt_dict_new(); // Maybe, it should raise an error if(!strcmp(prop_id,"coordinates")){ @@ -601,8 +569,7 @@ void parse_properties(const char* prop_id, const char* prop_value) xbt_die("Setting XML prop coordinates must be \"yes\""); } else{ - value = xbt_strdup(prop_value); - xbt_dict_set(current_property_set, prop_id, value, free); + xbt_dict_set(current_property_set, prop_id, xbt_strdup(prop_value), free); } } @@ -664,130 +631,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); -} - -/* - * add host to the network element list - */ -void surf_route_add_host(const char *host_id) -{ - routing_add_host(host_id); -} - -/** - * 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(); -}