Activity refactoring

[simgrid.git] / src / kernel / activity / SemaphoreImpl.cpp

diff --git a/src/kernel/activity/SemaphoreImpl.cpp b/src/kernel/activity/SemaphoreImpl.cpp
index 2daeba6..4214b16 100644 (file)
--- a/src/kernel/activity/SemaphoreImpl.cpp
+++ b/src/kernel/activity/SemaphoreImpl.cpp
@@ -1,12 +1,14 @@
-/* Copyright (c) 2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-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/kernel/activity/SemaphoreImpl.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
+#include <cmath> // std::isfinite
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_semaphore, simix_synchro, "Semaphore kernel-space implementation");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_semaphore, ker_synchro, "Semaphore kernel-space implementation");
 
 namespace simgrid {
 namespace kernel {
@@ -15,10 +17,17 @@ namespace activity {
 void SemaphoreImpl::acquire(actor::ActorImpl* issuer, double timeout)
 {
   XBT_DEBUG("Wait semaphore %p (timeout:%f)", this, timeout);
+  xbt_assert(std::isfinite(timeout), "timeout is not finite!");
+
   if (value_ <= 0) {
-    RawImplPtr synchro = RawImplPtr(new RawImpl());
+    RawImplPtr synchro(new RawImpl([this, issuer]() {
+      this->remove_sleeping_actor(*issuer);
+      auto* observer = dynamic_cast<kernel::actor::SemAcquireSimcall*>(issuer->simcall_.observer_);
+      xbt_assert(observer != nullptr);
+      observer->set_result(true);
+    }));
     synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
-    synchro->register_simcall(&issuer->simcall);
+    synchro->register_simcall(&issuer->simcall_);
     sleeping_.push_back(*issuer);
   } else {
     value_--;
@@ -32,31 +41,26 @@ void SemaphoreImpl::release()
   if (not sleeping_.empty()) {
     auto& actor = sleeping_.front();
     sleeping_.pop_front();
-    actor.waiting_synchro = nullptr;
+    actor.waiting_synchro_ = nullptr;
     actor.simcall_answer();
   } else {
     value_++;
   }
 }
 
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
-
-// Simcall handlers:
-/**
- * @brief Handles a sem acquire simcall without timeout.
- */
-void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem)
+/** Increase the refcount for this semaphore */
+SemaphoreImpl* SemaphoreImpl::ref()
 {
-  sem->acquire(simcall->issuer_, -1);
+  intrusive_ptr_add_ref(this);
+  return this;
 }
 
-/**
- * @brief Handles a sem acquire simcall with timeout.
- */
-void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout)
+/** Decrease the refcount for this mutex */
+void SemaphoreImpl::unref()
 {
-  simcall_sem_acquire_timeout__set__result(simcall, 0); // default result, will be set to 1 on timeout
-  sem->acquire(simcall->issuer_, timeout);
+  intrusive_ptr_release(this);
 }
+
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid