#include "xbt/str.h"
#include "xbt/dict.h"
#include "simgrid/platf.h"
-#include "surf/surfxml_parse_private.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_cluster_arg_t struct_cluster = NULL;
-
/*
* Trace related stuff
*/
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);
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",
surf_parse_reset_callbacks();
/* Register classical callbacks */
- surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
+ surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
routing_register_callbacks();
/* init the flex parser */
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);