#include "src/surf/cpu_interface.hpp"
#include <boost/range/algorithm.hpp>
+#include <utility>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
return maxpid;
}
-ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this)
+ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this)
{
pid_ = maxpid++;
- simcall.issuer = this;
+ simcall.issuer_ = this;
}
ActorImpl::~ActorImpl()
if (simix_global != nullptr && this != simix_global->maestro_process) {
if (context_.get() != nullptr) /* the actor was not start()ed yet. This happens if its host was initially off */
context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
- simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); });
+ simgrid::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); });
if (context_.get() != nullptr)
context_->iwannadie = true;
}
simix_global->mutex.unlock();
context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
- simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); });
+ simgrid::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); });
context_->iwannadie = true;
}
xbt_assert(exception_ == nullptr, "Gasp! This exception may be lost by subsequent calls.");
suspended_ = false;
- suspend(this);
+ suspend();
}
if (exception_ != nullptr) {
return actor->ciface();
}
-activity::ActivityImplPtr ActorImpl::suspend(ActorImpl* issuer)
+void ActorImpl::suspend()
{
if (suspended_) {
XBT_DEBUG("Actor '%s' is already suspended", get_cname());
- return nullptr;
+ return;
}
suspended_ = true;
- /* If we are suspending another actor that is waiting on a sync, suspend its synchronization. */
- if (this != issuer) {
- if (waiting_synchro)
- waiting_synchro->suspend();
- /* If the other actor is not waiting, its suspension is delayed to when the actor is rescheduled. */
+ /* If the suspended actor is waiting on a sync, suspend its synchronization. */
+ if (waiting_synchro == nullptr) {
+ auto exec = new activity::ExecImpl();
+ exec->set_name("suspend").set_host(host_).set_flops_amount(0.0).start();
+ waiting_synchro = activity::ExecImplPtr(exec);
- return nullptr;
- } else {
- activity::ExecImpl* exec = new activity::ExecImpl();
- (*exec).set_name("suspend").set_host(host_).set_flops_amount(0.0).start();
- return activity::ExecImplPtr(exec);
+ waiting_synchro->simcalls_.push_back(&simcall);
}
+ waiting_synchro->suspend();
}
void ActorImpl::resume()
throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there.")));
- activity::SleepImpl* sleep = new activity::SleepImpl();
- (*sleep).set_name("sleep").set_host(host_).set_duration(duration).start();
+ auto sleep = new activity::SleepImpl();
+ sleep->set_name("sleep").set_host(host_).set_duration(duration).start();
return activity::SleepImplPtr(sleep);
}
void ActorImpl::simcall_answer()
{
if (this != simix_global->maestro_process){
- XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall.call), (int)simcall.call,
+ XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall.call_), (int)simcall.call_,
get_cname(), this);
- simcall.call = SIMCALL_NONE;
+ simcall.call_ = SIMCALL_NONE;
xbt_assert(not XBT_LOG_ISENABLED(simix_process, xbt_log_priority_debug) ||
std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) ==
end(simix_global->actors_to_run),
maestro->context_.reset(simix_global->context_factory->create_maestro(simix::ActorCode(code), maestro));
}
- maestro->simcall.issuer = maestro;
+ maestro->simcall.issuer_ = maestro;
simix_global->maestro_process = maestro;
}
return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get();
}
-void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor)
-{
- smx_activity_t sync_suspend = actor->suspend(simcall->issuer);
-
- if (actor != simcall->issuer) {
- simcall->issuer->simcall_answer();
- } else {
- sync_suspend->simcalls_.push_back(simcall);
- actor->waiting_synchro = sync_suspend;
- actor->waiting_synchro->suspend();
- }
- /* If we are suspending ourselves, then just do not finish the simcall now */
-}
-
int SIMIX_process_count()
{
return simix_global->process_list.size();
}
-void* SIMIX_process_self_get_data() // deprecated
+void* SIMIX_process_self_get_data()
{
smx_actor_t self = SIMIX_process_self();
return self->get_user_data();
}
-void SIMIX_process_self_set_data(void* data) // deprecated
+void SIMIX_process_self_set_data(void* data)
{
SIMIX_process_self()->set_user_data(data);
}
return process->get_cname();
}
-void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t actor, double timeout)
-{
- if (actor->finished_) {
- // The joined process is already finished, just wake up the issuer process right away
- simcall_process_sleep__set__result(simcall, SIMIX_DONE);
- simcall->issuer->simcall_answer();
- return;
- }
- smx_activity_t sync = simcall->issuer->join(actor, timeout);
- sync->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = sync;
-}
-
-void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration)
-{
- if (MC_is_active() || MC_record_replay_is_active()) {
- MC_process_clock_add(simcall->issuer, duration);
- simcall_process_sleep__set__result(simcall, SIMIX_DONE);
- simcall->issuer->simcall_answer();
- return;
- }
- smx_activity_t sync = simcall->issuer->sleep(duration);
- sync->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = sync;
-}
-
/**
* @brief Calling this function makes the process to yield.
*
sg_host_t host, std::unordered_map<std::string, std::string>* properties)
{
smx_actor_t self = SIMIX_process_self();
- return simgrid::simix::simcall([&name, &code, data, host, properties, self] {
+ return simgrid::kernel::actor::simcall([&name, &code, data, host, properties, self] {
return simgrid::kernel::actor::ActorImpl::create(name, code, data, host, properties, self).get();
});
}
void simcall_process_set_data(smx_actor_t process, void* data)
{
- simgrid::simix::simcall([process, data] { process->set_user_data(data); });
+ simgrid::kernel::actor::simcall([process, data] { process->set_user_data(data); });
}
