-/* 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. */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_semaphore, ker_synchro, "Semaphore kernel-space implementation");
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
/* -------- Acquisition -------- */
this->register_simcall(&issuer_->simcall_); // Block on that acquisition
if (granted_) {
- post();
+ finish();
} else if (timeout > 0) {
- surf_action_ = get_issuer()->get_host()->get_cpu()->sleep(timeout);
- surf_action_->set_activity(this);
+ model_action_ = get_issuer()->get_host()->get_cpu()->sleep(timeout);
+ model_action_->set_activity(this);
} else {
// Already in the queue
}
}
-void SemAcquisitionImpl::post()
-{
- finish();
-}
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 (model_action_ != nullptr) { // A timeout was declared
+ if (model_action_->get_state() == resource::Action::State::FINISHED) { // The timeout elapsed
if (granted_) { // but we got the semaphore, just in time!
set_state(State::DONE);
observer->set_result(true);
}
}
- surf_action_->unref();
- surf_action_ = nullptr;
+ model_action_->unref();
+ model_action_ = nullptr;
}
simcall->issuer_->waiting_synchro_ = nullptr;
void SemAcquisitionImpl::cancel()
{
/* Remove myself from the list of interested parties */
- auto issuer = get_issuer();
+ const 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(),
{
auto res = SemAcquisitionImplPtr(new kernel::activity::SemAcquisitionImpl(issuer, this), true);
- if (value_ <= 0) {
- /* No free token in the semaphore; register the acquisition */
- ongoing_acquisitions_.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;
}
acqui->granted_ = true;
if (acqui == acqui->get_issuer()->waiting_synchro_)
- acqui->post();
+ acqui->finish();
// else, the issuer is not blocked on this acquisition so no need to release it
} else {
}
}
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity