-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* 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
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
"Logging specific to the SURF parsing module");
#undef CLEANUP
-#include "simgrid_dtd.c"
-
-/* 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;
-
-/* This buffer is used to store the original buffer before substituting it by out own buffer. Useful for the foreach tag */
-static xbt_dynar_t surfxml_bufferstack_stack = NULL;
-int surfxml_bufferstack_size = 2048;
+int ETag_surfxml_include_state(void);
-static char *old_buff = NULL;
-static void surf_parse_error(char *msg);
-
-unsigned int surfxml_buffer_stack_stack_ptr;
-unsigned int surfxml_buffer_stack_stack[1024];
+#include "simgrid_dtd.c"
+/*
+ * Helping functions
+ */
+static void surf_parse_error(char *msg) {
+ xbt_die("Parse error on line %d: %s\n", surf_parse_lineno, msg);
+}
-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 surf_parse_get_double(double *value, const char *string) {
+ int ret = sscanf(string, "%lg", value);
+ if (ret != 1)
+ surf_parse_error(bprintf("%s is not a double", string));
}
-void surfxml_bufferstack_pop(int new)
-{
- if (!new)
- surfxml_bufferstack = old_buff;
- else {
- free(surfxml_bufferstack);
- xbt_dynar_pop(surfxml_bufferstack_stack, &surfxml_bufferstack);
- }
+void surf_parse_get_int(int *value, const char *string) {
+ int ret = sscanf(string, "%d", value);
+ if (ret != 1)
+ surf_parse_error(bprintf("%s is not an integer", string));
}
-/* make sure these symbols are defined as strong ones in this file so that the linked can resolve them */
+
+/*
+ * All the callback lists that can be overiden anywhere.
+ * (this list should probably be reduced to the bare minimum to allow the models to work)
+ */
+
+/* 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;
xbt_dynar_t STag_surfxml_include_cb_list = NULL;
xbt_dynar_t ETag_surfxml_include_cb_list = NULL;
-/* store the current property set for any tag */
+/* The default current property receiver. Setup in the corresponding opening callbacks. */
xbt_dict_t current_property_set = NULL;
/* dictionary of random generator data */
xbt_dict_t random_data_list = NULL;
+/* Call all the callbacks of a specific SAX event */
static XBT_INLINE void surfxml_call_cb_functions(xbt_dynar_t);
YY_BUFFER_STATE surf_input_buffer;
FILE *surf_file_to_parse = NULL;
-static void surf_parse_error(char *msg);
-
static void parse_Stag_trace(void);
static void parse_Etag_trace(void);
static void parse_Stag_trace_connect(void);
static void init_randomness(void);
static void add_randomness(void);
+/*
+ * Stuff relative to the <include> tag
+ */
+
static xbt_dynar_t surf_input_buffer_stack = NULL;
static xbt_dynar_t surf_file_to_parse_stack = NULL;
void STag_surfxml_include(void)
{
XBT_INFO("STag_surfxml_include '%s'",A_surfxml_include_file);
- xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse);
+ xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse); //save old filename
- surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r");
+ surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r"); // read new filename
xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n",
A_surfxml_include_file);
+ xbt_dynar_push(surf_input_buffer_stack,&surf_input_buffer);
surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
surf_parse_push_buffer_state(surf_input_buffer);
fflush(NULL);
}
-void ETag_surfxml_include(void)
+void ETag_surfxml_include(void) {
+/* Nothing to do when done with reading the include tag.
+ * Instead, the handling should be deferred until the EOF of current buffer -- see below */
+}
+
+/** @brief When reaching EOF, check whether we are in an include tag, and behave accordingly if yes
+ *
+ * This function is called automatically by sedding the parser in buildtools/Cmake/MaintainerMode.cmake
+ * Every FAIL on "Premature EOF" is preceded by a call to this function, which role is to restore the
+ * previous buffer if we reached the EOF /of an include file/. Its return code is used to avoid the
+ * error message in that case.
+ *
+ * Yeah, that's terribly hackish, but it works. A better solution should be dealed with in flexml
+ * directly: a command line flag could instruct it to do the correct thing when #include is encountered
+ * on a line.
+ */
+int ETag_surfxml_include_state(void)
{
fflush(NULL);
+ XBT_INFO("ETag_surfxml_include_state '%s'",A_surfxml_include_file);
+ if(xbt_dynar_length(surf_input_buffer_stack)!= 0)
+ return 1;
fclose(surf_file_to_parse);
xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse);
surf_parse_pop_buffer_state();
- XBT_INFO("ETag_surfxml_include '%s'",A_surfxml_include_file);
+ xbt_dynar_pop(surf_input_buffer_stack,surf_input_buffer);
+ return 0;
}
-/*
- * This function return 0 or 1 if callbacks are empty or not.
- */
-int surf_parse_no_callbacks(void)
-{
- return xbt_dynar_is_empty(STag_surfxml_platform_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_platform_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_host_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_host_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_router_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_router_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_link_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_link_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_route_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_route_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_link_ctn_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_link_ctn_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_process_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_process_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_argument_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_argument_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_prop_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_prop_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_trace_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_trace_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_trace_connect_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_trace_connect_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_random_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_random_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_AS_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_AS_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_ASroute_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_ASroute_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_bypassRoute_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_bypassRoute_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_cluster_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_cluster_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_peer_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_peer_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_config_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_config_cb_list) &&
- xbt_dynar_is_empty(STag_surfxml_include_cb_list) &&
- xbt_dynar_is_empty(ETag_surfxml_include_cb_list);
-}
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);
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);
void STag_surfxml_platform(void)
{
- double version = 0.0;
-
- sscanf(A_surfxml_platform_version, "%lg", &version);
+ double version;
+ surf_parse_get_double(&version, A_surfxml_platform_version);
xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
"You're using an ancient XML file.\n"
}
+void STag_surfxml_host(void){
+// XBT_INFO("STag_surfxml_host [%s]",A_surfxml_host_id);
+ 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)
+ host.V_host_state_initial = 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);
+
+ 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);
+}
+
+
+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);
+}
+
+void STag_surfxml_cluster(void){
+ surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag. See comment in simgrid.dtd */
+
+ 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);
+ 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,
+ 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->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){
+ 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);
+ 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){
+ surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag. See comment in simgrid.dtd */
+
+ 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);
+ struct_peer->V_peer_bw_out = xbt_strdup(A_surfxml_peer_bw_out);
+ struct_peer->V_peer_lat = xbt_strdup(A_surfxml_peer_lat);
+ struct_peer->V_peer_coord = xbt_strdup(A_surfxml_peer_coordinates);
+ struct_peer->V_peer_availability_trace = xbt_strdup(A_surfxml_peer_availability_file);
+ struct_peer->V_peer_state_trace = xbt_strdup(A_surfxml_peer_state_file);
+ surfxml_call_cb_functions(STag_surfxml_peer_cb_list);
+}
+void ETag_surfxml_peer(void){
+ surfxml_call_cb_functions(ETag_surfxml_peer_cb_list);
+ xbt_free(struct_peer->V_peer_id);
+ xbt_free(struct_peer->V_peer_power);
+ xbt_free(struct_peer->V_peer_bw_in);
+ xbt_free(struct_peer->V_peer_bw_out);
+ xbt_free(struct_peer->V_peer_lat);
+ xbt_free(struct_peer->V_peer_coord);
+ xbt_free(struct_peer->V_peer_availability_trace);
+ xbt_free(struct_peer->V_peer_state_trace);
+ 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);
+ 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;
+ 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;
+
+ if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
+ struct_lnk->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;
+ else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+ 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);
+ xbt_free(struct_lnk);
+}
+
+void STag_surfxml_route(void){
+ surfxml_call_cb_functions(STag_surfxml_route_cb_list);
+}
+void STag_surfxml_link_ctn(void){
+ surfxml_call_cb_functions(STag_surfxml_link_ctn_cb_list);
+}
+void STag_surfxml_process(void){
+ surfxml_call_cb_functions(STag_surfxml_process_cb_list);
+}
+void STag_surfxml_argument(void){
+ surfxml_call_cb_functions(STag_surfxml_argument_cb_list);
+}
+void STag_surfxml_prop(void){
+ surfxml_call_cb_functions(STag_surfxml_prop_cb_list);
+}
+void STag_surfxml_trace(void){
+ surfxml_call_cb_functions(STag_surfxml_trace_cb_list);
+}
+void STag_surfxml_trace_connect(void){
+ surfxml_call_cb_functions(STag_surfxml_trace_connect_cb_list);
+}
+void STag_surfxml_AS(void){
+ surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag. See comment in simgrid.dtd */
+
+ surfxml_call_cb_functions(STag_surfxml_AS_cb_list);
+}
+void STag_surfxml_ASroute(void){
+ surfxml_call_cb_functions(STag_surfxml_ASroute_cb_list);
+}
+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);
+}
+void STag_surfxml_random(void){
+ surfxml_call_cb_functions(STag_surfxml_random_cb_list);
+}
+
#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(S, host);
-parse_method(E, host);
-parse_method(S, router);
-parse_method(E, router);
-parse_method(S, link);
-parse_method(E, link);
-parse_method(S, route);
parse_method(E, route);
-parse_method(S, link_ctn);
parse_method(E, link_ctn);
-parse_method(S, process);
parse_method(E, process);
-parse_method(S, argument);
parse_method(E, argument);
-parse_method(S, prop);
parse_method(E, prop);
-parse_method(S, trace);
parse_method(E, trace);
-parse_method(S, trace_connect);
parse_method(E, trace_connect);
-parse_method(S, random);
parse_method(E, random);
-parse_method(S, AS);
parse_method(E, AS);
-parse_method(S, ASroute);
parse_method(E, ASroute);
-parse_method(S, bypassRoute);
parse_method(E, bypassRoute);
-parse_method(S, cluster);
-parse_method(E, cluster);
-parse_method(S, peer);
-parse_method(E, peer);
-parse_method(S, config);
parse_method(E, config);
/* Open and Close parse file */
if (!file) {
if (!warned) {
XBT_WARN
- ("Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.");
+ ("Bypassing the XML parser since surf_parse_open received a NULL pointer. "
+ "If it is not what you want, go fix your code.");
warned = 1;
}
return;
}
if (!surf_input_buffer_stack)
- surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL);
+ surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL);
if (!surf_file_to_parse_stack)
- surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL);
+ surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL);
surf_file_to_parse = surf_fopen(file, "r");
xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file);
void surf_parse_close(void)
{
if (surf_input_buffer_stack)
- xbt_dynar_free(&surf_input_buffer_stack);
+ xbt_dynar_free(&surf_input_buffer_stack);
if (surf_file_to_parse_stack)
- xbt_dynar_free(&surf_file_to_parse_stack);
+ xbt_dynar_free(&surf_file_to_parse_stack);
if (surf_file_to_parse) {
surf_parse__delete_buffer(surf_input_buffer);
}
}
-/* Parse Function */
+/* Call the lexer to parse the currently opened file. This pointer to function enables bypassing of the parser */
-static int _surf_parse(void)
-{
+static int _surf_parse(void) {
return surf_parse_lex();
}
-
int_f_void_t surf_parse = _surf_parse;
-void surf_parse_error(char *msg)
-{
- fprintf(stderr, "Parse error on line %d: %s\n", surf_parse_lineno, msg);
- abort();
-}
-
-void surf_parse_get_double(double *value, const char *string)
-{
- int ret = 0;
- ret = sscanf(string, "%lg", value);
- if (ret != 1)
- surf_parse_error(bprintf("%s is not a double", string));
-}
-
-void surf_parse_get_int(int *value, const char *string)
-{
- int ret = 0;
- ret = sscanf(string, "%d", value);
- if (ret != 1)
- surf_parse_error(bprintf("%s is not an integer", string));
-}
/* Aux parse functions */
TRY {
it = xbt_dynar_search(cb_list,&function);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category == not_found_error) {
xbt_ex_free(e);
xbt_die("Trying to remove a callback that is not here! This should not happen");
}
}
-/* 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 */
-void parse_properties(void)
-{
- char *value = NULL;
- if (!current_property_set)
- current_property_set = xbt_dict_new(); // Maybe, it should be make a error
- if(!strcmp(A_surfxml_prop_id,"coordinates")){
- if(!strcmp(A_surfxml_prop_value,"yes") && !COORD_HOST_LEVEL)
- {
- XBT_INFO("Configuration change: Set '%s' to '%s'", A_surfxml_prop_id, A_surfxml_prop_value);
- COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
- COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
+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")){
+ if(!strcmp(prop_value,"yes") && !COORD_HOST_LEVEL)
+ {
+ XBT_INFO("Configuration change: Set '%s' to '%s'", prop_id, prop_value);
+ COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+ COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
+ }
+ if(strcmp(A_surfxml_prop_value,"yes"))
+ xbt_die("Setting XML prop coordinates must be \"yes\"");
}
- if(strcmp(A_surfxml_prop_value,"yes"))
- xbt_die("Setting XML prop coordinates must be \"yes\"");
- }
- else{
- value = xbt_strdup(A_surfxml_prop_value);
- xbt_dict_set(current_property_set, A_surfxml_prop_id, value, free);
- }
+ else{
+ value = xbt_strdup(prop_value);
+ xbt_dict_set(current_property_set, prop_id, value, free);
+ }
}
-/* 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)
+/**
+ * With XML parser
+ */
+void parse_properties_XML(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;
+ parse_properties(A_surfxml_prop_id, A_surfxml_prop_value);
}
-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);
- }
-}
/* Random tag functions */
/**
* create CPU resource via CPU Model
*/
-void surf_host_create_resource(char *name, double power_peak,
+void* surf_host_create_resource(char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace, int core,
e_surf_resource_state_t state_initial,
* create CPU resource via worsktation_ptask_L07 model
*/
-void surf_wsL07_host_create_resource(char *name, double power_peak,
+void* surf_wsL07_host_create_resource(char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)
{
- surf_workstation_model->extension.workstation.cpu_create_resource(name,
+ return surf_workstation_model->extension.workstation.cpu_create_resource(name,
power_peak,
power_scale,
power_trace,
/**
* create link resource via network Model
*/
-void surf_link_create_resource(char *name,
+void* surf_link_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
* create link resource via workstation_ptask_L07 model
*/
-void surf_wsL07_link_create_resource(char *name,
+void* surf_wsL07_link_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
