X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4f777f30924d7890b9e1da29f9d1a637035531b..a95e6bf7b637ba63f3d668b005deb91071c00c1a:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 6f03bf38d0..0d952e2380 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -11,12 +11,6 @@ #include "surf/surfxml_parse_private.h" #include "surf/surf_private.h" -hostSG_t struct_host; -router_t struct_router; -cluster_t struct_cluster; -peer_t struct_peer; -link_t struct_lnk; - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module"); #undef CLEANUP @@ -43,48 +37,6 @@ void surf_parse_get_int(int *value, const char *string) { surf_parse_error(bprintf("%s is not an integer", string)); } -/* Initialize the parsing globals */ -xbt_dict_t traces_set_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; - -/* - * Allow the cluster tag to mess with the parsing buffer. - * (this will probably become obsolete once the cluster tag do not mess with the parsing callbacks directly) - */ - -/* This buffer is used to store the original buffer before substituting it by out own buffer. Useful for the cluster tag */ -static xbt_dynar_t surfxml_bufferstack_stack = NULL; -int surfxml_bufferstack_size = 2048; - -static char *old_buff = NULL; - -unsigned int surfxml_buffer_stack_stack_ptr; -unsigned int surfxml_buffer_stack_stack[1024]; - - -void surfxml_bufferstack_push(int new) -{ - if (!new) - old_buff = surfxml_bufferstack; - else { - xbt_dynar_push(surfxml_bufferstack_stack, &surfxml_bufferstack); - surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); - } -} - -void surfxml_bufferstack_pop(int new) -{ - if (!new) - surfxml_bufferstack = old_buff; - else { - free(surfxml_bufferstack); - xbt_dynar_pop(surfxml_bufferstack_stack, &surfxml_bufferstack); - } -} /* * All the callback lists that can be overiden anywhere. @@ -92,9 +44,10 @@ void surfxml_bufferstack_pop(int new) */ /* 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 STag_surfxml_host_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; @@ -126,8 +79,6 @@ 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; xbt_dynar_t ETag_surfxml_bypassRoute_cb_list = NULL; -xbt_dynar_t STag_surfxml_config_cb_list = NULL; -xbt_dynar_t ETag_surfxml_config_cb_list = NULL; xbt_dynar_t STag_surfxml_include_cb_list = NULL; xbt_dynar_t ETag_surfxml_include_cb_list = NULL; @@ -206,7 +157,9 @@ void surf_parse_init_callbacks(void) xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_platform_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); + + 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); @@ -254,10 +207,6 @@ void surf_parse_init_callbacks(void) xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_peer_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_config_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_config_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_include_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_include_cb_list = @@ -272,9 +221,10 @@ 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(&STag_surfxml_host_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); @@ -306,8 +256,6 @@ void surf_parse_free_callbacks(void) 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_config_cb_list); - xbt_dynar_free(&ETag_surfxml_config_cb_list); xbt_dynar_free(&STag_surfxml_include_cb_list); xbt_dynar_free(&ETag_surfxml_include_cb_list); } @@ -345,38 +293,42 @@ void STag_surfxml_platform(void) void STag_surfxml_host(void){ // XBT_INFO("STag_surfxml_host [%s]",A_surfxml_host_id); - struct_host = xbt_new0(s_hostSG_t, 1); - struct_host->V_host_id = xbt_strdup(A_surfxml_host_id); - struct_host->V_host_power_peak = get_cpu_power(A_surfxml_host_power); - surf_parse_get_double(&(struct_host->V_host_power_scale), A_surfxml_host_availability); - surf_parse_get_int(&(struct_host->V_host_core),A_surfxml_host_core); - struct_host->V_host_power_trace = tmgr_trace_new(A_surfxml_host_availability_file); - struct_host->V_host_state_trace = tmgr_trace_new(A_surfxml_host_state_file); + s_surf_parsing_host_arg_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((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) - struct_host->V_host_state_initial = SURF_RESOURCE_ON; + host.V_host_state_initial = SURF_RESOURCE_ON; if (A_surfxml_host_state == A_surfxml_host_state_OFF) - struct_host->V_host_state_initial = SURF_RESOURCE_OFF; - struct_host->V_host_coord = xbt_strdup(A_surfxml_host_coordinates); + host.V_host_state_initial = SURF_RESOURCE_OFF; + host.V_host_coord = xbt_strdup(A_surfxml_host_coordinates); - surfxml_call_cb_functions(STag_surfxml_host_cb_list); + 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); + } +} +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); - //xbt_free(struct_host->V_host_id); - struct_host->V_host_power_peak = 0.0; - struct_host->V_host_core = 0; - struct_host->V_host_power_scale = 0.0; - struct_host->V_host_state_initial = SURF_RESOURCE_ON; - struct_host->V_host_power_trace = NULL; - struct_host->V_host_state_trace = NULL; - xbt_free(struct_host->V_host_coord); - //xbt_free(host); } + void STag_surfxml_router(void){ - struct_router = xbt_new0(s_router_t, 1); + 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); @@ -389,17 +341,19 @@ void ETag_surfxml_router(void){ } void STag_surfxml_cluster(void){ - struct_cluster = xbt_new0(s_cluster_t, 1); + 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); - struct_cluster->S_cluster_power = xbt_strdup(A_surfxml_cluster_power); - struct_cluster->S_cluster_core = xbt_strdup(A_surfxml_cluster_core); - struct_cluster->S_cluster_bw = xbt_strdup(A_surfxml_cluster_bw); - struct_cluster->S_cluster_lat = xbt_strdup(A_surfxml_cluster_lat); - struct_cluster->S_cluster_bb_bw = xbt_strdup(A_surfxml_cluster_bb_bw); - struct_cluster->S_cluster_bb_lat = xbt_strdup(A_surfxml_cluster_bb_lat); + 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); + if(strcmp(A_surfxml_cluster_bb_bw,"")) + surf_parse_get_double(&struct_cluster->S_cluster_bb_bw,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); if(!strcmp(A_surfxml_cluster_router_id,"")) struct_cluster->S_cluster_router_id = bprintf("%s%s_router%s", struct_cluster->V_cluster_prefix, @@ -411,6 +365,9 @@ void STag_surfxml_cluster(void){ 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->V_cluster_availability_file = xbt_strdup(A_surfxml_cluster_availability_file); + struct_cluster->V_cluster_state_file = xbt_strdup(A_surfxml_cluster_state_file); + surfxml_call_cb_functions(STag_surfxml_cluster_cb_list); } void ETag_surfxml_cluster(void){ @@ -419,20 +376,14 @@ void ETag_surfxml_cluster(void){ 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_power); - xbt_free(struct_cluster->S_cluster_core); - xbt_free(struct_cluster->S_cluster_bw); - xbt_free(struct_cluster->S_cluster_lat); - xbt_free(struct_cluster->S_cluster_bb_bw); - xbt_free(struct_cluster->S_cluster_bb_lat); xbt_free(struct_cluster->S_cluster_router_id); - struct_cluster->V_cluster_sharing_policy = 0; - struct_cluster->V_cluster_bb_sharing_policy = 0; + 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_peer_t, 1); + 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); @@ -456,7 +407,7 @@ void ETag_surfxml_peer(void){ xbt_free(struct_peer); } void STag_surfxml_link(void){ - struct_lnk = xbt_new0(s_link_t, 1); + 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); @@ -481,19 +432,14 @@ void STag_surfxml_link(void){ struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX; } - + surf_parse_link(); +} +void surf_parse_link(void){ surfxml_call_cb_functions(STag_surfxml_link_cb_list); } void ETag_surfxml_link(void){ surfxml_call_cb_functions(ETag_surfxml_link_cb_list); xbt_free(struct_lnk->V_link_id); - struct_lnk->V_link_bandwidth = 0; - struct_lnk->V_link_bandwidth_file = NULL; - struct_lnk->V_link_latency = 0; - struct_lnk->V_link_latency_file = NULL; - struct_lnk->V_link_state = SURF_RESOURCE_ON; - struct_lnk->V_link_state_file = NULL; - struct_lnk->V_link_sharing_policy = 0; xbt_free(struct_lnk); } @@ -528,7 +474,26 @@ void STag_surfxml_bypassRoute(void){ surfxml_call_cb_functions(STag_surfxml_bypassRoute_cb_list); } void STag_surfxml_config(void){ - surfxml_call_cb_functions(STag_surfxml_config_cb_list); + XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); + xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); + current_property_set = xbt_dict_new(); + +} +void ETag_surfxml_config(void){ + xbt_dict_cursor_t cursor = NULL; + char *key; + char *elem; + char *cfg; + xbt_dict_foreach(current_property_set, cursor, key, elem) { + cfg = bprintf("%s:%s",key,elem); + if(xbt_cfg_is_default_value(_surf_cfg_set, key)) + xbt_cfg_set_parse(_surf_cfg_set, cfg); + else + XBT_INFO("The custom configuration '%s' is already defined by user!",key); + free(cfg); + } + XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); + current_property_set = NULL; } void STag_surfxml_random(void){ surfxml_call_cb_functions(STag_surfxml_random_cb_list); @@ -549,7 +514,6 @@ parse_method(E, random); parse_method(E, AS); parse_method(E, ASroute); parse_method(E, bypassRoute); -parse_method(E, config); /* Open and Close parse file */ @@ -636,53 +600,6 @@ static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t cb_list) } } -/* Init and free parse data */ - -static void init_data(void) -{ - if (!surfxml_bufferstack_stack) - surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL); - - traces_set_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(); - - surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_Stag_trace); - surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_Etag_trace); - surfxml_add_callback(STag_surfxml_trace_connect_cb_list, - &parse_Stag_trace_connect); -} - -static void free_data(void) -{ - xbt_dict_free(&trace_connect_list_host_avail); - xbt_dict_free(&trace_connect_list_power); - xbt_dict_free(&trace_connect_list_link_avail); - xbt_dict_free(&trace_connect_list_bandwidth); - xbt_dict_free(&trace_connect_list_latency); - xbt_dict_free(&traces_set_list); - xbt_dict_free(&random_data_list); - xbt_dynar_free(&surfxml_bufferstack_stack); -} - -/* Here start parse */ -void parse_platform_file(const char *file) -{ - int parse_status; - - surfxml_buffer_stack_stack_ptr = 1; - surfxml_buffer_stack_stack[0] = 0; - - surf_parse_open(file); - init_data(); - parse_status = surf_parse(); - free_data(); - surf_parse_close(); - xbt_assert(!parse_status, "Parse error in %s", file); -} /* Prop tag functions */ @@ -716,78 +633,6 @@ void parse_properties_XML(void) } -/* Trace management functions */ - -static double trace_periodicity = -1.0; -static char *trace_file = NULL; -static char *trace_id = NULL; - -static void parse_Stag_trace(void) -{ - trace_id = xbt_strdup(A_surfxml_trace_id); - trace_file = xbt_strdup(A_surfxml_trace_file); - surf_parse_get_double(&trace_periodicity, A_surfxml_trace_periodicity); -} - -static void parse_Etag_trace(void) -{ - tmgr_trace_t trace; - if (!trace_file || strcmp(trace_file, "") != 0) { - trace = tmgr_trace_new(trace_file); - } else { - if (strcmp(surfxml_pcdata, "") == 0) - trace = NULL; - else - trace = - tmgr_trace_new_from_string(trace_id, surfxml_pcdata, - trace_periodicity); - } - xbt_dict_set(traces_set_list, trace_id, (void *) trace, NULL); - xbt_free(trace_file); - trace_file = NULL; - xbt_free(trace_id); - trace_id = NULL; -} - -static void parse_Stag_trace_connect(void) -{ - xbt_assert(xbt_dict_get_or_null - (traces_set_list, A_surfxml_trace_connect_trace), - "Cannot connect trace %s to %s: trace unknown", - A_surfxml_trace_connect_trace, - A_surfxml_trace_connect_element); - - switch (A_surfxml_trace_connect_kind) { - case A_surfxml_trace_connect_kind_HOST_AVAIL: - xbt_dict_set(trace_connect_list_host_avail, - A_surfxml_trace_connect_trace, - xbt_strdup(A_surfxml_trace_connect_element), free); - break; - case A_surfxml_trace_connect_kind_POWER: - xbt_dict_set(trace_connect_list_power, A_surfxml_trace_connect_trace, - xbt_strdup(A_surfxml_trace_connect_element), free); - break; - case A_surfxml_trace_connect_kind_LINK_AVAIL: - xbt_dict_set(trace_connect_list_link_avail, - A_surfxml_trace_connect_trace, - xbt_strdup(A_surfxml_trace_connect_element), free); - break; - case A_surfxml_trace_connect_kind_BANDWIDTH: - xbt_dict_set(trace_connect_list_bandwidth, - A_surfxml_trace_connect_trace, - xbt_strdup(A_surfxml_trace_connect_element), free); - break; - case A_surfxml_trace_connect_kind_LATENCY: - xbt_dict_set(trace_connect_list_latency, A_surfxml_trace_connect_trace, - xbt_strdup(A_surfxml_trace_connect_element), free); - break; - default: - xbt_die("Cannot connect trace %s to %s: kind of trace unknown", - A_surfxml_trace_connect_trace, A_surfxml_trace_connect_element); - break; - } -} - /* Random tag functions */ double get_cpu_power(const char *power) @@ -923,21 +768,6 @@ void* surf_wsL07_link_create_resource(char *name, properties); } -/** - * - *init new routing model component - */ - -void surf_AS_new(const char *AS_id, const char *AS_mode) -{ - routing_AS_init(AS_id, AS_mode); -} - -void surf_AS_finalize(const char *AS_id) -{ - routing_AS_end(AS_id); -} - /* * add host to the network element list */