X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7db12e38ca35bf9c423e101cf16b4d1299bb3a3e..67d8461e1530fcf03ba924c15a97eba2550d78e0:/src/simix/smx_synchro.cpp diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp index f2a98c7ac8..e25a2275d2 100644 --- a/src/simix/smx_synchro.cpp +++ b/src/simix/smx_synchro.cpp @@ -1,11 +1,10 @@ - -/* Copyright (c) 2007-2015. The SimGrid Team. +/* Copyright (c) 2007-2017. The SimGrid Team. * All rights reserved. */ /* 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 "smx_private.h" +#include "smx_private.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" #include @@ -27,9 +26,10 @@ 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(); + simgrid::kernel::activity::RawImplPtr sync = + simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl()); sync->sleep = smx_host->pimpl_cpu->sleep(timeout); - sync->sleep->setData(sync); + sync->sleep->setData(sync.get()); XBT_OUT(); return sync; } @@ -67,7 +67,7 @@ void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall) void SIMIX_synchro_finish(smx_activity_t synchro) { - XBT_IN("(%p)",synchro); + XBT_IN("(%p)", synchro.get()); smx_simcall_t simcall = synchro->simcalls.front(); synchro->simcalls.pop_front(); @@ -79,7 +79,6 @@ void SIMIX_synchro_finish(smx_activity_t synchro) case SIMIX_FAILED: simcall->issuer->context->iwannadie = 1; -// SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break; default: @@ -89,7 +88,6 @@ void SIMIX_synchro_finish(smx_activity_t synchro) SIMIX_synchro_stop_waiting(simcall->issuer, simcall); simcall->issuer->waiting_synchro = nullptr; - delete synchro; SIMIX_simcall_answer(simcall); XBT_OUT(); } @@ -98,7 +96,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: @@ -107,14 +105,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_actor_t issuer) +void MutexImpl::lock(smx_actor_t issuer) { XBT_IN("(%p; %p)", this, issuer); /* FIXME: check where to validate the arguments */ @@ -141,7 +139,7 @@ void Mutex::lock(smx_actor_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_actor_t issuer) +bool MutexImpl::try_lock(smx_actor_t issuer) { XBT_IN("(%p, %p)", this, issuer); if (this->locked) { @@ -157,25 +155,24 @@ bool Mutex::try_lock(smx_actor_t issuer) /** Unlock a mutex for a process * - * Unlocks the mutex and gives it to a process waiting for it. + * Unlocks the mutex and gives it to a process waiting for it. * 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_actor_t issuer) +void MutexImpl::unlock(smx_actor_t issuer) { XBT_IN("(%p, %p)", this, issuer); - if(!this->locked) + 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) - THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%ld), not by you.", - this->owner->name.c_str(),this->owner->pid); + THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%lu), not by you.", + this->owner->getCname(), this->owner->pid); if (xbt_swag_size(this->sleeping) > 0) { /*process to wake up */ smx_actor_t p = (smx_actor_t) xbt_swag_extract(this->sleeping); - delete p->waiting_synchro; p->waiting_synchro = nullptr; this->owner = p; SIMIX_simcall_answer(&p->simcall); @@ -205,11 +202,6 @@ void SIMIX_mutex_unref(smx_mutex_t mutex) intrusive_ptr_release(mutex); } -smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall) -{ - return new simgrid::simix::Mutex(); -} - // Simcall handlers: void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex) @@ -240,7 +232,7 @@ smx_cond_t SIMIX_cond_init() { XBT_IN("()"); simgrid::simix::ActorImpl p; - smx_cond_t cond = new s_smx_cond(); + smx_cond_t cond = new s_smx_cond_t(); cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup)); cond->refcount_ = 1; XBT_OUT(); @@ -293,14 +285,14 @@ static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, synchro = SIMIX_synchro_wait(issuer->host, timeout); synchro->simcalls.push_front(simcall); issuer->waiting_synchro = synchro; - xbt_swag_insert(simcall->issuer, cond->sleeping); + xbt_swag_insert(simcall->issuer, cond->sleeping); XBT_OUT(); } /** * \brief Signalizes a condition. * - * Signalizes a condition and wakes up a sleeping process. + * Signalizes a condition and wakes up a sleeping process. * If there are no process sleeping, no action is done. * \param cond A condition */ @@ -313,12 +305,11 @@ void SIMIX_cond_signal(smx_cond_t cond) XBT_DEBUG("Signal condition %p", cond); - /* If there are processes waiting for the condition choose one and try + /* If there are processes waiting for the condition choose one and try to make it acquire the mutex */ if ((proc = (smx_actor_t) xbt_swag_extract(cond->sleeping))) { /* Destroy waiter's synchronization */ - delete proc->waiting_synchro; proc->waiting_synchro = nullptr; /* Now transform the cond wait simcall into a mutex lock one */ @@ -373,15 +364,13 @@ void SIMIX_cond_unref(smx_cond_t cond) void intrusive_ptr_add_ref(s_smx_cond_t *cond) { - auto previous = (cond->refcount_)++; + auto previous = cond->refcount_.fetch_add(1); xbt_assert(previous != 0); - (void) previous; } void intrusive_ptr_release(s_smx_cond_t *cond) { - auto count = --(cond->refcount_); - if (count == 0) { + if (cond->refcount_.fetch_sub(1) == 1) { xbt_assert(xbt_swag_size(cond->sleeping) == 0, "Cannot destroy conditional since someone is still using it"); xbt_swag_free(cond->sleeping); @@ -396,7 +385,7 @@ smx_sem_t SIMIX_sem_init(unsigned int value) XBT_IN("(%u)",value); simgrid::simix::ActorImpl p; - smx_sem_t sem = xbt_new0(s_smx_sem_t, 1); + smx_sem_t sem = new s_smx_sem_t; sem->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup)); sem->value = value; XBT_OUT(); @@ -412,14 +401,11 @@ void SIMIX_sem_destroy(smx_sem_t sem) xbt_assert(xbt_swag_size(sem->sleeping) == 0, "Cannot destroy semaphore since someone is still using it"); xbt_swag_free(sem->sleeping); - xbt_free(sem); + delete sem; } XBT_OUT(); } -void simcall_HANDLER_sem_release(smx_simcall_t simcall, smx_sem_t sem){ - SIMIX_sem_release(sem); -} /** @brief release the semaphore * * Unlock a process waiting on the semaphore. @@ -432,7 +418,6 @@ void SIMIX_sem_release(smx_sem_t sem) XBT_DEBUG("Sem release semaphore %p", sem); if ((proc = (smx_actor_t) xbt_swag_extract(sem->sleeping))) { - delete proc->waiting_synchro; proc->waiting_synchro = nullptr; SIMIX_simcall_answer(&proc->simcall); } else { @@ -449,9 +434,6 @@ int SIMIX_sem_would_block(smx_sem_t sem) return (sem->value <= 0); } -int simcall_HANDLER_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem){ - return SIMIX_sem_get_capacity(sem); -} /** @brief Returns the current capacity of the semaphore */ int SIMIX_sem_get_capacity(smx_sem_t sem) { @@ -497,9 +479,6 @@ void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem) void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout) { XBT_IN("(%p)",simcall); - _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall); + _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall); XBT_OUT(); } -int simcall_HANDLER_sem_would_block(smx_simcall_t simcall, smx_sem_t sem) { - return SIMIX_sem_would_block(sem); -}