XBT_DEBUG("Cleanup process %s (%p), waiting action %p",
process->name, process, process->waiting_action);
+ SIMIX_process_on_exit_runall(process);
+
/* cancel non-blocking communications */
smx_action_t action;
while ((action = xbt_fifo_pop(process->comms))) {
action, action->comm.detached, (int)action->state, action->comm.src_proc, action->comm.dst_proc);
action->comm.src_proc = NULL;
- if (action->comm.detached) {
- if (action->comm.refcount == 0) {
- XBT_DEBUG("Increase the refcount before destroying it since it's detached");
- /* I'm not supposed to destroy a detached comm from the sender side,
- * unless there is no receiver matching the rdv */
- action->comm.refcount++;
- SIMIX_comm_destroy(action);
- }
- else {
- XBT_DEBUG("Don't destroy it since its refcount is %d", action->comm.refcount);
- }
- } else {
+ /* I'm not supposed to destroy a detached comm from the sender side, */
+ if (!action->comm.detached)
SIMIX_comm_destroy(action);
- }
+ else
+ XBT_DEBUG("Don't destroy it since it's a detached comm");
+
}
else if (action->comm.dst_proc == process){
XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p",
process->context->iwannadie = 0;
}
-/**
+/**
* Garbage collection
*
* Should be called some time to time to free the memory allocated for processes
(*process)->data = data;
(*process)->comms = xbt_fifo_new();
(*process)->simcall.issuer = *process;
-
+
if (parent_process) {
(*process)->ppid = SIMIX_process_get_PID(parent_process);
} else {
xbt_swag_insert(*process, simix_global->process_list);
XBT_DEBUG("Inserting %s(%s) in the to_run list", (*process)->name, sg_host_name(host));
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, *process);
- }
- if (kill_time > SIMIX_get_clock()) {
- if (simix_global->kill_process_function) {
+ 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);
SIMIX_process_sleep_destroy(process->waiting_action);
break;
+ case SIMIX_ACTION_JOIN:
+ SIMIX_process_sleep_destroy(process->waiting_action);
+ break;
+
case SIMIX_ACTION_SYNCHRO:
SIMIX_synchro_stop_waiting(process, &process->simcall);
SIMIX_synchro_destroy(process->waiting_action);
void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
{
- xbt_assert((process != NULL), "Invalid parameters");
-
XBT_IN("process = %p, issuer = %p", process, issuer);
if(process->context->iwannadie) {
switch (process->waiting_action->type) {
- case SIMIX_ACTION_EXECUTE:
+ case SIMIX_ACTION_EXECUTE:
case SIMIX_ACTION_PARALLEL_EXECUTE:
SIMIX_host_execution_resume(process->waiting_action);
break;
}
void* SIMIX_pre_process_self_get_data(smx_simcall_t simcall, smx_process_t self){
- return SIMIX_process_self_get_data(self);
+ return SIMIX_process_self_get_data(self);
}
void* SIMIX_process_self_get_data(smx_process_t self)
return process->properties;
}
+void SIMIX_pre_process_join(smx_simcall_t simcall, smx_process_t process, double timeout)
+{
+ smx_action_t action = SIMIX_process_join(simcall->issuer, process, timeout);
+ xbt_fifo_push(action->simcalls, simcall);
+ simcall->issuer->waiting_action = action;
+}
+
+static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_action_t action){
+ if (action->sleep.surf_sleep) {
+ surf_action_cancel(action->sleep.surf_sleep);
+
+ smx_simcall_t simcall;
+ while ((simcall = xbt_fifo_shift(action->simcalls))) {
+ simcall_process_sleep__set__result(simcall, SIMIX_DONE);
+ simcall->issuer->waiting_action = NULL;
+ if (simcall->issuer->suspended) {
+ XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
+ simcall->issuer->suspended = 0;
+ SIMIX_pre_process_suspend(simcall, simcall->issuer);
+ } else {
+ SIMIX_simcall_answer(simcall);
+ }
+ }
+ surf_action_unref(action->sleep.surf_sleep);
+ action->sleep.surf_sleep = NULL;
+ }
+ xbt_mallocator_release(simix_global->action_mallocator, action);
+ return 0;
+}
+
+smx_action_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout)
+{
+ smx_action_t res = SIMIX_process_sleep(issuer, timeout);
+ res->type = SIMIX_ACTION_JOIN;
+ SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res);
+ return res;
+}
+
void SIMIX_pre_process_sleep(smx_simcall_t simcall, double duration)
{
if (MC_is_active()) {
{
smx_simcall_t simcall;
e_smx_state_t state;
- xbt_assert(action->type == SIMIX_ACTION_SLEEP);
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP || action->type == SIMIX_ACTION_JOIN);
while ((simcall = xbt_fifo_shift(action->simcalls))) {
void SIMIX_process_sleep_destroy(smx_action_t action)
{
XBT_DEBUG("Destroy action %p", action);
- xbt_assert(action->type == SIMIX_ACTION_SLEEP);
+ xbt_assert(action->type == SIMIX_ACTION_SLEEP || action->type == SIMIX_ACTION_JOIN);
- if (action->sleep.surf_sleep)
+ if (action->sleep.surf_sleep) {
surf_action_unref(action->sleep.surf_sleep);
- xbt_mallocator_release(simix_global->action_mallocator, action);
+ action->sleep.surf_sleep = NULL;
+ }
+ if (action->type == SIMIX_ACTION_SLEEP)
+ xbt_mallocator_release(simix_global->action_mallocator, action);
}
void SIMIX_process_sleep_suspend(smx_action_t action)
surf_action_resume(action->sleep.surf_sleep);
}
-/**
+/**
* \brief Calling this function makes the process to yield.
*
* Only the current process can call this function, giving back the control to
if (self->suspended) {
XBT_DEBUG("Hey! I'm suspended.");
- xbt_assert(!self->doexception, "Gloups! This exception may be lost by subsequent calls.");
+ xbt_assert(!self->doexception, "Gasp! This exception may be lost by subsequent calls.");
self->suspended = 0;
SIMIX_process_suspend(self, self);
}
void SIMIX_process_on_exit_runall(smx_process_t process) {
s_smx_process_exit_fun_t exit_fun;
-
+ smx_process_exit_status_t exit_status = (process->context->iwannadie) ?
+ SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
while (!xbt_dynar_is_empty(process->on_exit)) {
exit_fun = xbt_dynar_pop_as(process->on_exit,s_smx_process_exit_fun_t);
- (exit_fun.fun)(exit_fun.arg);
+ (exit_fun.fun)((void*)exit_status, exit_fun.arg);
}
}
void SIMIX_pre_process_on_exit(smx_simcall_t simcall, smx_process_t process,
- int_f_pvoid_t fun, void *data) {
+ int_f_pvoid_pvoid_t fun, void *data) {
SIMIX_process_on_exit(process, fun, data);
}
-void SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data) {
+void SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data) {
xbt_assert(process, "current process not found: are you in maestro context ?");
if (!process->on_exit) {
void SIMIX_pre_process_auto_restart_set(smx_simcall_t simcall, smx_process_t process,
int auto_restart) {
- SIMIX_process_auto_restart_set(process, auto_restart);
+ SIMIX_process_auto_restart_set(process, auto_restart);
}
/**
* \brief Sets the auto-restart status of the process.
}
smx_process_t SIMIX_pre_process_restart(smx_simcall_t simcall, smx_process_t process) {
- return SIMIX_process_restart(process, simcall->issuer);
+ return SIMIX_process_restart(process, simcall->issuer);
}
/**
* \brief Restart a process.
