#include <simgrid/Exception.hpp>
#include <simgrid/s4u/Host.hpp>
-#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/Synchro.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/kernel/resource/CpuImpl.hpp"
#include "src/simix/popping_private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_synchro, kernel,
- "Kernel synchronization mechanisms (mutex, semaphores and conditions)");
+ "Kernel synchronization activity (lock/acquire on a mutex, semaphore or condition)");
namespace simgrid {
namespace kernel {
namespace activity {
-RawImpl& RawImpl::set_host(s4u::Host* host)
+SynchroImpl& SynchroImpl::set_host(s4u::Host* host)
{
host_ = host;
return *this;
}
-RawImpl& RawImpl::set_timeout(double timeout)
+SynchroImpl& SynchroImpl::set_timeout(double timeout)
{
timeout_ = timeout;
return *this;
}
-RawImpl* RawImpl::start()
+SynchroImpl* SynchroImpl::start()
{
surf_action_ = host_->get_cpu()->sleep(timeout_);
surf_action_->set_activity(this);
return this;
}
-void RawImpl::suspend()
+void SynchroImpl::suspend()
{
/* The suspension of raw synchros is delayed to when the actor is rescheduled. */
}
-void RawImpl::resume()
+void SynchroImpl::resume()
{
/* I cannot resume raw synchros directly. This is delayed to when the actor is rescheduled at
* the end of the synchro. */
}
-void RawImpl::cancel()
+void SynchroImpl::cancel()
{
/* I cannot cancel raw synchros directly. */
}
-void RawImpl::post()
+void SynchroImpl::post()
{
if (surf_action_->get_state() == resource::Action::State::FAILED)
set_state(State::FAILED);
/* Answer all simcalls associated with the synchro */
finish();
}
-void RawImpl::set_exception(actor::ActorImpl* issuer)
+void SynchroImpl::set_exception(actor::ActorImpl* issuer)
{
if (get_state() == State::FAILED) {
issuer->context_->set_wannadie();
issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
} else {
- xbt_assert(get_state() == State::SRC_TIMEOUT, "Internal error in RawImpl::finish() unexpected synchro state %s",
+ xbt_assert(get_state() == State::SRC_TIMEOUT, "Internal error in SynchroImpl::finish() unexpected synchro state %s",
get_state_str());
}
}
-void RawImpl::finish()
+void SynchroImpl::finish()
{
- XBT_DEBUG("RawImpl::finish() in state %s", get_state_str());
+ XBT_DEBUG("SynchroImpl::finish() in state %s", get_state_str());
xbt_assert(simcalls_.size() == 1, "Unexpected number of simcalls waiting: %zu", simcalls_.size());
smx_simcall_t simcall = simcalls_.front();
simcalls_.pop_front();