-/* Copyright (c) 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
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;
+static int auto_restart = 0;
+
extern int surf_parse_lineno;
-static void parse_process_init(void)
+static void parse_process(sg_platf_process_cbarg_t process)
{
- smx_host_t host = SIMIX_host_get_by_name(A_surfxml_process_host);
+ smx_host_t host = SIMIX_host_get_by_name(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_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);
- start_time= surf_parse_get_double(A_surfxml_process_start_time);
- kill_time = surf_parse_get_double(A_surfxml_process_kill_time);
-}
+ THROWF(arg_error, 0, "Host '%s' unknown", process->host);
+ parse_code = SIMIX_get_registered_function(process->function);
+ xbt_assert(parse_code, "Function '%s' unknown", process->function);
-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);
-}
+ start_time = process->start_time;
+ kill_time = process->kill_time;
+ auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1;
-static void parse_process_finalize(void)
-{
smx_process_arg_t arg = NULL;
- smx_process_t process = NULL;
+ smx_process_t process_created = NULL;
+
+ arg = xbt_new0(s_smx_process_arg_t, 1);
+ arg->code = parse_code;
+ arg->data = NULL;
+ arg->hostname = sg_host_name(host);
+ arg->argc = process->argc;
+ arg->argv = xbt_new(char *,process->argc);
+ int i;
+ for (i=0; i<process->argc; i++)
+ arg->argv[i] = xbt_strdup(process->argv[i]);
+ arg->name = xbt_strdup(arg->argv[0]);
+ arg->kill_time = kill_time;
+ arg->properties = current_property_set;
+ if (!SIMIX_host_priv(host)->boot_processes) {
+ SIMIX_host_priv(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg);
+ }
+ xbt_dynar_push_as(SIMIX_host_priv(host)->boot_processes,smx_process_arg_t,arg);
+
if (start_time > SIMIX_get_clock()) {
arg = xbt_new0(s_smx_process_arg_t, 1);
- arg->name = parse_argv[0];
+ arg->name = (char*)(process->argv)[0];
arg->code = parse_code;
arg->data = NULL;
- arg->hostname = parse_host;
- arg->argc = parse_argc;
- arg->argv = parse_argv;
+ arg->hostname = sg_host_name(host);
+ arg->argc = process->argc;
+ arg->argv = (char**)(process->argv);
arg->kill_time = kill_time;
arg->properties = current_property_set;
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);
+ XBT_DEBUG("Starting Process %s(%s) right now", process->argv[0], sg_host_name(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);
+ simix_global->create_process_function(&process_created,
+ (char*)(process->argv)[0],
+ parse_code,
+ NULL,
+ sg_host_name(host),
+ kill_time,
+ process->argc,
+ (char**)(process->argv),
+ current_property_set,
+ auto_restart);
else
- simcall_process_create(&process, parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv,
- current_property_set);
+ simcall_process_create(&process_created, (char*)(process->argv)[0], parse_code, NULL, sg_host_name(host), kill_time, process->argc,
+ (char**)process->argv, current_property_set,auto_restart);
+
/* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
- if (!process) {
+ if (!process_created) {
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;
}
+void SIMIX_init_application(void){
+ surf_parse_reset_callbacks();
+ sg_platf_process_add_cb(parse_process);
+}
+
/**
* \brief An application deployer.
*
*/
void SIMIX_launch_application(const char *file)
{
- 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_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;
}
}
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);
+ res = (xbt_main_func_t)xbt_dict_get_or_null(simix_global->registered_functions, name);
return res ? res : default_function;
}
double process_start_time,
double process_kill_time)
{
- unsigned int i;
- char *arg;
+ s_sg_platf_process_cbarg_t process;
+ memset(&process,0,sizeof(process));
- /* 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 = 0;
- parse_argv = NULL;
- parse_argc++;
- parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
- parse_argv[(parse_argc) - 1] = xbt_strdup(process_function);
- start_time = process_start_time;
- kill_time = process_kill_time;
+ process.host = sg_host_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_argc++;
- parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
- parse_argv[(parse_argc) - 1] = xbt_strdup(arg);
+ process.argv[i + 1] = xbt_strdup(arg);
}
+ process.argv[process.argc] = NULL;
+
+ parse_code = SIMIX_get_registered_function(process_function);
+ xbt_assert(parse_code, "Function '%s' unknown", process_function);
+ process.function = process_function;
+
+ process.host = process_host;
+ process.kill_time = process_kill_time;
+ process.start_time = process_start_time;
+ process.on_failure = SURF_PROCESS_ON_FAILURE_DIE;
+ process.properties = NULL;
- /* finalize */
- parse_process_finalize();
+ sg_platf_new_process(&process);
}
