X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a95e6bf7b637ba63f3d668b005deb91071c00c1a..fb17c31966c617a068f0d69d3a419041150d905d:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 0d952e2380..1f110ecf67 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -21,20 +21,24 @@ 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); } -void surf_parse_get_double(double *value, const char *string) { - int ret = sscanf(string, "%lg", value); +double surf_parse_get_double(const char *string) { + double res; + int ret = sscanf(string, "%lg", &res); if (ret != 1) surf_parse_error(bprintf("%s is not a double", string)); + return res; } -void surf_parse_get_int(int *value, const char *string) { - int ret = sscanf(string, "%d", value); +int surf_parse_get_int(const char *string) { + int res; + int ret = sscanf(string, "%d", &res); if (ret != 1) surf_parse_error(bprintf("%s is not an integer", string)); + return res; } @@ -44,15 +48,6 @@ void surf_parse_get_int(int *value, 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 surf_parse_host_cb_list = NULL; // of functions of type: surf_parsing_host_arg_t -> void -xbt_dynar_t STag_surfxml_platform_cb_list = NULL; -xbt_dynar_t ETag_surfxml_platform_cb_list = NULL; -xbt_dynar_t ETag_surfxml_host_cb_list = NULL; -xbt_dynar_t STag_surfxml_router_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; @@ -153,18 +148,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? - surf_parse_host_cb_list = xbt_dynar_new(sizeof(surf_parse_host_fct_t), NULL); - - ETag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - 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 = @@ -221,15 +206,8 @@ void surf_parse_reset_callbacks(void) void surf_parse_free_callbacks(void) { - xbt_dynar_free(&surf_parse_host_cb_list); - - xbt_dynar_free(&STag_surfxml_platform_cb_list); - xbt_dynar_free(&ETag_surfxml_platform_cb_list); - xbt_dynar_free(&ETag_surfxml_host_cb_list); - xbt_dynar_free(&STag_surfxml_router_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); + sg_platf_exit(); // FIXME: better place? + 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); @@ -261,11 +239,10 @@ 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) -{ - double version; - surf_parse_get_double(&version, A_surfxml_platform_version); +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 " "You're using an ancient XML file.\n" @@ -287,80 +264,70 @@ 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){ -// XBT_INFO("STag_surfxml_host [%s]",A_surfxml_host_id); - s_surf_parsing_host_arg_t host; + s_sg_platf_host_cbarg_t host; memset(&host,0,sizeof(host)); - host.V_host_id = xbt_strdup(A_surfxml_host_id); - host.V_host_power_peak = get_cpu_power(A_surfxml_host_power); - surf_parse_get_double(&(host.V_host_power_scale), A_surfxml_host_availability); - surf_parse_get_int(&(host.V_host_core),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); + 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.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 = xbt_strdup(A_surfxml_host_coordinates); + host.initial_state = SURF_RESOURCE_OFF; + host.coord = A_surfxml_host_coordinates; - surf_parse_host(&host); -} -void surf_parse_host(surf_parsing_host_arg_t h){ - unsigned int iterator; - surf_parse_host_fct_t fun; - xbt_dynar_foreach(surf_parse_host_cb_list, iterator, fun) { - if (fun) (*fun) (h); - } + sg_platf_new_host(&host); } -void surf_parse_host_add_cb(surf_parse_host_fct_t fct) { - xbt_dynar_push(surf_parse_host_cb_list, &fct); -} -void ETag_surfxml_host(void){ - surfxml_call_cb_functions(ETag_surfxml_host_cb_list); +void ETag_surfxml_host(void) { + current_property_set = NULL; } - void STag_surfxml_router(void){ - struct_router = xbt_new0(s_surf_parsing_router_arg_t, 1); - struct_router->V_router_id = xbt_strdup(A_surfxml_router_id); - struct_router->V_router_coord = xbt_strdup(A_surfxml_router_coordinates); - surfxml_call_cb_functions(STag_surfxml_router_cb_list); -} -void ETag_surfxml_router(void){ - surfxml_call_cb_functions(ETag_surfxml_router_cb_list); - xbt_free(struct_router->V_router_id); - xbt_free(struct_router->V_router_coord); - xbt_free(struct_router); + 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 STag_surfxml_cluster(void){ struct_cluster = xbt_new0(s_surf_parsing_cluster_arg_t, 1); - struct_cluster->V_cluster_id = xbt_strdup(A_surfxml_cluster_id); - struct_cluster->V_cluster_prefix = xbt_strdup(A_surfxml_cluster_prefix); - struct_cluster->V_cluster_suffix = xbt_strdup(A_surfxml_cluster_suffix); - struct_cluster->V_cluster_radical = xbt_strdup(A_surfxml_cluster_radical); - surf_parse_get_double(&struct_cluster->S_cluster_power,A_surfxml_cluster_power); - surf_parse_get_int(&struct_cluster->S_cluster_core,A_surfxml_cluster_core); - surf_parse_get_double(&struct_cluster->S_cluster_bw,A_surfxml_cluster_bw); - surf_parse_get_double(&struct_cluster->S_cluster_lat,A_surfxml_cluster_lat); + 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); if(strcmp(A_surfxml_cluster_bb_bw,"")) - surf_parse_get_double(&struct_cluster->S_cluster_bb_bw,A_surfxml_cluster_bb_bw); + struct_cluster->S_cluster_bb_bw = surf_parse_get_double(A_surfxml_cluster_bb_bw); if(strcmp(A_surfxml_cluster_bb_lat,"")) - surf_parse_get_double(&struct_cluster->S_cluster_bb_lat,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 = xbt_strdup(A_surfxml_cluster_router_id); + struct_cluster->S_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; @@ -372,11 +339,8 @@ void STag_surfxml_cluster(void){ } void ETag_surfxml_cluster(void){ surfxml_call_cb_functions(ETag_surfxml_cluster_cb_list); - xbt_free(struct_cluster->V_cluster_id); - xbt_free(struct_cluster->V_cluster_prefix); - xbt_free(struct_cluster->V_cluster_suffix); - xbt_free(struct_cluster->V_cluster_radical); - xbt_free(struct_cluster->S_cluster_router_id); + 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); @@ -407,40 +371,40 @@ void ETag_surfxml_peer(void){ xbt_free(struct_peer); } void STag_surfxml_link(void){ - struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1); - struct_lnk->V_link_id = xbt_strdup(A_surfxml_link_id); - surf_parse_get_double(&(struct_lnk->V_link_bandwidth),A_surfxml_link_bandwidth); - struct_lnk->V_link_bandwidth_file = tmgr_trace_new(A_surfxml_link_bandwidth_file); - surf_parse_get_double(&(struct_lnk->V_link_latency),A_surfxml_link_latency); - struct_lnk->V_link_latency_file = tmgr_trace_new(A_surfxml_link_latency_file); + 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.V_link_id = A_surfxml_link_id; + link.V_link_bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth); + link.V_link_bandwidth_file = tmgr_trace_new(A_surfxml_link_bandwidth_file); + link.V_link_latency = surf_parse_get_double(A_surfxml_link_latency); + link.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; + link.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; + link.V_link_state = SURF_RESOURCE_OFF; + link.V_link_state_file = tmgr_trace_new(A_surfxml_link_state_file); + link.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; + link.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; + link.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; + link.V_policy_initial_link = SURF_LINK_FULLDUPLEX; } - 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->V_link_id); - xbt_free(struct_lnk); + current_property_set = NULL; } void STag_surfxml_route(void){ @@ -493,7 +457,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); @@ -502,7 +466,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); @@ -605,7 +568,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")){ @@ -619,8 +581,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); } } @@ -653,7 +614,7 @@ double get_cpu_power(const char *power) power_scale = random_generate(random); } } else { - surf_parse_get_double(&power_scale, power); + power_scale = surf_parse_get_double(power); } return power_scale; } @@ -665,11 +626,10 @@ char *random_id; static void init_randomness(void) { random_id = A_surfxml_random_id; - surf_parse_get_double(&random_min, A_surfxml_random_min); - surf_parse_get_double(&random_max, A_surfxml_random_max); - surf_parse_get_double(&random_mean, A_surfxml_random_mean); - surf_parse_get_double(&random_std_deviation, - A_surfxml_random_std_deviation); + random_min = surf_parse_get_double(A_surfxml_random_min); + random_max = surf_parse_get_double(A_surfxml_random_max); + random_mean = surf_parse_get_double(A_surfxml_random_mean); + random_std_deviation = surf_parse_get_double(A_surfxml_random_std_deviation); random_generator = A_surfxml_random_generator; } @@ -768,14 +728,6 @@ void* surf_wsL07_link_create_resource(char *name, properties); } -/* - * add host to the network element list - */ -void surf_route_add_host(const char *host_id) -{ - routing_add_host(host_id); -} - /** * set route */