X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..64a60fa58ca5dc30df8b2780c4901773f219d8ea:/src/s4u/s4u_Semaphore.cpp

diff --git a/src/s4u/s4u_Semaphore.cpp b/src/s4u/s4u_Semaphore.cpp
index b407059186..90aaedfe7f 100644
--- a/src/s4u/s4u_Semaphore.cpp
+++ b/src/s4u/s4u_Semaphore.cpp
@@ -1,80 +1,78 @@
-/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-2021. 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 "src/msg/msg_private.hpp"
-#include "src/simix/smx_synchro_private.hpp"
 #include "xbt/log.h"
 
 #include "simgrid/forward.h"
 #include "simgrid/s4u/Semaphore.hpp"
+#include "src/kernel/activity/SemaphoreImpl.hpp"
+#include "src/mc/checker/SimcallObserver.hpp"
 
 namespace simgrid {
 namespace s4u {
 
-Semaphore::Semaphore(unsigned int initial_capacity)
-{
-    sem_ = simgrid::simix::simcall([initial_capacity] { return SIMIX_sem_init(initial_capacity); });
-}
-
-Semaphore::~Semaphore()
-{
-    SIMIX_sem_destroy(sem_);
-}
-
 SemaphorePtr Semaphore::create(unsigned int initial_capacity)
 {
-    return SemaphorePtr(new Semaphore(initial_capacity));
+  auto* sem = new kernel::activity::SemaphoreImpl(initial_capacity);
+  return SemaphorePtr(&sem->sem(), false);
 }
 
 void Semaphore::acquire()
 {
-    simcall_sem_acquire(sem_);
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  mc::SemAcquireSimcall observer{issuer, pimpl_};
+  kernel::actor::simcall_blocking<void>([&observer] { observer.get_sem()->acquire(observer.get_issuer(), -1.0); },
+                                        &observer);
 }
 
-int Semaphore::acquire_timeout(double timeout)
+bool Semaphore::acquire_timeout(double timeout)
 {
-  return simcall_sem_acquire_timeout(sem_, timeout);
+  kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+  mc::SemAcquireSimcall observer{issuer, pimpl_, timeout};
+  kernel::actor::simcall_blocking<void>(
+      [&observer] { observer.get_sem()->acquire(observer.get_issuer(), observer.get_timeout()); }, &observer);
+  return observer.get_result();
 }
 
 void Semaphore::release()
 {
-    simgrid::simix::simcall([this] { SIMIX_sem_release(sem_); });
+  kernel::actor::simcall([this] { pimpl_->release(); });
 }
 
-int Semaphore::get_capacity()
+int Semaphore::get_capacity() const
 {
-  return simgrid::simix::simcall([this] { return SIMIX_sem_get_capacity(sem_); });
+  return kernel::actor::simcall([this] { return pimpl_->get_capacity(); });
 }
 
-int Semaphore::would_block()
+bool Semaphore::would_block() const
 {
-  return simgrid::simix::simcall([this] { return SIMIX_sem_would_block(sem_); });
+  return kernel::actor::simcall([this] { return pimpl_->would_block(); });
 }
 
-void intrusive_ptr_add_ref(Semaphore* sem)
+/* refcounting of the intrusive_ptr is delegated to the implementation object */
+void intrusive_ptr_add_ref(const Semaphore* sem)
 {
   xbt_assert(sem);
-  sem->refcount_.fetch_add(1, std::memory_order_relaxed);
+  sem->pimpl_->ref();
 }
 
-void intrusive_ptr_release(Semaphore* sem)
+void intrusive_ptr_release(const Semaphore* sem)
 {
   xbt_assert(sem);
-  if (sem->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    delete sem;
-  }
+  sem->pimpl_->unref();
 }
 
-}
-}
+} // namespace s4u
+} // namespace simgrid
+
 /* **************************** Public C interface *************************** */
 /** @brief creates a semaphore object of the given initial capacity */
 sg_sem_t sg_sem_init(int initial_value)
 {
-  return new simgrid::s4u::Semaphore(initial_value);
+  return simgrid::s4u::Semaphore::create(initial_value).detach();
 }
 
 /** @brief locks on a semaphore object */
@@ -95,14 +93,14 @@ 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();
 }
 
-void sg_sem_destroy(sg_sem_t sem)
+void sg_sem_destroy(const_sg_sem_t sem)
 {
-  delete sem;
+  intrusive_ptr_release(sem);
 }
 
 /** @brief returns a boolean indicating if this semaphore would block at this very specific time
@@ -110,7 +108,7 @@ void sg_sem_destroy(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();
 }