X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3449b598e71c864ac636920b839cfe832d96d411..403dffe3ed80a3b2761171f5984e4a7d63fde281:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index a13e5653d2..7ea92f35f3 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -4,7 +4,7 @@ /* 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" @@ -30,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) { @@ -41,31 +50,33 @@ 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, src = %p, dst = %p", - action, action->comm.detached, action->state, action->comm.src_proc, action->comm.dst_proc); + 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"); + 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); } - XBT_DEBUG("Don't destroy it since its refcount is %d",action->comm.refcount); - } - else { + 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, (int)action->state, action->comm.src_proc, action->comm.dst_proc); action->comm.dst_proc = NULL; if (action->comm.detached && action->comm.refcount == 1 @@ -125,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; @@ -155,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 @@ -188,7 +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; + (*process)->simcall.issuer = *process; XBT_VERB("Create context %s", (*process)->name); (*process)->context = SIMIX_context_new(code, argc, argv, @@ -234,7 +245,7 @@ void SIMIX_process_runall(void) /** * \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 @@ -259,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; @@ -267,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; } } @@ -294,7 +306,7 @@ void SIMIX_process_killall(smx_process_t issuer) } } - SIMIX_context_runall(simix_global->process_to_run); + SIMIX_context_runall(); SIMIX_process_empty_trash(); } @@ -313,15 +325,15 @@ 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) @@ -358,7 +370,7 @@ void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer) default: xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d", - process->waiting_action->type); + (int)process->waiting_action->type); } } } @@ -368,11 +380,6 @@ 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 @@ -398,7 +405,7 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer) default: xbt_die("Internal error in SIMIX_process_resume: unexpected action type %d", - process->waiting_action->type); + (int)process->waiting_action->type); } } else { @@ -448,7 +455,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) { @@ -486,17 +493,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) @@ -530,10 +537,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: @@ -548,9 +555,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); } @@ -599,7 +606,7 @@ void SIMIX_process_yield(smx_process_t self) if (self->doexception) { XBT_DEBUG("Wait, maestro left me an exception"); self->doexception = 0; - RETHROW; + SMX_THROW(); } if (self->new_host) { @@ -632,7 +639,31 @@ void SIMIX_process_set_context(smx_process_t p,smx_context_t c) { /** * \brief Returns the list of processes to run. */ -XBT_INLINE xbt_dynar_t SIMIX_process_get_runnable(void) +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; +} + +/** @brief returns a dynar containg all currently existing processes */ +xbt_dynar_t SIMIX_processes_as_dynar(void) { + smx_process_t proc; + xbt_dynar_t res = xbt_dynar_new(sizeof(smx_process_t),NULL); + xbt_swag_foreach(proc, simix_global->process_list) { + xbt_dynar_push(res,&proc); + } + return res; +}