A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename sg_platf_new_AS_{open,close} to {begin,end} since you cannot reopen them to...
[simgrid.git]
/
src
/
surf
/
surfxml_parseplatf.c
diff --git
a/src/surf/surfxml_parseplatf.c
b/src/surf/surfxml_parseplatf.c
index
4445475
..
4fa418f
100644
(file)
--- a/
src/surf/surfxml_parseplatf.c
+++ b/
src/surf/surfxml_parseplatf.c
@@
-54,7
+54,6
@@
void surfxml_bufferstack_pop(int new)
*/
surf_parsing_cluster_arg_t struct_cluster = NULL;
*/
surf_parsing_cluster_arg_t struct_cluster = NULL;
-surf_parsing_peer_arg_t struct_peer = NULL;
/*
* Trace related stuff
/*
* Trace related stuff
@@
-137,14
+136,6
@@
static void parse_Stag_trace_connect(void)
}
}
}
}
-/* Call the right C function when we see the <AS> tags */
-static void parse_S_AS(void) {
- sg_platf_new_AS_open(A_surfxml_AS_id, A_surfxml_AS_routing);
-}
-static void parse_E_AS(void) {
- sg_platf_new_AS_close();
-}
-
/* Init and free parse data */
static void init_data(void)
/* Init and free parse data */
static void init_data(void)
@@
-165,8
+156,8
@@
static void init_data(void)
&parse_Stag_trace_connect);
/* we care about the ASes while parsing the platf. Incredible, isnt it? */
&parse_Stag_trace_connect);
/* we care about the ASes while parsing the platf. Incredible, isnt it? */
- s
urfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS
);
- s
urfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS
);
+ s
g_platf_AS_end_add_cb(routing_AS_end
);
+ s
g_platf_AS_begin_add_cb(routing_AS_begin
);
}
static void free_data(void)
}
static void free_data(void)
@@
-190,7
+181,7
@@
void parse_platform_file(const char *file)
/* Register classical callbacks */
surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
/* Register classical callbacks */
surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
-
surf_parse_add_callback_config
();
+
routing_register_callbacks
();
surfxml_buffer_stack_stack_ptr = 1;
surfxml_buffer_stack_stack[0] = 0;
surfxml_buffer_stack_stack_ptr = 1;
surfxml_buffer_stack_stack[0] = 0;
@@
-202,7
+193,5
@@
void parse_platform_file(const char *file)
surf_parse_close();
if (parse_status)
xbt_die("Parse error in %s", file);
surf_parse_close();
if (parse_status)
xbt_die("Parse error in %s", file);
-
- surf_config_models_create_elms();
}
}