X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02d733302bf8e265a9d623da98f251aad33d4414..86cd0192ed278be94c173e011ed9df47a555328a:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 07773ece91..3d1724a6bb 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -21,7 +21,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, /* Initialize the parsing globals */ int route_action = 0; xbt_dict_t traces_set_list = NULL; -xbt_dynar_t traces_connect_list = NULL; +//xbt_dynar_t traces_connect_list = NULL; +xbt_dict_t trace_connect_list_host_avail = NULL; +xbt_dict_t trace_connect_list_power = NULL; +xbt_dict_t trace_connect_list_link_avail = NULL; +xbt_dict_t trace_connect_list_bandwidth = NULL; +xbt_dict_t trace_connect_list_latency = NULL; /* This buffer is used to store the original buffer before substituing it by out own buffer. Usefull for the foreach tag */ char* old_buff; @@ -75,7 +80,7 @@ xbt_dict_t current_property_set = NULL; xbt_dict_t route_table = NULL; xbt_dict_t route_multi_table = NULL; xbt_dynar_t route_multi_elements = NULL; -xbt_dynar_t route_link_list = NULL; +static xbt_dynar_t route_link_list = NULL; xbt_dynar_t links = NULL; xbt_dynar_t keys = NULL; @@ -90,6 +95,7 @@ YY_BUFFER_STATE surf_input_buffer; FILE *surf_file_to_parse = NULL; static void convert_route_multi_to_routes(void); +static void parse_route_elem(void); void surf_parse_free_callbacks(void) { @@ -226,7 +232,6 @@ void ETag_surfxml_platform(void) xbt_dict_free(&random_data_list); xbt_dict_free(&set_list); - } void STag_surfxml_host(void) @@ -475,11 +480,6 @@ void parse_properties(void) xbt_dict_set(current_property_set, A_surfxml_prop_id, value, free); } -void free_string(void *d) -{ - free(*(void**)d); -} - void surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function) { xbt_dynar_push(cb_list, &function); @@ -495,7 +495,11 @@ static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list) } } -void init_data(void) +static void parse_route_set_endpoints(void) { + route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); +} + +static void init_data(void) { xbt_dict_free(&route_table); xbt_dynar_free(&route_link_list); @@ -504,15 +508,37 @@ void init_data(void) route_multi_table = xbt_dict_new(); route_multi_elements = xbt_dynar_new(sizeof(char*), NULL); traces_set_list = xbt_dict_new(); - traces_connect_list = xbt_dynar_new(sizeof(char*), NULL); + + trace_connect_list_host_avail = xbt_dict_new(); + trace_connect_list_power = xbt_dict_new(); + trace_connect_list_link_avail = xbt_dict_new(); + trace_connect_list_bandwidth = xbt_dict_new(); + trace_connect_list_latency = xbt_dict_new(); + random_data_list = xbt_dict_new(); + surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem); + surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints); +} + +static void free_data(void) +{ + char *key,*data; + xbt_dict_cursor_t cursor = NULL; + xbt_dict_foreach(route_table, cursor, key, data) { + xbt_dynar_t links = (xbt_dynar_t)data; + xbt_dynar_free(&links); + } + xbt_dict_free(&route_table); + route_link_list = NULL; } void parse_platform_file(const char* file) { surf_parse_open(file); + init_data(); xbt_assert1((!(*surf_parse)()), "Parse error in %s", file); + free_data(); surf_parse_close(); } @@ -591,7 +617,7 @@ void parse_sets(void) current_set = xbt_dynar_new(sizeof(char*), NULL); - for (i=start; i 0) set = workstation_set; @@ -879,14 +907,14 @@ static void convert_route_multi_to_routes(void) dst_names = (xbt_dynar_t)xbt_dict_get_or_null(set_list, dst); /* Add to dynar even if they are simple names */ if (src_names == NULL) { - src_names = xbt_dynar_new(sizeof(char *), &free_string); + src_names = xbt_dynar_new(sizeof(char *), &xbt_free_ref); val = xbt_strdup(src); xbt_dynar_push(src_names, &val); if (strcmp(val,"$*") != 0 && NULL == xbt_dict_get_or_null(set, val)) THROW3(unknown_error,0,"(In route:multi (%s -> %s) source %s does not exist (not a set or a host)", src, dst, src); } if (dst_names == NULL) { - dst_names = xbt_dynar_new(sizeof(char *), &free_string); + dst_names = xbt_dynar_new(sizeof(char *), &xbt_free_ref); val = xbt_strdup(dst); if (strcmp(val,"$*") != 0 && NULL == xbt_dict_get_or_null(set, val)) THROW3(unknown_error,0,"(In route:multi (%s -> %s) destination %s does not exist (not a set or a host)", src, dst, dst); @@ -1051,12 +1079,28 @@ void parse_trace_finalize(void) void parse_trace_c_connect(void) { - char* trace_connect; - xbt_assert1(xbt_dict_get_or_null(traces_set_list, A_surfxml_trace_c_connect_trace_id), - "Trace %s undefined", A_surfxml_trace_c_connect_trace_id); - trace_connect = bprintf("%s#%d#%d#%s", A_surfxml_trace_c_connect_trace_id, A_surfxml_trace_c_connect_element, - A_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_connector_id); - xbt_dynar_push(traces_connect_list, &trace_connect); + xbt_assert2(xbt_dict_get_or_null(traces_set_list, A_surfxml_trace_c_connect_trace), + "Cannot connect trace %s to %s: trace unknown", A_surfxml_trace_c_connect_trace,A_surfxml_trace_c_connect_element); + + switch (A_surfxml_trace_c_connect_kind) { + case A_surfxml_trace_c_connect_kind_HOST_AVAIL: + xbt_dict_set(trace_connect_list_host_avail, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free); + break; + case A_surfxml_trace_c_connect_kind_POWER: + xbt_dict_set(trace_connect_list_power, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free); + break; + case A_surfxml_trace_c_connect_kind_LINK_AVAIL: + xbt_dict_set(trace_connect_list_link_avail, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free); + break; + case A_surfxml_trace_c_connect_kind_BANDWIDTH: + xbt_dict_set(trace_connect_list_bandwidth, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free); + break; + case A_surfxml_trace_c_connect_kind_LATENCY: + xbt_dict_set(trace_connect_list_latency, A_surfxml_trace_c_connect_trace, xbt_strdup(A_surfxml_trace_c_connect_element), free); + break; + default: + xbt_die("kind of trace unknown"); + } } /* Random tag functions */ @@ -1100,7 +1144,7 @@ void init_randomness(void) void add_randomness(void) { /* If needed aditional properties can be added by using the prop tag */ - random_data_t random = random_new(random_generator, random_min, random_max, random_mean, random_std_deviation); + random_data_t random = random_new(random_generator, 0, random_min, random_max, random_mean, random_std_deviation); xbt_dict_set(random_data_list, random_id, (void *)random, NULL); }