-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2013. 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"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"Logging specific to SIMIX (hosts)");
-
static void SIMIX_execution_finish(smx_action_t action);
/**
smx_host_t SIMIX_host_create(const char *name,
void *workstation, void *data)
{
- smx_host_t smx_host = xbt_new0(s_smx_host_t, 1);
+ smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
s_smx_process_t proc;
/* Host structure */
- smx_host->name = xbt_strdup(name);
smx_host->data = data;
- smx_host->host = workstation;
smx_host->process_list =
xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
- xbt_dict_set(simix_global->host, smx_host->name, smx_host,
- &SIMIX_host_destroy);
+ xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host);
- return smx_host;
+ return xbt_lib_get_or_null(host_lib, name, SIMIX_HOST_LEVEL);
}
/**
*/
void SIMIX_host_destroy(void *h)
{
- smx_host_t host = (smx_host_t) h;
+ smx_host_priv_t host = (smx_host_priv_t) h;
- xbt_assert0((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
- char *msg =
- bprintf("Shutting down host %s, but it's not empty:", host->name);
+ char *msg = xbt_strdup("Shutting down host, but it's not empty:");
char *tmp;
smx_process_t process = NULL;
msg = tmp;
}
SIMIX_display_process_status();
- THROW1(arg_error, 0, "%s", msg);
+ THROWF(arg_error, 0, "%s", msg);
}
-
+ xbt_dynar_free(&host->auto_restart_processes);
xbt_swag_free(host->process_list);
/* Clean host structure */
- free(host->name);
- free(host);
-
+ free(host);
return;
}
-/**
- * \brief Returns a dict of all hosts.
- *
- * \return List of all hosts (as a #xbt_dict_t)
- */
-xbt_dict_t SIMIX_host_get_dict(void)
-{
- return simix_global->host;
+///**
+// * \brief Returns a dict of all hosts.
+// *
+// * \return List of all hosts (as a #xbt_dict_t)
+// */
+//xbt_dict_t SIMIX_host_get_dict(void)
+//{
+// xbt_dict_t host_dict = xbt_dict_new_homogeneous(NULL);
+// xbt_lib_cursor_t cursor = NULL;
+// char *name = NULL;
+// void **host = NULL;
+//
+// xbt_lib_foreach(host_lib, cursor, name, host){
+// if(host[SIMIX_HOST_LEVEL])
+// xbt_dict_set(host_dict,name,host[SIMIX_HOST_LEVEL], NULL);
+// }
+// return host_dict;
+//}
+smx_host_t SIMIX_pre_host_get_by_name(smx_simcall_t simcall, const char *name){
+ return SIMIX_host_get_by_name(name);
}
-
-smx_host_t SIMIX_host_get_by_name(const char *name)
-{
- xbt_assert0(((simix_global != NULL)
- && (simix_global->host != NULL)),
+smx_host_t SIMIX_host_get_by_name(const char *name){
+ xbt_assert(((simix_global != NULL)
+ && (host_lib != NULL)),
"Environment not set yet");
- return xbt_dict_get_or_null(simix_global->host, name);
+ return xbt_lib_get_elm_or_null(host_lib, name);
}
smx_host_t SIMIX_host_self(void)
return (process == NULL) ? NULL : SIMIX_process_get_host(process);
}
-/* needs to be public and without request because it is called
+const char* SIMIX_pre_host_self_get_name(smx_simcall_t simcall){
+ return SIMIX_host_self_get_name();
+}
+/* needs to be public and without simcall because it is called
by exceptions and logging events */
const char* SIMIX_host_self_get_name(void)
{
return SIMIX_host_get_name(host);
}
-const char* SIMIX_host_get_name(smx_host_t host)
-{
- xbt_assert0((host != NULL), "Invalid parameters");
+const char* SIMIX_pre_host_get_name(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_name(host);
+}
+const char* SIMIX_host_get_name(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters");
- return host->name;
+ return sg_host_name(host);
}
-xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
-{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+xbt_dict_t SIMIX_pre_host_get_properties(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_properties(host);
+}
+xbt_dict_t SIMIX_host_get_properties(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
- return surf_workstation_model->extension.workstation.get_properties(host->host);
+ return surf_workstation_model->extension.workstation.get_properties(host);
}
-double SIMIX_host_get_speed(smx_host_t host)
-{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+double SIMIX_pre_host_get_speed(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_speed(host);
+}
+double SIMIX_host_get_speed(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
- get_speed(host->host, 1.0);
+ get_speed(host, 1.0);
}
-double SIMIX_host_get_available_speed(smx_host_t host)
-{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+int SIMIX_pre_host_get_core(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_core(host);
+}
+int SIMIX_host_get_core(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
- get_available_speed(host->host);
+ get_core(host);
}
-int SIMIX_host_get_state(smx_host_t host)
-{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+xbt_swag_t SIMIX_pre_host_get_process_list(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_process_list(host);
+}
+
+xbt_swag_t SIMIX_host_get_process_list(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+ smx_host_priv_t host_priv = SIMIX_host_priv(host);
+
+ return host_priv->process_list;
+}
+
+
+double SIMIX_pre_host_get_available_speed(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_available_speed(host);
+}
+double SIMIX_host_get_available_speed(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+ return surf_workstation_model->extension.workstation.
+ get_available_speed(host);
+}
+
+double SIMIX_pre_host_get_current_power_peak(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_current_power_peak(host);
+}
+double SIMIX_host_get_current_power_peak(smx_host_t host) {
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+ return surf_workstation_model->extension.workstation.
+ get_current_power_peak(host);
+}
+
+double SIMIX_pre_host_get_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){
+ return SIMIX_host_get_power_peak_at(host, pstate_index);
+}
+double SIMIX_host_get_power_peak_at(smx_host_t host, int pstate_index) {
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+ return surf_workstation_model->extension.workstation.
+ get_power_peak_at(host, pstate_index);
+}
+
+int SIMIX_pre_host_get_nb_pstates(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_nb_pstates(host);
+}
+int SIMIX_host_get_nb_pstates(smx_host_t host) {
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+ return surf_workstation_model->extension.workstation.
+ get_nb_pstates(host);
+}
+
+
+void SIMIX_pre_host_set_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){
+ SIMIX_host_set_power_peak_at(host, pstate_index);
+}
+void SIMIX_host_set_power_peak_at(smx_host_t host, int pstate_index) {
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+ surf_workstation_model->extension.workstation.
+ set_power_peak_at(host, pstate_index);
+}
+
+double SIMIX_pre_host_get_consumed_energy(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_consumed_energy(host);
+}
+double SIMIX_host_get_consumed_energy(smx_host_t host) {
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+ return surf_workstation_model->extension.workstation.
+ get_consumed_energy(host);
+}
+
+int SIMIX_pre_host_get_state(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_state(host);
+}
+int SIMIX_host_get_state(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
- get_state(host->host);
+ get_state(host);
}
+void* SIMIX_pre_host_self_get_data(smx_simcall_t simcall){
+ return SIMIX_host_self_get_data();
+}
void* SIMIX_host_self_get_data(void)
{
- return SIMIX_host_get_data(SIMIX_host_self());
+ smx_host_t self = SIMIX_host_self();
+ return SIMIX_host_get_data(self);
}
void SIMIX_host_self_set_data(void *data)
{
- SIMIX_host_set_data(SIMIX_host_self(), data);
+ smx_host_t self = SIMIX_host_self();
+ SIMIX_host_set_data(self, data);
}
-void* SIMIX_host_get_data(smx_host_t host)
-{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+void* SIMIX_pre_host_get_data(smx_simcall_t simcall,smx_host_t host){
+ return SIMIX_host_get_data(host);
+}
+void* SIMIX_host_get_data(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
- return host->data;
+ return SIMIX_host_priv(host)->data;
}
-void SIMIX_host_set_data(smx_host_t host, void *data)
+static void _SIMIX_host_free_process_arg(void *data)
{
- xbt_assert0((host != NULL), "Invalid parameters");
- xbt_assert0((host->data == NULL), "Data already set");
+ smx_process_arg_t arg = *(void**)data;
+ int i;
+ for (i = 0; i < arg->argc; i++)
+ xbt_free(arg->argv[i]);
+ xbt_free(arg->argv);
+ xbt_free(arg->name);
+ xbt_free(arg);
+}
+/**
+ * \brief Add a process to the list of the processes that the host will restart when it comes back
+ * This function add a process to the list of the processes that will be restarted when the host comes
+ * back. It is expected that this function is called when the host is down.
+ * The processes will only be restarted once, meaning that you will have to register the process
+ * again to restart the process again.
+ */
+void SIMIX_host_add_auto_restart_process(smx_host_t host,
+ const char *name,
+ xbt_main_func_t code,
+ void *data,
+ const char *hostname,
+ double kill_time,
+ int argc, char **argv,
+ xbt_dict_t properties,
+ int auto_restart)
+{
+ if (!SIMIX_host_priv(host)->auto_restart_processes) {
+ SIMIX_host_priv(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
+ }
+ smx_process_arg_t arg = xbt_new(s_smx_process_arg_t,1);
+ arg->name = xbt_strdup(name);
+ arg->code = code;
+ arg->data = data;
+ arg->hostname = hostname;
+ arg->kill_time = kill_time;
+ arg->argc = argc;
+
+ arg->argv = xbt_new(char*,argc + 1);
- host->data = data;
+ int i;
+ for (i = 0; i < argc; i++) {
+ arg->argv[i] = xbt_strdup(argv[i]);
+ }
+ arg->argv[argc] = NULL;
+
+ arg->properties = properties;
+ arg->auto_restart = auto_restart;
+
+ if( SIMIX_host_get_state(host) == SURF_RESOURCE_OFF
+ && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_name(host))){
+ xbt_dict_set(watched_hosts_lib,sg_host_name(host),host,NULL);
+ XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host));
+ }
+ xbt_dynar_push_as(SIMIX_host_priv(host)->auto_restart_processes,smx_process_arg_t,arg);
}
+/**
+ * \brief Restart the list of processes that have been registered to the host
+ */
+void SIMIX_host_restart_processes(smx_host_t host)
+{
+ unsigned int cpt;
+ smx_process_arg_t arg;
+ xbt_dynar_t process_list = SIMIX_host_priv(host)->auto_restart_processes;
+ if (!process_list)
+ return;
+
+ xbt_dynar_foreach (process_list, cpt, arg) {
+
+ smx_process_t process;
+
+ XBT_DEBUG("Restarting Process %s(%s) right now", arg->argv[0], arg->hostname);
+ if (simix_global->create_process_function) {
+ simix_global->create_process_function(&process,
+ arg->argv[0],
+ arg->code,
+ NULL,
+ arg->hostname,
+ arg->kill_time,
+ arg->argc,
+ arg->argv,
+ arg->properties,
+ arg->auto_restart);
+ } else {
+ simcall_process_create(&process,
+ arg->argv[0],
+ arg->code,
+ NULL,
+ arg->hostname,
+ arg->kill_time,
+ arg->argc,
+ arg->argv,
+ arg->properties,
+ arg->auto_restart);
-smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
- double computation_amount)
+ }
+ /* arg->argv is used by the process created above. Hide it to
+ * _SIMIX_host_free_process_arg() which is called by xbt_dynar_reset()
+ * below. */
+ arg->argc = 0;
+ arg->argv = NULL;
+ }
+ xbt_dynar_reset(process_list);
+}
+
+void SIMIX_host_autorestart(smx_host_t host)
{
+ if(simix_global->autorestart)
+ simix_global->autorestart(host);
+ else
+ xbt_die("No function for simix_global->autorestart");
+}
+
+void SIMIX_pre_host_set_data(smx_simcall_t simcall, smx_host_t host, void *data) {
+ SIMIX_host_set_data(host, data);
+}
+void SIMIX_host_set_data(smx_host_t host, void *data){
+ xbt_assert((host != NULL), "Invalid parameters");
+ xbt_assert((SIMIX_host_priv(host)->data == NULL), "Data already set");
+
+ SIMIX_host_priv(host)->data = data;
+}
+
+smx_action_t SIMIX_pre_host_execute(smx_simcall_t simcall,const char *name,
+ smx_host_t host, double computation_amount, double priority){
+ return SIMIX_host_execute(name, host, computation_amount, priority);
+}
+smx_action_t SIMIX_host_execute(const char *name,
+ smx_host_t host, double computation_amount, double priority){
+
/* alloc structures and initialize */
- smx_action_t action = xbt_new0(s_smx_action_t, 1);
+ smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
action->type = SIMIX_ACTION_EXECUTE;
action->name = xbt_strdup(name);
- action->request_list = xbt_fifo_new();
action->state = SIMIX_RUNNING;
action->execution.host = host;
#endif
/* set surf's action */
- if (!MC_IS_ENABLED) {
+ if (!MC_is_active()) {
action->execution.surf_exec =
- surf_workstation_model->extension.workstation.execute(host->host,
- computation_amount);
+ surf_workstation_model->extension.workstation.execute(host,
+ computation_amount);
surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+ surf_workstation_model->set_priority(action->execution.surf_exec, priority);
}
-#ifdef HAVE_TRACING
- TRACE_smx_host_execute(action);
-#endif
-
- DEBUG1("Create execute action %p", action);
+ XBT_DEBUG("Create execute action %p", action);
return action;
}
-smx_action_t SIMIX_host_parallel_execute( const char *name,
+smx_action_t SIMIX_pre_host_parallel_execute(smx_simcall_t simcall, const char *name,
int host_nb, smx_host_t *host_list,
double *computation_amount, double *communication_amount,
- double amount, double rate)
-{
+ double amount, double rate){
+ return SIMIX_host_parallel_execute(name, host_nb, host_list, computation_amount,
+ communication_amount, amount, rate);
+}
+smx_action_t SIMIX_host_parallel_execute(const char *name,
+ int host_nb, smx_host_t *host_list,
+ double *computation_amount, double *communication_amount,
+ double amount, double rate){
+
void **workstation_list = NULL;
int i;
/* alloc structures and initialize */
- smx_action_t action = xbt_new0(s_smx_action_t, 1);
+ smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
action->type = SIMIX_ACTION_PARALLEL_EXECUTE;
action->name = xbt_strdup(name);
- action->request_list = xbt_fifo_new();
action->state = SIMIX_RUNNING;
action->execution.host = NULL; /* FIXME: do we need the list of hosts? */
/* set surf's action */
workstation_list = xbt_new0(void *, host_nb);
for (i = 0; i < host_nb; i++)
- workstation_list[i] = host_list[i]->host;
+ workstation_list[i] = host_list[i];
/* set surf's action */
- if (!MC_IS_ENABLED) {
+ if (!MC_is_active()) {
action->execution.surf_exec =
surf_workstation_model->extension.workstation.
execute_parallel_task(host_nb, workstation_list, computation_amount,
- communication_amount, amount, rate);
+ communication_amount, rate);
surf_workstation_model->action_data_set(action->execution.surf_exec, action);
}
- DEBUG1("Create parallel execute action %p", action);
+ XBT_DEBUG("Create parallel execute action %p", action);
return action;
}
-void SIMIX_host_execution_destroy(smx_action_t action)
-{
- DEBUG1("Destroy action %p", action);
-
- if (action->name)
- xbt_free(action->name);
-
- xbt_fifo_free(action->request_list);
+void SIMIX_pre_host_execution_destroy(smx_simcall_t simcall, smx_action_t action){
+ SIMIX_host_execution_destroy(action);
+}
+void SIMIX_host_execution_destroy(smx_action_t action){
+ XBT_DEBUG("Destroy action %p", action);
if (action->execution.surf_exec) {
surf_workstation_model->action_unref(action->execution.surf_exec);
action->execution.surf_exec = NULL;
}
-
-#ifdef HAVE_TRACING
- TRACE_smx_action_destroy(action);
-#endif
- xbt_free(action);
+ xbt_free(action->name);
+ xbt_mallocator_release(simix_global->action_mallocator, action);
}
-void SIMIX_host_execution_cancel(smx_action_t action)
-{
- DEBUG1("Cancel action %p", action);
+void SIMIX_pre_host_execution_cancel(smx_simcall_t simcall, smx_action_t action){
+ SIMIX_host_execution_cancel(action);
+}
+void SIMIX_host_execution_cancel(smx_action_t action){
+ XBT_DEBUG("Cancel action %p", action);
if (action->execution.surf_exec)
surf_workstation_model->action_cancel(action->execution.surf_exec);
}
-double SIMIX_host_execution_get_remains(smx_action_t action)
-{
+double SIMIX_pre_host_execution_get_remains(smx_simcall_t simcall, smx_action_t action){
+ return SIMIX_host_execution_get_remains(action);
+}
+double SIMIX_host_execution_get_remains(smx_action_t action){
double result = 0.0;
if (action->state == SIMIX_RUNNING)
return result;
}
-e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action)
-{
+e_smx_state_t SIMIX_pre_host_execution_get_state(smx_simcall_t simcall, smx_action_t action){
+ return SIMIX_host_execution_get_state(action);
+}
+e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action){
return action->state;
}
-void SIMIX_host_execution_set_priority(smx_action_t action, double priority)
-{
- surf_workstation_model->set_priority(action->execution.surf_exec, priority);
+void SIMIX_pre_host_execution_set_priority(smx_simcall_t simcall, smx_action_t action,
+ double priority){
+ return SIMIX_host_execution_set_priority(action, priority);
+}
+void SIMIX_host_execution_set_priority(smx_action_t action, double priority){
+ if(action->execution.surf_exec)
+ surf_workstation_model->set_priority(action->execution.surf_exec, priority);
}
-void SIMIX_pre_host_execution_wait(smx_req_t req)
-{
- smx_action_t action = req->host_execution_wait.execution;
+void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action){
- DEBUG2("Wait for execution of action %p, state %d", action, action->state);
+ XBT_DEBUG("Wait for execution of action %p, state %d", action, (int)action->state);
- /* Associate this request to the action */
- xbt_fifo_push(action->request_list, req);
- req->issuer->waiting_action = action;
+ /* Associate this simcall to the action */
+ xbt_fifo_push(action->simcalls, simcall);
+ simcall->issuer->waiting_action = action;
/* set surf's action */
- if (MC_IS_ENABLED){
+ if (MC_is_active()) {
action->state = SIMIX_DONE;
SIMIX_execution_finish(action);
+ return;
}
/* If the action is already finished then perform the error handling */
void SIMIX_host_execution_suspend(smx_action_t action)
{
- surf_workstation_model->suspend(action->execution.surf_exec);
+ if(action->execution.surf_exec)
+ surf_workstation_model->suspend(action->execution.surf_exec);
}
void SIMIX_host_execution_resume(smx_action_t action)
{
- surf_workstation_model->suspend(action->execution.surf_exec);
+ if(action->execution.surf_exec)
+ surf_workstation_model->resume(action->execution.surf_exec);
}
void SIMIX_execution_finish(smx_action_t action)
{
xbt_fifo_item_t item;
- smx_req_t req;
+ smx_simcall_t simcall;
- xbt_fifo_foreach(action->request_list, item, req, smx_req_t) {
+ xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) {
switch (action->state) {
case SIMIX_DONE:
- /* do nothing, action done*/
- DEBUG0("SIMIX_execution_finished: execution successful");
+ /* do nothing, action done */
+ XBT_DEBUG("SIMIX_execution_finished: execution successful");
break;
case SIMIX_FAILED:
- TRY {
- DEBUG1("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
- THROW0(host_error, 0, "Host failed");
- }
- CATCH(req->issuer->running_ctx->exception) {
- req->issuer->doexception = 1;
- }
- break;
+ XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->smx_host));
+ simcall->issuer->context->iwannadie = 1;
+ SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
+ break;
case SIMIX_CANCELED:
- TRY {
- DEBUG0("SIMIX_execution_finished: execution canceled");
- THROW0(cancel_error, 0, "Canceled");
- }
- CATCH(req->issuer->running_ctx->exception) {
- req->issuer->doexception = 1;
- }
- break;
+ XBT_DEBUG("SIMIX_execution_finished: execution canceled");
+ SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
+ break;
default:
- THROW_IMPOSSIBLE;
+ xbt_die("Internal error in SIMIX_execution_finish: unexpected action state %d",
+ (int)action->state);
}
- req->issuer->waiting_action = NULL;
- SIMIX_request_answer(req);
+ /* check if the host is down */
+ if (surf_workstation_model->extension.
+ workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
+ simcall->issuer->context->iwannadie = 1;
+ }
+
+ simcall->issuer->waiting_action = NULL;
+ simcall_host_execution_wait__set__result(simcall, action->state);
+ SIMIX_simcall_answer(simcall);
}
+
+ /* We no longer need it */
+ SIMIX_host_execution_destroy(action);
}
void SIMIX_post_host_execute(smx_action_t action)
{
- /* FIXME: check if the host running the action failed or not*/
- /*if(surf_workstation_model->extension.workstation.get_state(action->host->host))*/
-
- /* If the host running the action didn't fail, then the action was cancelled */
- if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED)
- action->state = SIMIX_CANCELED;
- else
- action->state = SIMIX_DONE;
+ if (action->type == SIMIX_ACTION_EXECUTE && /* FIMXE: handle resource failure
+ * for parallel tasks too */
+ surf_workstation_model->extension.workstation.get_state(action->execution.host) == SURF_RESOURCE_OFF) {
+ /* If the host running the action failed, notice it so that the asking
+ * process can be killed if it runs on that host itself */
+ action->state = SIMIX_FAILED;
+ } else if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED) {
+ /* If the host running the action didn't fail, then the action was
+ * canceled */
+ action->state = SIMIX_CANCELED;
+ } else {
+ action->state = SIMIX_DONE;
+ }
if (action->execution.surf_exec) {
surf_workstation_model->action_unref(action->execution.surf_exec);
action->execution.surf_exec = NULL;
}
- /* If there are requests associated with the action, then answer them */
- if (xbt_fifo_size(action->request_list))
+ /* If there are simcalls associated with the action, then answer them */
+ if (xbt_fifo_size(action->simcalls)) {
SIMIX_execution_finish(action);
+ }
}
#ifdef HAVE_TRACING
+void SIMIX_pre_set_category(smx_simcall_t simcall, smx_action_t action,
+ const char *category){
+ SIMIX_set_category(action, category);
+}
void SIMIX_set_category(smx_action_t action, const char *category)
{
+ if (action->state != SIMIX_RUNNING) return;
if (action->type == SIMIX_ACTION_EXECUTE){
surf_workstation_model->set_category(action->execution.surf_exec, category);
}else if (action->type == SIMIX_ACTION_COMMUNICATE){
}
#endif
+xbt_dict_t SIMIX_pre_host_get_storage_list(smx_simcall_t simcall, smx_host_t host){
+ return SIMIX_host_get_storage_list(host);
+}
+xbt_dict_t SIMIX_host_get_storage_list(smx_host_t host){
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
+
+ return surf_workstation_model->extension.workstation.get_storage_list(host);
+}
