- STag_surfxml_process_fun = parse_process_init;
- ETag_surfxml_argument_fun = parse_argument;
- ETag_surfxml_process_fun = parse_process_finalize;
-
- for(i=2; i<argc; i++) {
- deployment_file = argv[i];
- surf_parse_open(deployment_file);
- if(surf_parse())
- xbt_assert1(0,"Parse error in %s",deployment_file);
-
- surf_parse_close();
+ surf_parse_reset_callbacks();
+ XBT_DEBUG("%p %p", parse_process_init, &parse_process_init);
+ surfxml_add_callback(STag_surfxml_process_cb_list, &parse_process_init);
+ surfxml_add_callback(ETag_surfxml_argument_cb_list, &parse_argument);
+ surfxml_add_callback(ETag_surfxml_process_cb_list,
+ &parse_process_finalize);
+
+ for (i = 2; i < argc; i++) {
+ deployment_file = argv[i];
+ surf_parse_open(deployment_file);
+ if (surf_parse())
+ xbt_die("Parse error in %s", deployment_file);
+
+ surf_parse_close();