X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec16845133f5f1b5262d2d77d8ba22824fa8a446..1c6ecd7825422241dd932318a4ba03c3df1de985:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index a9e96fabfc..c698c7ca61 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,11 +30,68 @@ 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) { - XBT_DEBUG("Cleanup process %s", process->name); + XBT_DEBUG("Cleanup process %s (%p), waiting action %p", + process->name, process, process->waiting_action); + + /* cancel non-blocking communications */ + smx_action_t action; + while ((action = xbt_fifo_pop(process->comms))) { + + /* 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, 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) { + 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, 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_die("Communication action %p is in my list but I'm not the sender " + "or the receiver", action); + } + } + /*xbt_swag_remove(process, simix_global->process_to_run);*/ xbt_swag_remove(process, simix_global->process_list); xbt_swag_remove(process, process->smx_host->process_list); @@ -56,13 +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); } } @@ -136,13 +191,15 @@ void SIMIX_process_create(smx_process_t *process, else { *process = xbt_new0(s_smx_process_t, 1); - xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters"); + xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters"); /* Process data */ (*process)->pid = simix_process_maxpid++; (*process)->name = xbt_strdup(name); (*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, @@ -166,6 +223,25 @@ void SIMIX_process_create(smx_process_t *process, } } +/** + * \brief Executes the processes from simix_global->process_to_run. + * + * The processes of simix_global->process_to_run are run (in parallel if + * possible). On exit, simix_global->process_to_run is empty, and + * simix_global->process_that_ran contains the list of processes that just ran. + * The two lists are swapped so, be careful when using them before and after a + * call to this function. + */ +void SIMIX_process_runall(void) +{ + SIMIX_context_runall(); + + xbt_dynar_t tmp = simix_global->process_that_ran; + simix_global->process_that_ran = simix_global->process_to_run; + simix_global->process_to_run = tmp; + xbt_dynar_reset(simix_global->process_to_run); +} + /** * \brief Internal function to kill a SIMIX process. * @@ -183,6 +259,7 @@ void SIMIX_process_kill(smx_process_t process) { process->suspended = 0; /* FIXME: set doexception to 0 also? */ + /* destroy the blocking action if any */ if (process->waiting_action) { switch (process->waiting_action->type) { @@ -193,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; @@ -234,16 +312,17 @@ void SIMIX_process_killall(smx_process_t issuer) } void SIMIX_process_change_host(smx_process_t process, - const char *source, const char *dest) + smx_host_t dest) { - smx_host_t h1 = NULL; - smx_host_t h2 = NULL; - xbt_assert0((process != NULL), "Invalid parameters"); - h1 = SIMIX_host_get_by_name(source); - h2 = SIMIX_host_get_by_name(dest); - process->smx_host = h2; - xbt_swag_remove(process, h1->process_list); - xbt_swag_insert(process, h2->process_list); + xbt_assert((process != NULL), "Invalid parameters"); + xbt_swag_remove(process, process->smx_host->process_list); + process->smx_host = dest; + xbt_swag_insert(process, dest->process_list); +} + +void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t dest) +{ + process->new_host = dest; } void SIMIX_pre_process_suspend(smx_req_t req) @@ -259,10 +338,17 @@ void SIMIX_pre_process_suspend(smx_req_t req) void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer) { + xbt_assert((process != NULL), "Invalid parameters"); + + if (process->suspended) { + XBT_DEBUG("Process '%s' is already suspended", process->name); + return; + } + 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) { @@ -283,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); } } } @@ -291,7 +378,12 @@ void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer) void SIMIX_process_resume(smx_process_t process, smx_process_t issuer) { - xbt_assert0((process != NULL), "Invalid parameters"); + xbt_assert((process != NULL), "Invalid parameters"); + + if (!process->suspended) { + XBT_DEBUG("Process '%s' is not suspended", process->name); + return; + } process->suspended = 0; @@ -317,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 { @@ -335,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) @@ -476,9 +572,6 @@ void SIMIX_process_sleep_destroy(smx_action_t action) XBT_DEBUG("Destroy action %p", action); if (action->sleep.surf_sleep) action->sleep.surf_sleep->model_type->action_unref(action->sleep.surf_sleep); -#ifdef HAVE_TRACING - TRACE_smx_action_destroy(action); -#endif xbt_mallocator_release(simix_global->action_mallocator, action); } @@ -493,20 +586,22 @@ 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 */ SIMIX_context_suspend(self->context); /* Ok, maestro returned control to us */ - XBT_DEBUG("Maestro returned control to me: '%s'", self->name); + XBT_DEBUG("Control returned to me: '%s'", self->name); if (self->context->iwannadie){ XBT_DEBUG("I wanna die!"); @@ -518,6 +613,11 @@ void SIMIX_process_yield(void) self->doexception = 0; RETHROW; } + + if (self->new_host) { + SIMIX_process_change_host(self, self->new_host); + self->new_host = NULL; + } } /* callback: context fetching */ @@ -540,3 +640,11 @@ 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_INLINE xbt_dynar_t SIMIX_process_get_runnable(void) +{ + return simix_global->process_to_run; +}