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
use a sane way to declare postparse callbacks, now that this way exists
[simgrid.git]
/
src
/
surf
/
surfxml_parseplatf.c
diff --git
a/src/surf/surfxml_parseplatf.c
b/src/surf/surfxml_parseplatf.c
index
3d2ff37
..
9f2e6de
100644
(file)
--- a/
src/surf/surfxml_parseplatf.c
+++ b/
src/surf/surfxml_parseplatf.c
@@
-8,6
+8,7
@@
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/dict.h"
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/dict.h"
+#include "simgrid/platf.h"
#include "surf/surfxml_parse_private.h"
#include "surf/surf_private.h"
#include "surf/surfxml_parse_private.h"
#include "surf/surf_private.h"
@@
-52,11
+53,7
@@
void surfxml_bufferstack_pop(int new)
* Pass arguments to parsing callback as structures to save some time (and allow callbacks to ignore some)
*/
* 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_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
/*
* Trace related stuff
@@
-75,10
+72,9
@@
static char *trace_id = NULL;
static void parse_Stag_trace(void)
{
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);
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)
}
static void parse_Etag_trace(void)
@@
-103,8
+99,6
@@
static void parse_Etag_trace(void)
static void parse_Stag_trace_connect(void)
{
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",
xbt_assert(xbt_dict_get_or_null
(traces_set_list, A_surfxml_trace_connect_trace),
"Cannot connect trace %s to %s: trace unknown",
@@
-142,15
+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) {
- routing_AS_init(A_surfxml_AS_id, A_surfxml_AS_routing);
-}
-static void parse_E_AS(void) {
- routing_AS_end(A_surfxml_AS_id);
-}
-
-
/* Init and free parse data */
static void init_data(void)
/* Init and free parse data */
static void init_data(void)
@@
-171,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_ASclose_add_cb(routing_AS_close
);
+ s
g_platf_ASopen_add_cb(routing_AS_open
);
}
static void free_data(void)
}
static void free_data(void)
@@
-193,7
+178,10
@@
void parse_platform_file(const char *file)
int parse_status;
surf_parse_reset_callbacks();
int parse_status;
surf_parse_reset_callbacks();
- surf_parse_add_callback_config();
+
+ /* Register classical callbacks */
+ surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
+ 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;
@@
-205,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();
}
}