X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..faa8aeec1cac19b146adffeabe3fb4db846311b3:/src/simix/smx_deployment.c diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c index 539a0ed357..c3b977d0a0 100644 --- a/src/simix/smx_deployment.c +++ b/src/simix/smx_deployment.c @@ -4,7 +4,6 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ - #include "private.h" #include "xbt/sysdep.h" #include "xbt/log.h" @@ -76,8 +75,8 @@ static void parse_process_finalize(void) /*the props */ current_property_set); else - process = SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv, /*the props */ - current_property_set); + process = SIMIX_req_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv, /*the props */ + current_property_set); /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */ if (!process) { xbt_free(parse_host); @@ -112,7 +111,10 @@ void SIMIX_launch_application(const char *file) int parse_status; xbt_assert0(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application."); - surf_parse_reset_parser(); + + // Reset callbacks + surf_parse_reset_callbacks(); + surfxml_add_callback(STag_surfxml_process_cb_list, parse_process_init); surfxml_add_callback(ETag_surfxml_argument_cb_list, parse_argument); surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties); @@ -212,7 +214,6 @@ void SIMIX_process_set_function(const char *process_host, parse_argv[(parse_argc) - 1] = xbt_strdup(arg); } - /*finalize */ + /* finalize */ parse_process_finalize(); - }