X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08e7455d67920bbd7a87f440d00f2c1e071314a0..a9dc23242c8a8a0084ad22a773b450dcd57f9f3c:/src/kernel/activity/SemaphoreImpl.hpp diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp index f2d05b7466..33793ce403 100644 --- a/src/kernel/activity/SemaphoreImpl.hpp +++ b/src/kernel/activity/SemaphoreImpl.hpp @@ -18,12 +18,12 @@ namespace activity { class XBT_PUBLIC SemaphoreImpl { std::atomic_int_fast32_t refcount_{1}; + s4u::Semaphore piface_; unsigned int value_; actor::SynchroList sleeping_; /* list of sleeping actors*/ public: - explicit SemaphoreImpl(unsigned int value) : value_(value){}; - ~SemaphoreImpl() = default; + explicit SemaphoreImpl(unsigned int value) : piface_(this), value_(value){}; SemaphoreImpl(SemaphoreImpl const&) = delete; SemaphoreImpl& operator=(SemaphoreImpl const&) = delete; @@ -36,6 +36,9 @@ public: unsigned int get_capacity() const { return value_; } bool is_used() const { return not sleeping_.empty(); } + SemaphoreImpl* ref(); + void unref(); + friend void intrusive_ptr_add_ref(SemaphoreImpl* sem) { XBT_ATTRIB_UNUSED auto previous = sem->refcount_.fetch_add(1); @@ -43,9 +46,13 @@ public: } friend void intrusive_ptr_release(SemaphoreImpl* sem) { - if (sem->refcount_.fetch_sub(1) == 1) + if (sem->refcount_.fetch_sub(1) == 1) { + xbt_assert(not sem->is_used(), "Cannot destroy semaphore since someone is still using it"); delete sem; + } } + + s4u::Semaphore& sem() { return piface_; } }; } // namespace activity } // namespace kernel