X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da2ce25eaa2fbae84dd3308348b88dab9269211e..4dcdf4c43798ec5cfd6393c51768330cf5dfeb1d:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index 366cc77f8a..86422fd2cb 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -8,7 +8,6 @@ #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/dict.h" -#include "msg/mailbox.h" #include "mc/mc.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, @@ -31,7 +30,16 @@ XBT_INLINE smx_process_t SIMIX_process_self(void) } /** - * \brief Move a process to the list of processes to destroy. + * \brief Returns whether a process has pending asynchronous communications. + * \return true if there are asynchronous communications in this process + */ +int SIMIX_process_has_pending_comms(smx_process_t process) { + + return xbt_fifo_size(process->comms) > 0; +} + +/** + * \brief Moves a process to the list of processes to destroy. */ void SIMIX_process_cleanup(smx_process_t process) { @@ -42,32 +50,46 @@ void SIMIX_process_cleanup(smx_process_t process) smx_action_t action; while ((action = xbt_fifo_pop(process->comms))) { - /* make sure no one will finish the comm after this process is destroyed */ + /* make sure no one will finish the comm after this process is destroyed, + * because src_proc or dst_proc would be an invalid pointer */ SIMIX_comm_cancel(action); if (action->comm.src_proc == process) { - XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d", - action, action->comm.detached, action->state); + XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", + action, action->comm.detached, action->state, action->comm.src_proc, action->comm.dst_proc); action->comm.src_proc = NULL; if (action->comm.detached) { - /* the receiver was supposed to destroy the comm after completion, - * but the comm will actually never finish */ - action->comm.refcount++; + 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 { + SIMIX_comm_destroy(action); } } else if (action->comm.dst_proc == process){ - XBT_DEBUG("Found an unfinished recv comm %p, state %d", action, action->state); + XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", + action, action->state, action->comm.src_proc, action->comm.dst_proc); action->comm.dst_proc = NULL; + + if (action->comm.detached && action->comm.refcount == 1 + && action->comm.src_proc != NULL) { + /* the comm will be freed right now, remove it from the sender */ + xbt_fifo_remove(action->comm.src_proc->comms, action); + } + SIMIX_comm_destroy(action); } else { - XBT_DEBUG("Strange, I'm not in comm %p, state = %d, src = %p, dst = %p", action, - action->state, action->comm.src_proc, action->comm.dst_proc); - THROW_IMPOSSIBLE; + xbt_die("Communication action %p is in my list but I'm not the sender " + "or the receiver", action); } - - /* FIXME uncommenting this instruction crashes complex simulations - SIMIX_comm_destroy(action); */ } /*xbt_swag_remove(process, simix_global->process_to_run);*/ @@ -90,15 +112,12 @@ void SIMIX_process_empty_trash(void) SIMIX_context_free(process->context); /* Free the exception allocated at creation time */ - if (process->running_ctx) - free(process->running_ctx); - if (process->properties) - xbt_dict_free(&process->properties); + free(process->running_ctx); + xbt_dict_free(&process->properties); xbt_fifo_free(process->comms); free(process->name); - process->name = NULL; free(process); } } @@ -180,6 +199,7 @@ void SIMIX_process_create(smx_process_t *process, (*process)->smx_host = host; (*process)->data = data; (*process)->comms = xbt_fifo_new(); + (*process)->request.issuer = *process; XBT_VERB("Create context %s", (*process)->name); (*process)->context = SIMIX_context_new(code, argc, argv, @@ -250,6 +270,7 @@ void SIMIX_process_kill(smx_process_t process) { break; case SIMIX_ACTION_COMMUNICATE: + xbt_fifo_remove(process->comms, process->waiting_action); SIMIX_comm_destroy(process->waiting_action); break; @@ -263,8 +284,8 @@ void SIMIX_process_kill(smx_process_t process) { break; case SIMIX_ACTION_IO: - THROW_UNIMPLEMENTED; - break; + SIMIX_io_destroy(process->waiting_action); + break; } } @@ -327,7 +348,7 @@ void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer) process->suspended = 1; /* If we are suspending another process, and it is waiting on an action, - suspend it's action. */ + suspend its action. */ if (process != issuer) { if (process->waiting_action) { @@ -348,7 +369,8 @@ void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer) break; default: - THROW_IMPOSSIBLE; + xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d", + process->waiting_action->type); } } } @@ -387,7 +409,8 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer) break; default: - THROW_IMPOSSIBLE; + xbt_die("Internal error in SIMIX_process_resume: unexpected action type %d", + process->waiting_action->type); } } else { @@ -405,18 +428,21 @@ int SIMIX_process_count(void) return xbt_swag_size(simix_global->process_list); } -void* SIMIX_process_self_get_data(void) +void* SIMIX_process_self_get_data(smx_process_t self) { - smx_process_t me = SIMIX_process_self(); - if (!me) { + xbt_assert(self == SIMIX_process_self(), "This is not the current process"); + + if (!self) { return NULL; } - return SIMIX_process_get_data(me); + return SIMIX_process_get_data(self); } -void SIMIX_process_self_set_data(void *data) +void SIMIX_process_self_set_data(smx_process_t self, void *data) { - SIMIX_process_set_data(SIMIX_process_self(), data); + xbt_assert(self == SIMIX_process_self(), "This is not the current process"); + + SIMIX_process_set_data(self, data); } void* SIMIX_process_get_data(smx_process_t process) @@ -560,13 +586,15 @@ void SIMIX_process_sleep_resume(smx_action_t action) } /** - * Calling this function makes the process to yield. - * Only the processes can call this function, giving back the control to maestro + * \brief Calling this function makes the process to yield. + * + * Only the current process can call this function, giving back the control to + * maestro. + * + * \param self the current process */ -void SIMIX_process_yield(void) +void SIMIX_process_yield(smx_process_t self) { - smx_process_t self = SIMIX_process_self(); - XBT_DEBUG("Yield process '%s'", self->name); /* Go into sleep and return control to maestro */ @@ -612,3 +640,25 @@ smx_context_t SIMIX_process_get_context(smx_process_t p) { void SIMIX_process_set_context(smx_process_t p,smx_context_t c) { p->context = c; } + +/** + * \brief Returns the list of processes to run. + */ +xbt_dynar_t SIMIX_process_get_runnable(void) +{ + return simix_global->process_to_run; +} + +/** + * \brief Returns the process from PID. + */ +smx_process_t SIMIX_process_from_PID(int PID) +{ + smx_process_t proc; + xbt_swag_foreach(proc, simix_global->process_list) + { + if(proc->pid == PID) + return proc; + } + return NULL; +}