X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/993a22f9b7f34d3a536bfe6a49a31405461dea5d..596e36117322c22fd31372e7803bc197bcd4a016:/src/kernel/activity/SemaphoreImpl.hpp?ds=sidebyside

diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp
index 33793ce403..e7b21d2b0c 100644
--- a/src/kernel/activity/SemaphoreImpl.hpp
+++ b/src/kernel/activity/SemaphoreImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-2023. 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. */
@@ -6,21 +6,53 @@
 #ifndef SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP
 #define SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP
 
+#include "simgrid/s4u/Semaphore.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/actor/SynchroObserver.hpp"
+
 #include <atomic>
 #include <boost/intrusive/list.hpp>
 
-#include "simgrid/s4u/Semaphore.hpp"
-#include "src/kernel/actor/ActorImpl.hpp"
+namespace simgrid::kernel::activity {
+
+/** Semaphore Acquisition: the act / process of acquiring the semaphore.
+ *
+ * You can declare some interest on a semaphore without being blocked waiting if it's already empty.
+ * See the documentation of the MutexAcquisitionImpl for further details.
+ */
+class XBT_PUBLIC SemAcquisitionImpl : public ActivityImpl_T<SemAcquisitionImpl> {
+  actor::ActorImpl* issuer_ = nullptr;
+  SemaphoreImpl* semaphore_ = nullptr;
+  bool granted_             = false;
 
-namespace simgrid {
-namespace kernel {
-namespace activity {
+  friend SemaphoreImpl;
+  friend actor::SemaphoreAcquisitionObserver;
+
+public:
+  SemAcquisitionImpl(actor::ActorImpl* issuer, SemaphoreImpl* sem) : issuer_(issuer), semaphore_(sem) {}
+  SemaphoreImplPtr get_semaphore() { return semaphore_; }
+  actor::ActorImpl* get_issuer() { return issuer_; }
+
+  bool test(actor::ActorImpl* issuer = nullptr) override { return granted_; }
+  void wait_for(actor::ActorImpl* issuer, double timeout) override;
+  void finish() override;
+  void cancel() override;
+  void set_exception(actor::ActorImpl* issuer) override
+  { /* nothing to do */
+  }
+};
 
 class XBT_PUBLIC SemaphoreImpl {
   std::atomic_int_fast32_t refcount_{1};
   s4u::Semaphore piface_;
   unsigned int value_;
-  actor::SynchroList sleeping_; /* list of sleeping actors*/
+  std::deque<SemAcquisitionImplPtr> ongoing_acquisitions_;
+
+  static unsigned next_id_;
+  const unsigned id_ = next_id_++;
+
+  friend SemAcquisitionImpl;
+  friend actor::SemaphoreObserver;
 
 public:
   explicit SemaphoreImpl(unsigned int value) : piface_(this), value_(value){};
@@ -28,16 +60,12 @@ public:
   SemaphoreImpl(SemaphoreImpl const&) = delete;
   SemaphoreImpl& operator=(SemaphoreImpl const&) = delete;
 
-  void acquire(actor::ActorImpl* issuer, double timeout);
+  SemAcquisitionImplPtr acquire_async(actor::ActorImpl* issuer);
   void release();
   bool would_block() const { return (value_ == 0); }
-  void remove_sleeping_actor(actor::ActorImpl& actor) { xbt::intrusive_erase(sleeping_, actor); }
 
   unsigned int get_capacity() const { return value_; }
-  bool is_used() const { return not sleeping_.empty(); }
-
-  SemaphoreImpl* ref();
-  void unref();
+  bool is_used() const { return not ongoing_acquisitions_.empty(); }
 
   friend void intrusive_ptr_add_ref(SemaphoreImpl* sem)
   {
@@ -51,11 +79,9 @@ public:
       delete sem;
     }
   }
-
+  unsigned get_id() const { return id_; }
   s4u::Semaphore& sem() { return piface_; }
 };
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity
 
 #endif /* SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP */