X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84e824746638f2b4c32c315bcfce655098d4e80b..5187c5adc474e53b2f3cbf680cb0b950bf40f5a1:/src/kernel/activity/SemaphoreImpl.hpp diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp index e6dc57d6bb..7a61019baa 100644 --- a/src/kernel/activity/SemaphoreImpl.hpp +++ b/src/kernel/activity/SemaphoreImpl.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2019-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. */ -#ifndef SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP_ -#define SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP_ +#ifndef SIMGRID_KERNEL_ACTIVITY_SEMAPHORE_HPP +#define SIMGRID_KERNEL_ACTIVITY_SEMAPHORE_HPP #include #include @@ -19,10 +19,9 @@ namespace activity { class XBT_PUBLIC SemaphoreImpl { std::atomic_int_fast32_t refcount_{1}; unsigned int value_; - -public: actor::SynchroList sleeping_; /* list of sleeping actors*/ +public: explicit SemaphoreImpl(unsigned int value) : value_(value){}; ~SemaphoreImpl() = default; @@ -32,8 +31,10 @@ public: void acquire(actor::ActorImpl* issuer, double timeout); void release(); bool would_block() { return (value_ == 0); } + void remove_sleeping_actor(actor::ActorImpl& actor) { xbt::intrusive_erase(sleeping_, actor); } unsigned int get_capacity() { return value_; } + bool is_used() { return not sleeping_.empty(); } friend void intrusive_ptr_add_ref(SemaphoreImpl* sem) {