-/* Copyright (c) 2019-2022. 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. */
#include "src/kernel/activity/SemaphoreImpl.hpp"
#include "src/kernel/activity/Synchro.hpp"
-#include "src/kernel/actor/SimcallObserver.hpp"
+#include "src/kernel/actor/SynchroObserver.hpp"
#include "src/kernel/resource/CpuImpl.hpp"
#include <cmath> // std::isfinite
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_semaphore, ker_synchro, "Semaphore kernel-space implementation");
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
+
+/* -------- Acquisition -------- */
void SemAcquisitionImpl::wait_for(actor::ActorImpl* issuer, double timeout)
{
void SemAcquisitionImpl::finish()
{
xbt_assert(simcalls_.size() == 1, "Unexpected number of simcalls waiting: %zu", simcalls_.size());
- smx_simcall_t simcall = simcalls_.front();
+ actor::Simcall* simcall = simcalls_.front();
simcalls_.pop_front();
if (surf_action_ != nullptr) { // A timeout was declared
if (surf_action_->get_state() == resource::Action::State::FINISHED) { // The timeout elapsed
if (granted_) { // but we got the semaphore, just in time!
set_state(State::DONE);
-
+
} else { // we have to report that timeout
- /* Remove myself from the list of interested parties */
- auto issuer = get_issuer();
- auto it = std::find_if(semaphore_->sleeping_.begin(), semaphore_->sleeping_.end(),
- [issuer](SemAcquisitionImplPtr acqui) { return acqui->get_issuer() == issuer; });
- xbt_assert(it != semaphore_->sleeping_.end(), "Cannot find myself in the waiting queue that I have to leave");
- semaphore_->sleeping_.erase(it);
+ cancel(); // Unregister the acquisition from the semaphore
/* Return to the englobing simcall that the wait_for timeouted */
- auto* observer = dynamic_cast<kernel::actor::SemAcquireSimcall*>(issuer->simcall_.observer_);
+ auto* observer = dynamic_cast<kernel::actor::SemaphoreAcquisitionObserver*>(get_issuer()->simcall_.observer_);
xbt_assert(observer != nullptr);
observer->set_result(true);
}
}
surf_action_->unref();
+ surf_action_ = nullptr;
}
simcall->issuer_->waiting_synchro_ = nullptr;
simcall->issuer_->simcall_answer();
}
+void SemAcquisitionImpl::cancel()
+{
+ /* Remove myself from the list of interested parties */
+ auto issuer = get_issuer();
+ auto it = std::find_if(semaphore_->ongoing_acquisitions_.begin(), semaphore_->ongoing_acquisitions_.end(),
+ [issuer](SemAcquisitionImplPtr acqui) { return acqui->get_issuer() == issuer; });
+ xbt_assert(it != semaphore_->ongoing_acquisitions_.end(),
+ "Cannot find myself in the waiting queue that I have to leave");
+ semaphore_->ongoing_acquisitions_.erase(it);
+}
+
+/* -------- Semaphore -------- */
+unsigned SemaphoreImpl::next_id_ = 0;
SemAcquisitionImplPtr SemaphoreImpl::acquire_async(actor::ActorImpl* issuer)
{
auto res = SemAcquisitionImplPtr(new kernel::activity::SemAcquisitionImpl(issuer, this), true);
- if (value_ <= 0) {
- /* No free token in the semaphore; register the acquisition */
- sleeping_.push_back(res);
- } else {
+ if (value_ > 0) {
value_--;
res->granted_ = true;
+ } else {
+ /* No free token in the semaphore; register the acquisition */
+ ongoing_acquisitions_.push_back(res);
}
return res;
}
{
XBT_DEBUG("Sem release semaphore %p", this);
- if (not sleeping_.empty()) {
+ if (not ongoing_acquisitions_.empty()) {
/* Release the first waiting actor */
- auto acqui = sleeping_.front();
- sleeping_.pop_front();
+ auto acqui = ongoing_acquisitions_.front();
+ ongoing_acquisitions_.pop_front();
acqui->granted_ = true;
if (acqui == acqui->get_issuer()->waiting_synchro_)
}
}
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity