XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
"Logging specific to the SURF parsing module");
#undef CLEANUP
+int ETag_surfxml_include_state(void);
+
#include "simgrid_dtd.c"
+char *platform_filename;
+
/* Initialize the parsing globals */
xbt_dict_t traces_set_list = NULL;
xbt_dict_t trace_connect_list_host_avail = 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;
/* store the current property set for any tag */
xbt_dict_t current_property_set = NULL;
static void init_randomness(void);
static void add_randomness(void);
+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); //save old filename
+
+ 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)
+{
+// XBT_INFO("ETag_surfxml_include '%s'",A_surfxml_include_file);
+// fflush(NULL);
+// fclose(surf_file_to_parse);
+// xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse); // restore old filename
+// surf_parse_pop_buffer_state();
+// xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer);
+}
+
/*
- * This function return 0 or 1 if callbacks are empty or not.
+ * Return 1 if tag include is opened
*/
-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);
+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_dynar_pop(surf_input_buffer_stack,surf_input_buffer);
+ return 0;
}
+
void surf_parse_init_callbacks(void)
{
STag_surfxml_platform_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 =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
}
void surf_parse_reset_callbacks(void)
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);
}
/* Stag and Etag parse functions */
}
return;
}
+
+ if (!surf_input_buffer_stack)
+ 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 = surf_fopen(file, "r");
xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file);
- surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, 10);
+ surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
surf_parse__switch_to_buffer(surf_input_buffer);
surf_parse_lineno = 1;
}
void surf_parse_close(void)
{
+ if (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);
+
if (surf_file_to_parse) {
surf_parse__delete_buffer(surf_input_buffer);
fclose(surf_file_to_parse);
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");
/* 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 be make a 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);
+ }
+}
+
+/**
+ * With XML parser
+ */
+void parse_properties_XML(void)
+{
+ parse_properties(A_surfxml_prop_id, A_surfxml_prop_value);
+}
+
+/*
+ * With lua console
+ */
+void parse_properties_lua(const char* prop_id, const char* prop_value)
+{
+ parse_properties(prop_id, prop_value);
}
/* Trace management functions */
