X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf56a22da60094d8e7f14b1457526dc194d40226..2f3b2693d46e98f5feb274b9ecb6240a6790ceb7:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 348a8577d3..fc71eeb718 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -7,6 +7,7 @@ #include "xbt/misc.h" #include "xbt/log.h" +#include "xbt/str.h" #include "xbt/dict.h" #include "surf/surfxml_parse_private.h" #include "surf/surf_private.h" @@ -15,12 +16,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); #undef CLEANUP -#include "surfxml.c" +#include "simgrid_dtd.c" /* 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; @@ -472,7 +478,6 @@ void parse_properties(void) value = xbt_strdup(A_surfxml_prop_value); xbt_dict_set(current_property_set, A_surfxml_prop_id, value, free); - } void free_string(void *d) @@ -504,9 +509,14 @@ 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); - random_data_list = xbt_dict_new(); + + 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(); } void parse_platform_file(const char* file) @@ -526,16 +536,10 @@ static void parse_make_temporary_route(const char *src, const char *dst, int act A_surfxml_route_action = action; SURFXML_BUFFER_SET(route_src, src); SURFXML_BUFFER_SET(route_dst, dst); - SURFXML_BUFFER_SET(route_impact_on_src, "0.0"); - SURFXML_BUFFER_SET(route_impact_on_dst, "0.0"); - SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0"); - SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0"); } static void parse_change_cpu_data(const char* hostName, const char* surfxml_host_power, const char* surfxml_host_availability, - const char* surfxml_host_availability_file, const char* surfxml_host_state_file, - const char* surfxml_host_interference_send, const char* surfxml_host_interference_recv, - const char* surfxml_host_interference_send_recv, const char* surfxml_host_max_outgoing_rate) + const char* surfxml_host_availability_file, const char* surfxml_host_state_file) { int AX_ptr = 0; surfxml_bufferstack = xbt_new0(char, 2048); @@ -545,10 +549,6 @@ static void parse_change_cpu_data(const char* hostName, const char* surfxml_host SURFXML_BUFFER_SET(host_availability, surfxml_host_availability); SURFXML_BUFFER_SET(host_availability_file, surfxml_host_availability_file); SURFXML_BUFFER_SET(host_state_file, surfxml_host_state_file); - SURFXML_BUFFER_SET(host_interference_send, surfxml_host_interference_send); - SURFXML_BUFFER_SET(host_interference_recv, surfxml_host_interference_recv); - SURFXML_BUFFER_SET(host_interference_send_recv, surfxml_host_interference_send_recv); - SURFXML_BUFFER_SET(host_max_outgoing_rate, surfxml_host_max_outgoing_rate); } static void parse_change_link_data(const char* linkName, const char* surfxml_link_bandwidth, const char* surfxml_link_bandwidth_file, @@ -609,80 +609,103 @@ void parse_sets(void) xbt_dict_set(set_list, id, current_set, NULL); } +static const char* surfxml_host_power; +static const char* surfxml_host_availability; +static const char* surfxml_host_availability_file; +static const char* surfxml_host_state_file; + static void parse_host_foreach(void) +{ + surfxml_host_power = A_surfxml_host_power; + surfxml_host_availability = A_surfxml_host_availability; + surfxml_host_availability_file = A_surfxml_host_availability_file; + surfxml_host_state_file = A_surfxml_host_state_file; +} + +static void finalize_host_foreach(void) { xbt_dynar_t names = NULL; unsigned int cpt = 0; char *name; - const char* surfxml_host_power; - const char* surfxml_host_availability; - const char* surfxml_host_availability_file; - const char* surfxml_host_state_file; - const char* surfxml_host_interference_send; - const char* surfxml_host_interference_recv; - const char *surfxml_host_interference_send_recv; - const char* surfxml_host_max_outgoing_rate; + xbt_dict_cursor_t cursor = NULL; + char *key,*data; + + xbt_dict_t cluster_host_props = current_property_set; xbt_assert1((names = xbt_dict_get_or_null(set_list, foreach_set_name)), "Set name '%s' reffered by foreach tag not found.", foreach_set_name); xbt_assert1((strcmp(A_surfxml_host_id, "$1") == 0), "The id of the host within the foreach should point to the foreach set_id (use $1). Your value: %s", A_surfxml_host_id); - surfxml_host_power = A_surfxml_host_power; - surfxml_host_availability = A_surfxml_host_availability; - surfxml_host_availability_file = A_surfxml_host_availability_file; - surfxml_host_state_file = A_surfxml_host_state_file; - surfxml_host_interference_send = A_surfxml_host_interference_send; - surfxml_host_interference_recv = A_surfxml_host_interference_recv; - surfxml_host_interference_send_recv = A_surfxml_host_interference_send_recv; - surfxml_host_max_outgoing_rate = A_surfxml_host_max_outgoing_rate; - + /* foreach name in set call the main host callback */ xbt_dynar_foreach (names, cpt, name) { parse_change_cpu_data(name, surfxml_host_power, surfxml_host_availability, - surfxml_host_availability_file, surfxml_host_state_file, - surfxml_host_interference_send, surfxml_host_interference_recv, - surfxml_host_interference_send_recv, surfxml_host_max_outgoing_rate); + surfxml_host_availability_file, surfxml_host_state_file); surfxml_call_cb_functions(main_STag_surfxml_host_cb_list); + + xbt_dict_foreach(cluster_host_props,cursor,key,data) { + xbt_dict_set(current_property_set, xbt_strdup(key), xbt_strdup(data), free); + } + surfxml_call_cb_functions(main_ETag_surfxml_host_cb_list); free(surfxml_bufferstack); } + current_property_set = xbt_dict_new(); + surfxml_bufferstack = old_buff; } +static const char* surfxml_link_bandwidth; +static const char* surfxml_link_bandwidth_file; +static const char* surfxml_link_latency; +static const char* surfxml_link_latency_file; +static const char* surfxml_link_state_file; + static void parse_link_foreach(void) +{ + surfxml_link_bandwidth = A_surfxml_link_bandwidth; + surfxml_link_bandwidth_file = A_surfxml_link_bandwidth_file; + surfxml_link_latency = A_surfxml_link_latency; + surfxml_link_latency_file = A_surfxml_link_latency_file; + surfxml_link_state_file = A_surfxml_link_state_file; +} + +static void finalize_link_foreach(void) { xbt_dynar_t names = NULL; unsigned int cpt = 0; char *name; - const char* surfxml_link_bandwidth; - const char* surfxml_link_bandwidth_file; - const char* surfxml_link_latency; - const char* surfxml_link_latency_file; - const char* surfxml_link_state_file; + xbt_dict_cursor_t cursor = NULL; + char *key,*data; + + xbt_dict_t cluster_link_props = current_property_set; xbt_assert1((names = xbt_dict_get_or_null(set_list, foreach_set_name)), "Set name '%s' reffered by foreach tag not found.", foreach_set_name); xbt_assert1((strcmp(A_surfxml_link_id, "$1") == 0), "The id of the link within the foreach should point to the foreach set_id (use $1). Your value: %s", A_surfxml_link_id); - surfxml_link_bandwidth = A_surfxml_link_bandwidth; - surfxml_link_bandwidth_file = A_surfxml_link_bandwidth_file; - surfxml_link_latency = A_surfxml_link_latency; - surfxml_link_latency_file = A_surfxml_link_latency_file; - surfxml_link_state_file = A_surfxml_link_state_file; + /* for each name in set call the main link callback */ xbt_dynar_foreach (names, cpt, name) { parse_change_link_data(name, surfxml_link_bandwidth, surfxml_link_bandwidth_file, surfxml_link_latency, surfxml_link_latency_file, surfxml_link_state_file); surfxml_call_cb_functions(main_STag_surfxml_link_cb_list); + + xbt_dict_foreach(cluster_link_props,cursor,key,data) { + xbt_dict_set(current_property_set, xbt_strdup(key), xbt_strdup(data), free); + } + surfxml_call_cb_functions(main_ETag_surfxml_link_cb_list); free(surfxml_bufferstack); } + current_property_set = xbt_dict_new(); + surfxml_bufferstack = old_buff; } @@ -701,7 +724,9 @@ void parse_foreach(void) ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t),NULL); surfxml_add_callback(STag_surfxml_host_cb_list, &parse_host_foreach); + surfxml_add_callback(ETag_surfxml_host_cb_list, &finalize_host_foreach); surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_foreach); + surfxml_add_callback(ETag_surfxml_link_cb_list, &finalize_link_foreach); /* get set name */ foreach_set_name = xbt_strdup(A_surfxml_foreach_set_id); @@ -759,18 +784,18 @@ void manage_route(xbt_dict_t routing_table, const char *route_name, int action, DEBUG1("ROUTE: %s", route_name); if (links != NULL) { switch (action) { - case A_surfxml_route_c_multi_action_PREPEND: /* add existing links at the end; route_link_list + links */ + case A_surfxml_route_action_PREPEND: /* add existing links at the end; route_link_list + links */ xbt_dynar_foreach(links, cpt, value) { xbt_dynar_push(route_link_list,&value); } break; - case A_surfxml_route_c_multi_action_POSTPEND: /* add existing links in front; links + route_link_list */ + case A_surfxml_route_action_POSTPEND: /* add existing links in front; links + route_link_list */ xbt_dynar_foreach(route_link_list, cpt, value) { xbt_dynar_push(links,&value); } route_link_list = links; break; - case A_surfxml_route_c_multi_action_OVERRIDE: + case A_surfxml_route_action_OVERRIDE: break; default:break; } @@ -836,10 +861,17 @@ static void convert_route_multi_to_routes(void) unsigned int cpt, cpt2, cursor; char *src_host_name, *dst_host_name, *key, *src, *dst, *val, *key_w, *data_w; const char* sep="#"; + xbt_dict_t set; xbt_dynar_t src_names = NULL, dst_names = NULL, links; if (!route_multi_elements) return; + set = cpu_set; + DEBUG1("%d", xbt_dict_length(workstation_set)); + if (workstation_set != NULL && xbt_dict_length(workstation_set) > 0) + set = workstation_set; + + old_buff = surfxml_bufferstack; /* Get all routes in the exact order they were entered in the platform file */ xbt_dynar_foreach(route_multi_elements, cursor, key) { @@ -861,26 +893,31 @@ static void convert_route_multi_to_routes(void) src_names = xbt_dynar_new(sizeof(char *), &free_string); 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); 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); xbt_dynar_push(dst_names, &val); } + /* Build the routes */ DEBUG2("ADDING MULTI ROUTE: %s -> %s", xbt_dynar_get_as(keys, 0, char*), xbt_dynar_get_as(keys, 1, char*)); xbt_dynar_foreach(src_names, cpt, src_host_name) { xbt_dynar_foreach(dst_names, cpt2, dst_host_name) { /* If dst is $* then set this route to have its dst point to all hosts */ if (strcmp(src_host_name,"$*") != 0 && strcmp(dst_host_name,"$*") == 0){ - xbt_dict_foreach(workstation_set, cursor_w, key_w, data_w) { + xbt_dict_foreach(set, cursor_w, key_w, data_w) { //int n = xbt_dynar_member(src_names, (char*)key_w); add_multi_links(src, dst, links, src_host_name, key_w); } } /* If src is $* then set this route to have its dst point to all hosts */ if (strcmp(src_host_name,"$*") == 0 && strcmp(dst_host_name,"$*") != 0){ - xbt_dict_foreach(workstation_set, cursor_w, key_w, data_w) { + xbt_dict_foreach(set, cursor_w, key_w, data_w) { // if (!symmetric || (symmetric && !contains(dst_names, key_w))) add_multi_links(src, dst, links, key_w, dst_host_name); } @@ -935,7 +972,7 @@ void parse_cluster(void) SURFXML_START_TAG(foreach); /* Make host for the foreach */ - parse_change_cpu_data("$1", cluster_power, "1.0", "", "", "1.0", "1.0", "1.0","-1.0"); + parse_change_cpu_data("$1", cluster_power, "1.0", "", ""); A_surfxml_host_state = A_surfxml_host_state_ON; SURFXML_START_TAG(host); @@ -1025,12 +1062,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_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free); + break; + case A_surfxml_trace_c_connect_kind_POWER: + xbt_dict_set(trace_connect_list_power, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free); + break; + case A_surfxml_trace_c_connect_kind_LINK_AVAIL: + xbt_dict_set(trace_connect_list_link_avail, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free); + break; + case A_surfxml_trace_c_connect_kind_BANDWIDTH: + xbt_dict_set(trace_connect_list_bandwidth, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free); + break; + case A_surfxml_trace_c_connect_kind_LATENCY: + xbt_dict_set(trace_connect_list_latency, A_surfxml_trace_c_connect_element, xbt_strdup(A_surfxml_trace_c_connect_trace), free); + break; + default: + xbt_die("kind of trace unknown"); + } } /* Random tag functions */ @@ -1074,6 +1127,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); } +