X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/865f97c868ce92518b1cf4f23e23bd1b16b7917c..3ef25fa9bb8f5f816eed5d830510eb7314d542d4:/src/simix/smx_deployment.c diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c index 622aeb85ab..6c7d332644 100644 --- a/src/simix/smx_deployment.c +++ b/src/simix/smx_deployment.c @@ -1,17 +1,14 @@ -/* $Id$ */ - -/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo. - All rights reserved. */ +/* Copyright (c) 2007, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* 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 "smx_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/dict.h" -#include "surf/surfxml_parse_private.h" +#include "surf/surfxml_parse.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)"); @@ -22,36 +19,35 @@ 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) { - 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; - parse_argc++; - parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *)); - 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(); + 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_argc++; - parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *)); - parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_argument_value); + 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; - void *process = 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]; @@ -63,43 +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); - if (simix_global->create_process_function) - surf_timer_model->extension.timer.set(start_time, (void *) - simix_global->create_process_function, - arg); - else - surf_timer_model->extension.timer.set(start_time, (void *) - &SIMIX_process_create, arg); - - } - if ((start_time < 0) || (start_time == SIMIX_get_clock())) { - DEBUG2("Starting Process %s(%s) right now", parse_argv[0], parse_host); + 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) - 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_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv, /*the props */ - current_property_set); - - if (process && kill_time > SIMIX_get_clock()) { - if (simix_global->kill_process_function) - surf_timer_model->extension.timer.set(start_time, (void *) - simix_global->kill_process_function, - process); - else - surf_timer_model->extension.timer.set(kill_time, (void *) - &SIMIX_process_kill, - (void *) process); + 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); + } } - xbt_free(parse_host); } + current_property_set = NULL; } /** @@ -118,17 +104,29 @@ static void parse_process_finalize(void) */ void SIMIX_launch_application(const char *file) { - xbt_assert0(simix_global, + xbt_ex_t e; + + _XBT_GNUC_UNUSED int parse_status; + 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(ETag_surfxml_process_cb_list, parse_process_finalize); + surfxml_add_callback(ETag_surfxml_process_cb_list, + parse_process_finalize); surf_parse_open(file); - xbt_assert1((!surf_parse()), "Parse error in %s", file); - surf_parse_close(); + 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); + } } /** @@ -139,9 +137,10 @@ void SIMIX_launch_application(const char *file) * \param name the reference name of the function. * \param code the function */ -void SIMIX_function_register(const char *name, xbt_main_func_t code) +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); @@ -156,7 +155,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; @@ -172,10 +171,49 @@ void SIMIX_function_register_default(xbt_main_func_t code) */ xbt_main_func_t SIMIX_get_registered_function(const char *name) { - xbt_assert0(simix_global, + xbt_main_func_t res = NULL; + xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_get_registered_function."); - xbt_main_func_t res = - xbt_dict_get_or_null(simix_global->registered_functions, name); + res = (xbt_main_func_t)xbt_dict_get_or_null(simix_global->registered_functions, name); return res ? res : default_function; } + + +/** + * \brief Bypass the parser, get arguments, and set function to each process + */ + +void SIMIX_process_set_function(const char *process_host, + const char *process_function, + xbt_dynar_t arguments, + double process_start_time, + double process_kill_time) +{ + unsigned int i; + char *arg; + + /* init process */ + 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_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); + + /* add arguments */ + xbt_dynar_foreach(arguments, i, arg) { + parse_argv[i + 1] = xbt_strdup(arg); + } + parse_argv[parse_argc] = NULL; + + start_time = process_start_time; + kill_time = process_kill_time; + + /* finalize */ + parse_process_finalize(); +}