#include "xbt/log.h"
#include "xbt/dict.h"
#include "mc/mc.h"
+#include "mc/mc_replay.h"
+#include "mc/mc_client.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
"Logging specific to SIMIX (process)");
SIMIX_process_on_exit_runall(process);
+ /* Unregister from the kill timer if any */
+ if (process->kill_timer != NULL)
+ SIMIX_timer_remove(process->kill_timer);
+
+ xbt_os_mutex_acquire(simix_global->mutex);
+
/* cancel non-blocking communications */
smx_synchro_t synchro;
while ((synchro = xbt_fifo_pop(process->comms))) {
XBT_DEBUG("%p should not be run anymore",process);
xbt_swag_remove(process, simix_global->process_list);
- xbt_swag_remove(process, SIMIX_host_priv(process->smx_host)->process_list);
+ xbt_swag_remove(process, SIMIX_host_priv(process->host)->process_list);
xbt_swag_insert(process, simix_global->process_to_destroy);
process->context->iwannadie = 0;
+
+ xbt_os_mutex_release(simix_global->mutex);
}
/**
/* Add the process to the list of process to restart, only if
* the host is down
*/
- if (arg->auto_restart && !SIMIX_host_get_state(arg->smx_host)) {
- SIMIX_host_add_auto_restart_process(arg->smx_host,arg->name,arg->code, arg->data,
- sg_host_name(arg->smx_host),
- arg->kill_time,
+ if (arg->auto_restart && !SIMIX_host_get_state(arg->host)) {
+ SIMIX_host_add_auto_restart_process(arg->host,arg->name,arg->code, arg->data,
+ sg_host_name(arg->host),
+ SIMIX_timer_get_date(arg->kill_timer),
arg->argc,arg->argv,arg->properties,
arg->auto_restart);
}
- XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_name(arg->smx_host));
+ XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_name(arg->host));
/* stop the context */
SIMIX_context_stop(arg->context);
}
smx_process_t parent_process)
{
*process = NULL;
- smx_host_t host = SIMIX_host_get_by_name(hostname);
+ sg_host_t host = SIMIX_host_get_by_name(hostname);
XBT_DEBUG("Start process %s on host '%s'", name, hostname);
/* Process data */
(*process)->pid = simix_process_maxpid++;
(*process)->name = xbt_strdup(name);
- (*process)->smx_host = host;
+ (*process)->host = host;
(*process)->data = data;
(*process)->comms = xbt_fifo_new();
(*process)->simcall.issuer = *process;
(*process)->code = code;
(*process)->argc = argc;
(*process)->argv = argv;
- (*process)->kill_time = kill_time;
XBT_VERB("Create context %s", (*process)->name);
if (kill_time > SIMIX_get_clock() && simix_global->kill_process_function) {
XBT_DEBUG("Process %s(%s) will be kill at time %f", (*process)->name,
- sg_host_name((*process)->smx_host), kill_time);
- SIMIX_timer_set(kill_time, simix_global->kill_process_function, *process);
+ sg_host_name((*process)->host), kill_time);
+ (*process)->kill_timer = SIMIX_timer_set(kill_time, simix_global->kill_process_function, *process);
}
}
}
*/
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
- XBT_DEBUG("Killing process %s on %s", process->name, sg_host_name(process->smx_host));
+ XBT_DEBUG("Killing process %s on %s", process->name, sg_host_name(process->host));
process->context->iwannadie = 1;
process->blocked = 0;
case SIMIX_SYNC_COMMUNICATE:
xbt_fifo_remove(process->comms, process->waiting_synchro);
SIMIX_comm_cancel(process->waiting_synchro);
+ xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall);
SIMIX_comm_destroy(process->waiting_synchro);
break;
break;
}
+
+ process->waiting_synchro = NULL;
}
if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) {
XBT_DEBUG("Inserting %s in the to_run list", process->name);
break;
case SIMIX_SYNC_SLEEP:
- SIMIX_process_sleep_destroy(process->waiting_synchro);
- break;
-
case SIMIX_SYNC_JOIN:
SIMIX_process_sleep_destroy(process->waiting_synchro);
+ if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) {
+ XBT_DEBUG("Inserting %s in the to_run list", process->name);
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+ }
break;
case SIMIX_SYNC_SYNCHRO:
}
process->waiting_synchro = NULL;
- if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self())
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid) {
}
void simcall_HANDLER_process_change_host(smx_simcall_t simcall, smx_process_t process,
- smx_host_t dest)
+ sg_host_t dest)
{
process->new_host = dest;
}
void SIMIX_process_change_host(smx_process_t process,
- smx_host_t dest)
+ sg_host_t dest)
{
xbt_assert((process != NULL), "Invalid parameters");
- xbt_swag_remove(process, SIMIX_host_priv(process->smx_host)->process_list);
- process->smx_host = dest;
+ xbt_swag_remove(process, SIMIX_host_priv(process->host)->process_list);
+ process->host = dest;
xbt_swag_insert(process, SIMIX_host_priv(dest)->process_list);
}
}
} else {
/* FIXME: computation size is zero. Is it okay that bound is zero ? */
- return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0, 0.0, 0);
+ return SIMIX_host_execute("suspend", process->host, 0.0, 1.0, 0.0, 0);
}
}
process->data = data;
}
-smx_host_t SIMIX_process_get_host(smx_process_t process)
+sg_host_t SIMIX_process_get_host(smx_process_t process)
{
- return process->smx_host;
+ return process->host;
}
/* needs to be public and without simcall because it is called
smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration)
{
smx_synchro_t synchro;
- smx_host_t host = process->smx_host;
+ sg_host_t host = process->host;
/* check if the host is active */
- if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) {
+ if (surf_host_get_state(surf_host_resource_priv(host)) != SURF_RESOURCE_ON) {
THROWF(host_error, 0, "Host %s failed, you cannot call this function",
sg_host_name(host));
}
synchro->category = NULL;
synchro->sleep.host = host;
- synchro->sleep.surf_sleep =
- surf_workstation_sleep(host, duration);
+ synchro->sleep.surf_sleep = surf_host_sleep(host, duration);
surf_action_set_data(synchro->sleep.surf_sleep, synchro);
XBT_DEBUG("Create sleep synchronization %p", synchro);
THROW_IMPOSSIBLE;
break;
}
- if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) {
+ if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
simcall_process_sleep__set__result(simcall, state);
smx_process_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_process_t process) {
return SIMIX_process_restart(process, simcall->issuer);
}
-/**
- * \brief Restart a process.
- * Restart a process, starting it again from the beginning.
- */
+/** @brief Restart a process, starting it again from the beginning. */
smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer) {
- XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_name(process->smx_host));
+ XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_name(process->host));
//retrieve the arguments of the old process
- //FIXME: Factorise this with SIMIX_host_add_auto_restart_process ?
+ //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
s_smx_process_arg_t arg;
arg.code = process->code;
- arg.hostname = sg_host_name(process->smx_host);
- arg.kill_time = process->kill_time;
+ arg.hostname = sg_host_name(process->host);
+ arg.kill_time = SIMIX_timer_get_date(process->kill_timer);
arg.argc = process->argc;
arg.data = process->data;
int i;