X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..0818ce4261f0fa7f8d872767471e4c2654458eb9:/src/surf/surfxml_parseplatf.c diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c index 57a766a4c2..9555060ffe 100644 --- a/src/surf/surfxml_parseplatf.c +++ b/src/surf/surfxml_parseplatf.c @@ -75,7 +75,7 @@ static void parse_Etag_trace(void) { tmgr_trace_t trace; if (!trace_file || strcmp(trace_file, "") != 0) { - trace = tmgr_trace_new(trace_file); + trace = tmgr_trace_new_from_file(trace_file); } else if (strcmp(surfxml_pcdata, "") == 0) { trace = NULL; } else { @@ -138,6 +138,7 @@ void parse_platform_file(const char *file) /* Register classical callbacks */ surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); + storage_register_callbacks(); routing_register_callbacks(); /* init the flex parser */ @@ -162,11 +163,6 @@ void parse_platform_file(const char *file) surfxml_add_callback(STag_surfxml_trace_connect_cb_list, &parse_Stag_trace_connect); - /* we care about the ASes while parsing the platf. Incredible, isnt it? */ - sg_platf_AS_end_add_cb(routing_AS_end); - sg_platf_AS_begin_add_cb(routing_AS_begin); - - /* Do the actual parsing */ parse_status = surf_parse();