X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/75e8b2ae65722d849ef899616de7091286ec91f5..7f960794190d563e58d57286c7401f0d4e2892d4:/src/s4u/s4u_Semaphore.cpp diff --git a/src/s4u/s4u_Semaphore.cpp b/src/s4u/s4u_Semaphore.cpp index 9e14147af6..3d8d8c0b1d 100644 --- a/src/s4u/s4u_Semaphore.cpp +++ b/src/s4u/s4u_Semaphore.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2018-2020. 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. */ @@ -21,7 +21,7 @@ Semaphore::Semaphore(unsigned int initial_capacity) Semaphore::~Semaphore() { if (sem_ != nullptr) { - xbt_assert(sem_->sleeping_.empty(), "Cannot destroy semaphore since someone is still using it"); + xbt_assert(not sem_->is_used(), "Cannot destroy semaphore since someone is still using it"); delete sem_; } } @@ -46,12 +46,12 @@ void Semaphore::release() kernel::actor::simcall([this] { sem_->release(); }); } -int Semaphore::get_capacity() +int Semaphore::get_capacity() const { return kernel::actor::simcall([this] { return sem_->get_capacity(); }); } -int Semaphore::would_block() +int Semaphore::would_block() const { return kernel::actor::simcall([this] { return sem_->would_block(); }); } @@ -99,7 +99,7 @@ void sg_sem_release(sg_sem_t sem) sem->release(); } -int sg_sem_get_capacity(sg_sem_t sem) +int sg_sem_get_capacity(const_sg_sem_t sem) { return sem->get_capacity(); } @@ -114,7 +114,7 @@ void sg_sem_destroy(const_sg_sem_t sem) * Note that the returned value may be wrong right after the function call, when you try to use it... * But that's a classical semaphore issue, and SimGrid's semaphore are not different to usual ones here. */ -int sg_sem_would_block(sg_sem_t sem) +int sg_sem_would_block(const_sg_sem_t sem) { return sem->would_block(); }