X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/544e6fac3fc91ae81d5daa4481562240c2cb2467..a4ebb6917b0c05404f2444620b7230f3a9c0f262:/src/simix/smx_synchro.cpp diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp index 0ec524fa60..2095a4c0b1 100644 --- a/src/simix/smx_synchro.cpp +++ b/src/simix/smx_synchro.cpp @@ -5,8 +5,9 @@ /* 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 "src/surf/surf_interface.hpp" #include "smx_private.h" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/surf_interface.hpp" #include #include @@ -16,8 +17,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mu static smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout); static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, - smx_process_t issuer, smx_simcall_t simcall); -static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer, + smx_actor_t issuer, smx_simcall_t simcall); +static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer, smx_simcall_t simcall); /***************************** Raw synchronization *********************************/ @@ -27,13 +28,13 @@ static smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout) XBT_IN("(%p, %f)",smx_host,timeout); simgrid::kernel::activity::Raw *sync = new simgrid::kernel::activity::Raw(); - sync->sleep = surf_host_sleep(smx_host, timeout); + sync->sleep = smx_host->pimpl_cpu->sleep(timeout); sync->sleep->setData(sync); XBT_OUT(); return sync; } -void SIMIX_synchro_stop_waiting(smx_process_t process, smx_simcall_t simcall) +void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall) { XBT_IN("(%p, %p)",process,simcall); switch (simcall->call) { @@ -97,7 +98,7 @@ void SIMIX_synchro_finish(smx_activity_t synchro) namespace simgrid { namespace simix { -Mutex::Mutex() : mutex_(this) +MutexImpl::MutexImpl() : mutex_(this) { XBT_IN("(%p)", this); // Useful to initialize sleeping swag: @@ -106,14 +107,14 @@ Mutex::Mutex() : mutex_(this) XBT_OUT(); } -Mutex::~Mutex() +MutexImpl::~MutexImpl() { XBT_IN("(%p)", this); xbt_swag_free(this->sleeping); XBT_OUT(); } -void Mutex::lock(smx_process_t issuer) +void MutexImpl::lock(smx_actor_t issuer) { XBT_IN("(%p; %p)", this, issuer); /* FIXME: check where to validate the arguments */ @@ -140,7 +141,7 @@ void Mutex::lock(smx_process_t issuer) * \param issuer the process that tries to acquire the mutex * \return whether we managed to lock the mutex */ -bool Mutex::try_lock(smx_process_t issuer) +bool MutexImpl::try_lock(smx_actor_t issuer) { XBT_IN("(%p, %p)", this, issuer); if (this->locked) { @@ -160,9 +161,11 @@ bool Mutex::try_lock(smx_process_t issuer) * If the unlocker is not the owner of the mutex nothing happens. * If there are no process waiting, it sets the mutex as free. */ -void Mutex::unlock(smx_process_t issuer) +void MutexImpl::unlock(smx_actor_t issuer) { XBT_IN("(%p, %p)", this, issuer); + if (not this->locked) + THROWF(mismatch_error, 0, "Cannot release that mutex: it was not locked."); /* If the mutex is not owned by the issuer, that's not good */ if (issuer != this->owner) @@ -171,7 +174,7 @@ void Mutex::unlock(smx_process_t issuer) if (xbt_swag_size(this->sleeping) > 0) { /*process to wake up */ - smx_process_t p = (smx_process_t) xbt_swag_extract(this->sleeping); + smx_actor_t p = (smx_actor_t) xbt_swag_extract(this->sleeping); delete p->waiting_synchro; p->waiting_synchro = nullptr; this->owner = p; @@ -204,7 +207,7 @@ void SIMIX_mutex_unref(smx_mutex_t mutex) smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall) { - return new simgrid::simix::Mutex(); + return new simgrid::simix::MutexImpl(); } // Simcall handlers: @@ -251,7 +254,7 @@ smx_cond_t SIMIX_cond_init() void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex) { XBT_IN("(%p)",simcall); - smx_process_t issuer = simcall->issuer; + smx_actor_t issuer = simcall->issuer; _SIMIX_cond_wait(cond, mutex, -1, issuer, simcall); XBT_OUT(); @@ -265,7 +268,7 @@ void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout) { XBT_IN("(%p)",simcall); - smx_process_t issuer = simcall->issuer; + smx_actor_t issuer = simcall->issuer; _SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall); XBT_OUT(); @@ -273,7 +276,7 @@ void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, - smx_process_t issuer, smx_simcall_t simcall) + smx_actor_t issuer, smx_simcall_t simcall) { XBT_IN("(%p, %p, %f, %p,%p)",cond,mutex,timeout,issuer,simcall); smx_activity_t synchro = nullptr; @@ -304,7 +307,7 @@ static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, void SIMIX_cond_signal(smx_cond_t cond) { XBT_IN("(%p)",cond); - smx_process_t proc = nullptr; + smx_actor_t proc = nullptr; smx_mutex_t mutex = nullptr; smx_simcall_t simcall = nullptr; @@ -312,7 +315,7 @@ void SIMIX_cond_signal(smx_cond_t cond) /* If there are processes waiting for the condition choose one and try to make it acquire the mutex */ - if ((proc = (smx_process_t) xbt_swag_extract(cond->sleeping))) { + if ((proc = (smx_actor_t) xbt_swag_extract(cond->sleeping))) { /* Destroy waiter's synchronization */ delete proc->waiting_synchro; @@ -372,7 +375,6 @@ void intrusive_ptr_add_ref(s_smx_cond_t *cond) { auto previous = (cond->refcount_)++; xbt_assert(previous != 0); - (void) previous; } void intrusive_ptr_release(s_smx_cond_t *cond) @@ -387,7 +389,6 @@ void intrusive_ptr_release(s_smx_cond_t *cond) } /******************************** Semaphores **********************************/ -#define SMX_SEM_NOLIMIT 99999 /** @brief Initialize a semaphore */ smx_sem_t SIMIX_sem_init(unsigned int value) { @@ -426,14 +427,14 @@ void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem){ void SIMIX_sem_release(smx_sem_t sem) { XBT_IN("(%p)",sem); - smx_process_t proc; + smx_actor_t proc; XBT_DEBUG("Sem release semaphore %p", sem); - if ((proc = (smx_process_t) xbt_swag_extract(sem->sleeping))) { + if ((proc = (smx_actor_t) xbt_swag_extract(sem->sleeping))) { delete proc->waiting_synchro; proc->waiting_synchro = nullptr; SIMIX_simcall_answer(&proc->simcall); - } else if (sem->value < SMX_SEM_NOLIMIT) { + } else { sem->value++; } XBT_OUT(); @@ -458,7 +459,7 @@ int SIMIX_sem_get_capacity(smx_sem_t sem) return sem->value; } -static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer, +static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer, smx_simcall_t simcall) { XBT_IN("(%p, %f, %p, %p)",sem,timeout,issuer,simcall);