X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/270b319983f1f35c5ec8c9616c6defa1251b92dc..28fd49f9900e7a8424f38cafd21682f8c732ed42:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index 3296198782..048f5c3ec7 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -4,11 +4,10 @@ /* 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" -#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); } } @@ -81,7 +136,7 @@ void SIMIX_create_maestro_process() maestro->running_ctx = xbt_new(xbt_running_ctx_t, 1); XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx); maestro->context = SIMIX_context_new(NULL, 0, NULL, NULL, maestro); - maestro->request.issuer = maestro; + maestro->simcall.issuer = maestro; simix_global->maestro_process = maestro; return; @@ -111,7 +166,7 @@ smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) { * \brief Internal function to create a process. * * This function actually creates the process. - * It may be called when a REQ_PROCESS_CREATE request occurs, + * It may be called when a SIMCALL_PROCESS_CREATE simcall occurs, * or directly for SIMIX internal purposes. * * \return the process created @@ -143,6 +198,8 @@ void SIMIX_process_create(smx_process_t *process, (*process)->name = xbt_strdup(name); (*process)->smx_host = host; (*process)->data = data; + (*process)->comms = xbt_fifo_new(); + (*process)->simcall.issuer = *process; XBT_VERB("Create context %s", (*process)->name); (*process)->context = SIMIX_context_new(code, argc, argv, @@ -166,10 +223,29 @@ 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. * - * This function may be called when a REQ_PROCESS_KILL request occurs, + * This function may be called when a SIMCALL_PROCESS_KILL simcall occurs, * or directly for SIMIX internal purposes. * * \param process poor victim @@ -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; @@ -201,13 +279,13 @@ void SIMIX_process_kill(smx_process_t process) { break; case SIMIX_ACTION_SYNCHRO: - SIMIX_synchro_stop_waiting(process, &process->request); + SIMIX_synchro_stop_waiting(process, &process->simcall); SIMIX_synchro_destroy(process->waiting_action); break; case SIMIX_ACTION_IO: - THROW_UNIMPLEMENTED; - break; + SIMIX_io_destroy(process->waiting_action); + break; } } @@ -247,23 +325,30 @@ 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) +void SIMIX_pre_process_suspend(smx_simcall_t simcall) { - smx_process_t process = req->process_suspend.process; - SIMIX_process_suspend(process, req->issuer); + smx_process_t process = simcall->process_suspend.process; + SIMIX_process_suspend(process, simcall->issuer); - if (process != req->issuer) { - SIMIX_request_answer(req); + if (process != simcall->issuer) { + SIMIX_simcall_answer(simcall); } - /* If we are suspending ourselves, then just do not replay the request. */ + /* If we are suspending ourselves, then just do not finish the simcall now */ } 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) { @@ -284,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); } } } @@ -294,6 +380,11 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer) { xbt_assert((process != NULL), "Invalid parameters"); + if (!process->suspended) { + XBT_DEBUG("Process '%s' is not suspended", process->name); + return; + } + process->suspended = 0; /* If we are resuming another process, resume the action it was waiting for @@ -318,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 { @@ -336,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) @@ -365,7 +460,7 @@ smx_host_t SIMIX_process_get_host(smx_process_t process) return process->smx_host; } -/* needs to be public and without request because it is called +/* needs to be public and without simcall because it is called by exceptions and logging events */ const char* SIMIX_process_self_get_name(void) { @@ -403,17 +498,17 @@ xbt_dict_t SIMIX_process_get_properties(smx_process_t process) return process->properties; } -void SIMIX_pre_process_sleep(smx_req_t req) +void SIMIX_pre_process_sleep(smx_simcall_t simcall) { if (MC_IS_ENABLED) { - MC_process_clock_add(req->issuer, req->process_sleep.duration); - req->process_sleep.result = SIMIX_DONE; - SIMIX_request_answer(req); + MC_process_clock_add(simcall->issuer, simcall->process_sleep.duration); + simcall->process_sleep.result = SIMIX_DONE; + SIMIX_simcall_answer(simcall); return; } - smx_action_t action = SIMIX_process_sleep(req->issuer, req->process_sleep.duration); - xbt_fifo_push(action->request_list, req); - req->issuer->waiting_action = action; + smx_action_t action = SIMIX_process_sleep(simcall->issuer, simcall->process_sleep.duration); + xbt_fifo_push(action->simcalls, simcall); + simcall->issuer->waiting_action = action; } smx_action_t SIMIX_process_sleep(smx_process_t process, double duration) @@ -447,10 +542,10 @@ smx_action_t SIMIX_process_sleep(smx_process_t process, double duration) void SIMIX_post_process_sleep(smx_action_t action) { - smx_req_t req; + smx_simcall_t simcall; e_smx_state_t state; - while ((req = xbt_fifo_shift(action->request_list))) { + while ((simcall = xbt_fifo_shift(action->simcalls))) { switch(surf_workstation_model->action_state_get(action->sleep.surf_sleep)){ case SURF_ACTION_FAILED: @@ -465,9 +560,9 @@ void SIMIX_post_process_sleep(smx_action_t action) THROW_IMPOSSIBLE; break; } - req->process_sleep.result = state; - req->issuer->waiting_action = NULL; - SIMIX_request_answer(req); + simcall->process_sleep.result = state; + simcall->issuer->waiting_action = NULL; + SIMIX_simcall_answer(simcall); } SIMIX_process_sleep_destroy(action); } @@ -477,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); } @@ -494,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!"); @@ -517,7 +611,7 @@ void SIMIX_process_yield(void) if (self->doexception) { XBT_DEBUG("Wait, maestro left me an exception"); self->doexception = 0; - RETHROW; + SMX_THROW(); } if (self->new_host) { @@ -546,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; +}