X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da2e6432ce1b2e6a3d01cbd0ba037e8f31a18550..e7f673d15e75da1cf81d9d02186fbc936a21ffad:/src/simix/smx_deployment.c diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c index 15620bb58e..fd027fe437 100644 --- a/src/simix/smx_deployment.c +++ b/src/simix/smx_deployment.c @@ -21,11 +21,12 @@ static double kill_time = -1.0; static void parse_process_init(void) { - parse_host = xbt_strdup(A_surfxml_process_host); - xbt_assert1(SIMIX_host_get_by_name(parse_host), - "Host '%s' unknown", parse_host); + smx_host_t host = SIMIX_host_get_by_name(A_surfxml_process_host); + if (!host) + THROWF(arg_error, 0, "Host '%s' unknown", A_surfxml_process_host); + parse_host = host->name; parse_code = SIMIX_get_registered_function(A_surfxml_process_function); - xbt_assert1(parse_code, "Function '%s' unknown", + xbt_assert(parse_code, "Function '%s' unknown", A_surfxml_process_function); parse_argc = 0; parse_argv = NULL; @@ -34,8 +35,6 @@ static void parse_process_init(void) parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_process_function); surf_parse_get_double(&start_time, A_surfxml_process_start_time); surf_parse_get_double(&kill_time, A_surfxml_process_kill_time); - - current_property_set = xbt_dict_new(); } static void parse_argument(void) @@ -48,7 +47,7 @@ static void parse_argument(void) static void parse_process_finalize(void) { smx_process_arg_t arg = NULL; - void *process = NULL; + smx_process_t process = NULL; if (start_time > SIMIX_get_clock()) { arg = xbt_new0(s_smx_process_arg_t, 1); arg->name = parse_argv[0]; @@ -60,36 +59,33 @@ static void parse_process_finalize(void) arg->kill_time = kill_time; arg->properties = current_property_set; - DEBUG3("Process %s(%s) will be started at time %f", arg->name, + XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name, arg->hostname, start_time); SIMIX_timer_set(start_time, &SIMIX_process_create_from_wrapper, arg); } else { // start_time <= SIMIX_get_clock() - DEBUG2("Starting Process %s(%s) right now", parse_argv[0], parse_host); + XBT_DEBUG("Starting Process %s(%s) right now", parse_argv[0], parse_host); if (simix_global->create_process_function) - process = - (*simix_global->create_process_function) (parse_argv[0], - parse_code, NULL, - parse_host, parse_argc, - parse_argv, - /*the props */ - current_property_set); + (*simix_global->create_process_function) (&process, + parse_argv[0], + parse_code, NULL, + parse_host, parse_argc, + parse_argv, + current_property_set); else - process = SIMIX_req_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv, /*the props */ - current_property_set); + SIMIX_req_process_create(&process, parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv, + 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); return; } if (kill_time > SIMIX_get_clock()) { - if (simix_global->kill_process_function) + if (simix_global->kill_process_function) { SIMIX_timer_set(start_time, simix_global->kill_process_function, process); - else - SIMIX_timer_set(start_time, &SIMIX_process_kill, process); + } } - xbt_free(parse_host); } + current_property_set = NULL; } /** @@ -109,19 +105,21 @@ static void parse_process_finalize(void) void SIMIX_launch_application(const char *file) { int parse_status; - xbt_assert0(simix_global, + xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application."); - surf_parse_reset_parser(); + + 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); + surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties_XML); surfxml_add_callback(ETag_surfxml_process_cb_list, parse_process_finalize); surf_parse_open(file); parse_status = surf_parse(); surf_parse_close(); - xbt_assert1(!parse_status, "Parse error in %s", file); + xbt_assert(!parse_status, "Parse error in %s", file); } /** @@ -135,7 +133,7 @@ void SIMIX_launch_application(const char *file) XBT_INLINE void SIMIX_function_register(const char *name, xbt_main_func_t code) { - xbt_assert0(simix_global, + xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register."); xbt_dict_set(simix_global->registered_functions, name, code, NULL); @@ -150,7 +148,7 @@ static xbt_main_func_t default_function = NULL; */ void SIMIX_function_register_default(xbt_main_func_t code) { - xbt_assert0(simix_global, + xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register."); default_function = code; @@ -167,7 +165,7 @@ void SIMIX_function_register_default(xbt_main_func_t code) xbt_main_func_t SIMIX_get_registered_function(const char *name) { xbt_main_func_t res = NULL; - xbt_assert0(simix_global, + xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_get_registered_function."); res = xbt_dict_get_or_null(simix_global->registered_functions, name); @@ -189,11 +187,12 @@ void SIMIX_process_set_function(const char *process_host, char *arg; /* init process */ - parse_host = xbt_strdup(process_host); - xbt_assert1(SIMIX_host_get_by_name(parse_host), - "Host '%s' unknown", parse_host); + smx_host_t host = SIMIX_host_get_by_name(process_host); + if (!host) + THROWF(arg_error, 0, "Host '%s' unknown", process_host); + parse_host = host->name; parse_code = SIMIX_get_registered_function(process_function); - xbt_assert1(parse_code, "Function '%s' unknown", process_function); + xbt_assert(parse_code, "Function '%s' unknown", process_function); parse_argc = 0; parse_argv = NULL; @@ -202,7 +201,6 @@ void SIMIX_process_set_function(const char *process_host, parse_argv[(parse_argc) - 1] = xbt_strdup(process_function); start_time = process_start_time; kill_time = process_kill_time; - current_property_set = xbt_dict_new(); /* add arguments */ xbt_dynar_foreach(arguments, i, arg) {