#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/dict.h"
-#include "surf/surfxml_parse_private.h"
+#include "simgrid/platf.h"
+#include "surf/surfxml_parse.h"
#include "surf/surf_private.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
}
}
-/*
- * Pass arguments to parsing callback as structures to save some time (and allow callbacks to ignore some)
- */
-
-surf_parsing_router_arg_t struct_router = NULL;
-surf_parsing_cluster_arg_t struct_cluster = NULL;
-surf_parsing_peer_arg_t struct_peer = NULL;
-surf_parsing_link_arg_t struct_lnk = NULL;
-
-
/*
* Trace related stuff
*/
static void parse_Stag_trace(void)
{
- surf_parse_models_setup(); /* ensure that the models are created after the last <config> 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);
+ trace_periodicity = surf_parse_get_double(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)
+ } else if (strcmp(surfxml_pcdata, "") == 0) {
trace = NULL;
- else
+ } else {
trace =
tmgr_trace_new_from_string(trace_id, surfxml_pcdata,
trace_periodicity);
static void parse_Stag_trace_connect(void)
{
- surf_parse_models_setup(); /* ensure that the models are created after the last <config> 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",
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);
+ xbt_strdup(A_surfxml_trace_connect_element), NULL);
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);
+ xbt_strdup(A_surfxml_trace_connect_element), NULL);
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);
+ xbt_strdup(A_surfxml_trace_connect_element), NULL);
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);
+ xbt_strdup(A_surfxml_trace_connect_element), NULL);
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);
+ xbt_strdup(A_surfxml_trace_connect_element), NULL);
break;
default:
xbt_die("Cannot connect trace %s to %s: kind of trace unknown",
}
}
+/* This function acts as a main in the parsing area. */
+void parse_platform_file(const char *file)
+{
+ int parse_status;
-/* Init and free parse data */
+ surf_parse_reset_callbacks();
-static void init_data(void)
-{
+ /* Register classical callbacks */
+ surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+ routing_register_callbacks();
+
+ /* init the flex parser */
+ surfxml_buffer_stack_stack_ptr = 1;
+ surfxml_buffer_stack_stack[0] = 0;
+
+ surf_parse_open(file);
+
+ /* Init my data */
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();
+ traces_set_list = xbt_dict_new_homogeneous(NULL);
+ trace_connect_list_host_avail = xbt_dict_new_homogeneous(free);
+ trace_connect_list_power = xbt_dict_new_homogeneous(free);
+ trace_connect_list_link_avail = xbt_dict_new_homogeneous(free);
+ trace_connect_list_bandwidth = xbt_dict_new_homogeneous(free);
+ trace_connect_list_latency = xbt_dict_new_homogeneous(free);
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)
-{
+ /* Do the actual parsing */
+ parse_status = surf_parse();
+
+ /* Free my data */
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(&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();
+ /* Stop the flex parser */
surf_parse_close();
if (parse_status)
xbt_die("Parse error in %s", file);
-
- surf_config_models_create_elms();
}
