X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ef25fa9bb8f5f816eed5d830510eb7314d542d4..7ad85b03568dabade546f7948aaf7279059e9269:/src/simix/smx_deployment.c diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c index 6c7d332644..97f4bb4d1c 100644 --- a/src/simix/smx_deployment.c +++ b/src/simix/smx_deployment.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007, 2009-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,80 +12,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)"); -static int parse_argc = -1; -static char **parse_argv = NULL; -static xbt_main_func_t parse_code = NULL; -static char *parse_host = NULL; -static double start_time = 0.0; -static double kill_time = -1.0; extern int surf_parse_lineno; -static void parse_process_init(void) +void SIMIX_init_application(void) { - 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_assert(parse_code, "Function '%s' unknown", - A_surfxml_process_function); - parse_argv = xbt_new(char *, 2); - parse_argv[0] = xbt_strdup(A_surfxml_process_function); - parse_argc = 1; - start_time= surf_parse_get_double(A_surfxml_process_start_time); - kill_time = surf_parse_get_double(A_surfxml_process_kill_time); -} - -static void parse_argument(void) -{ - parse_argv = xbt_realloc(parse_argv, (parse_argc + 2) * sizeof(char *)); - parse_argv[parse_argc++] = xbt_strdup(A_surfxml_argument_value); -} - -static void parse_process_finalize(void) -{ - smx_process_arg_t arg = NULL; - smx_process_t process = NULL; - parse_argv[parse_argc] = NULL; - if (start_time > SIMIX_get_clock()) { - arg = xbt_new0(s_smx_process_arg_t, 1); - arg->name = parse_argv[0]; - arg->code = parse_code; - arg->data = NULL; - arg->hostname = parse_host; - arg->argc = parse_argc; - arg->argv = parse_argv; - arg->kill_time = kill_time; - arg->properties = current_property_set; - - 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() - XBT_DEBUG("Starting Process %s(%s) right now", parse_argv[0], parse_host); - - if (simix_global->create_process_function) - simix_global->create_process_function(&process, - parse_argv[0], - parse_code, NULL, - parse_host, parse_argc, - parse_argv, - current_property_set); - else - simcall_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) { - return; - } - if (kill_time > SIMIX_get_clock()) { - if (simix_global->kill_process_function) { - SIMIX_timer_set(start_time, simix_global->kill_process_function, process); - } - } - } - current_property_set = NULL; + surf_parse_reset_callbacks(); } /** @@ -104,28 +36,22 @@ static void parse_process_finalize(void) */ void SIMIX_launch_application(const char *file) { - xbt_ex_t e; - - _XBT_GNUC_UNUSED int parse_status; + XBT_ATTRIB_UNUSED int parse_status; xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application."); - 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(ETag_surfxml_process_cb_list, - parse_process_finalize); + SIMIX_init_application(); surf_parse_open(file); TRY { - parse_status = surf_parse(); - surf_parse_close(); - xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno); - } CATCH(e) { - xbt_die("Unrecoverable error at %s:%d: %s", - file, surf_parse_lineno, e.msg); + parse_status = surf_parse(); + surf_parse_close(); + xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno); + } + CATCH_ANONYMOUS { + XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.", + file, surf_parse_lineno); + RETHROW; } } @@ -190,30 +116,31 @@ void SIMIX_process_set_function(const char *process_host, double process_start_time, double process_kill_time) { - unsigned int i; - char *arg; + s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER; - /* init process */ - smx_host_t host = SIMIX_host_get_by_name(process_host); + sg_host_t host = sg_host_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_assert(parse_code, "Function '%s' unknown", process_function); - - parse_argc = 1 + xbt_dynar_length(arguments); - parse_argv = xbt_new(char *, parse_argc + 1); - parse_argv[0] = xbt_strdup(process_function); + process.host = sg_host_get_name(host); + process.argc = 1 + xbt_dynar_length(arguments); + process.argv = (const char**)xbt_new(char *, process.argc + 1); + process.argv[0] = xbt_strdup(process_function); /* add arguments */ + unsigned int i; + char *arg; xbt_dynar_foreach(arguments, i, arg) { - parse_argv[i + 1] = xbt_strdup(arg); + process.argv[i + 1] = xbt_strdup(arg); } - parse_argv[parse_argc] = NULL; + process.argv[process.argc] = NULL; + + xbt_main_func_t parse_code = SIMIX_get_registered_function(process_function); + xbt_assert(parse_code, "Function '%s' unknown", process_function); + process.function = process_function; - start_time = process_start_time; - kill_time = process_kill_time; + process.host = process_host; + process.kill_time = process_kill_time; + process.start_time = process_start_time; - /* finalize */ - parse_process_finalize(); + sg_platf_new_process(&process); }