X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/60087ab28ce5450ad32f128cffbb09eb492eb550..a65b8336dd2a009d8880f167839ee901ebcb2bfb:/src/simix/smx_process.cpp diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp index 82b4d162a4..223cba7d46 100644 --- a/src/simix/smx_process.cpp +++ b/src/simix/smx_process.cpp @@ -12,7 +12,6 @@ #include "mc/mc.h" #include "src/mc/mc_replay.h" #include "src/mc/Client.hpp" -#include "src/simix/smx_private.hpp" #include "src/msg/msg_private.h" #include "src/simix/SynchroSleep.hpp" @@ -73,7 +72,7 @@ void SIMIX_process_cleanup(smx_process_t process) /* 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(comm); + comm->cancel(); if (comm->src_proc == process) { XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", @@ -84,7 +83,7 @@ void SIMIX_process_cleanup(smx_process_t process) if (comm->detached) XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender"); else - SIMIX_comm_destroy(comm); + comm->unref(); } else if (comm->dst_proc == process){ @@ -92,11 +91,11 @@ void SIMIX_process_cleanup(smx_process_t process) comm, (int)comm->state, comm->src_proc, comm->dst_proc); comm->dst_proc = NULL; - if (comm->detached && comm->refcount == 1 && comm->src_proc != NULL) { + if (comm->detached && /* FIXME: This code should be moved within comm->unref() anyway. comm->refcount == 1 &&*/ comm->src_proc != NULL) { /* the comm will be freed right now, remove it from the sender */ xbt_fifo_remove(comm->src_proc->comms, comm); } - SIMIX_comm_destroy(comm); + comm->unref(); } else { xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro); } @@ -125,7 +124,7 @@ void SIMIX_process_empty_trash(void) while ((process = (smx_process_t) xbt_swag_extract(simix_global->process_to_destroy))) { XBT_DEBUG("Getting rid of %p",process); - SIMIX_context_free(process->context); + delete process->context; /* Free the exception allocated at creation time */ free(process->running_ctx); @@ -198,8 +197,7 @@ void SIMIX_process_stop(smx_process_t arg) { arg->auto_restart); } XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_get_name(arg->host)); - /* stop the context */ - SIMIX_context_stop(arg->context); + arg->context->stop(); } /** @@ -504,13 +502,13 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) { simgrid::simix::Io *io = dynamic_cast(process->waiting_synchro); if (exec != nullptr) { - SIMIX_execution_destroy(process->waiting_synchro); + exec->unref(); } else if (comm != nullptr) { xbt_fifo_remove(process->comms, process->waiting_synchro); - SIMIX_comm_cancel(process->waiting_synchro); + comm->cancel(); xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall); - SIMIX_comm_destroy(process->waiting_synchro); + comm->unref(); } else if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); @@ -561,8 +559,8 @@ void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con simgrid::simix::Comm *comm = dynamic_cast(process->waiting_synchro); if (comm != nullptr) { - xbt_fifo_remove(process->comms, process->waiting_synchro); - SIMIX_comm_cancel(process->waiting_synchro); + xbt_fifo_remove(process->comms, comm); + comm->cancel(); } simgrid::simix::Sleep *sleep = dynamic_cast(process->waiting_synchro); @@ -629,15 +627,14 @@ void SIMIX_process_change_host(smx_process_t process, void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process) { - smx_synchro_t sync_suspend = - SIMIX_process_suspend(process, simcall->issuer); + smx_synchro_t sync_suspend = SIMIX_process_suspend(process, simcall->issuer); if (process != simcall->issuer) { SIMIX_simcall_answer(simcall); } else { xbt_fifo_push(sync_suspend->simcalls, simcall); process->waiting_synchro = sync_suspend; - SIMIX_execution_suspend(process->waiting_synchro); + process->waiting_synchro->suspend(); } /* If we are suspending ourselves, then just do not finish the simcall now */ } @@ -861,46 +858,6 @@ smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration) return synchro; } -void SIMIX_post_process_sleep(smx_synchro_t synchro) -{ - smx_simcall_t simcall; - e_smx_state_t state; - simgrid::simix::Sleep *sleep = static_cast(synchro); - - while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) { - - switch (sleep->surf_sleep->getState()){ - case simgrid::surf::Action::State::failed: - simcall->issuer->context->iwannadie = 1; - //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); - state = SIMIX_SRC_HOST_FAILURE; - break; - - case simgrid::surf::Action::State::done: - state = SIMIX_DONE; - break; - - default: - THROW_IMPOSSIBLE; - break; - } - if (simcall->issuer->host->isOff()) { - simcall->issuer->context->iwannadie = 1; - } - simcall_process_sleep__set__result(simcall, state); - simcall->issuer->waiting_synchro = NULL; - if (simcall->issuer->suspended) { - XBT_DEBUG("Wait! This process is suspended and can't wake up now."); - simcall->issuer->suspended = 0; - simcall_HANDLER_process_suspend(simcall, simcall->issuer); - } else { - SIMIX_simcall_answer(simcall); - } - } - - SIMIX_process_sleep_destroy(synchro); -} - void SIMIX_process_sleep_destroy(smx_synchro_t synchro) { XBT_DEBUG("Destroy synchro %p", synchro); @@ -925,7 +882,7 @@ void SIMIX_process_yield(smx_process_t self) XBT_DEBUG("Yield process '%s'", self->name); /* Go into sleep and return control to maestro */ - SIMIX_context_suspend(self->context); + self->context->suspend(); /* Ok, maestro returned control to us */ XBT_DEBUG("Control returned to me: '%s'", self->name);