From: Martin Quinson Date: Thu, 3 Nov 2011 14:00:23 +0000 (+0100) Subject: split raw parsing functions from platform parsing, which is somehow similar to the... X-Git-Tag: exp_20120216~518 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/513baa2ee64b3db9b8697c61123715e6892afb4e?hp=08ce0edd12b2c42378cc228a91d37613bbc2acbc split raw parsing functions from platform parsing, which is somehow similar to the deployment parsing done in simix --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index b3b8e898d1..02bff444e6 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -220,6 +220,7 @@ set(SURF_SRC src/surf/random_mgr.c src/surf/surf.c src/surf/surfxml_parse.c + src/surf/surfxml_parseplatf.c src/surf/cpu.c src/surf/network.c src/surf/network_im.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 6f03bf38d0..6337923e08 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. @@ -389,6 +341,8 @@ void ETag_surfxml_router(void){ } void STag_surfxml_cluster(void){ + surf_parse_models_setup(); /* ensure that the models are created after the last tag. See comment in simgrid.dtd */ + struct_cluster = xbt_new0(s_cluster_t, 1); struct_cluster->V_cluster_id = xbt_strdup(A_surfxml_cluster_id); struct_cluster->V_cluster_prefix = xbt_strdup(A_surfxml_cluster_prefix); @@ -432,6 +386,8 @@ void ETag_surfxml_cluster(void){ } void STag_surfxml_peer(void){ + surf_parse_models_setup(); /* ensure that the models are created after the last tag. See comment in simgrid.dtd */ + struct_peer = xbt_new0(s_peer_t, 1); struct_peer->V_peer_id = xbt_strdup(A_surfxml_peer_id); struct_peer->V_peer_power = xbt_strdup(A_surfxml_peer_power); @@ -636,53 +592,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 +625,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) diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c new file mode 100644 index 0000000000..6b906efa4f --- /dev/null +++ b/src/surf/surfxml_parseplatf.c @@ -0,0 +1,200 @@ +/* Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#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" + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); + +/* + * 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); + } +} + +/* + * Pass arguments to parsing callback as structures to save some time (and allow callbacks to ignore some) + */ + +hostSG_t struct_host = NULL; +router_t struct_router = NULL; +cluster_t struct_cluster = NULL; +peer_t struct_peer = NULL; +link_t struct_lnk = NULL; + + +/* + * Trace related stuff + */ + +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; + +static double trace_periodicity = -1.0; +static char *trace_file = NULL; +static char *trace_id = NULL; + +static void parse_Stag_trace(void) +{ + surf_parse_models_setup(); /* ensure that the models are created after the last tag. See comment in simgrid.dtd */ + 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) +{ + surf_parse_models_setup(); /* ensure that the models are created after the last tag. See comment in simgrid.dtd */ + + 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; + } +} + + +/* 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); +} + +/* This function acts as a main in the parsing area. */ +void parse_platform_file(const char *file) +{ + int parse_status; + + + surf_parse_reset_callbacks(); + surf_parse_add_callback_config(); + + 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); + + surf_config_models_create_elms(); +} +