#include "src/include/mc/mc.h"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
-#include "src/kernel/context/Context.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/HostImpl.hpp"
{
const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
kernel::actor::ActorImpl* actor =
- kernel::actor::simcall([self, &name, host] { return self->init(name, host).get(); });
+ kernel::actor::simcall_answered([self, &name, host] { return self->init(name, host).get(); });
return actor->get_iface();
}
ActorPtr Actor::start(const std::function<void()>& code)
{
- simgrid::kernel::actor::simcall([this, &code] { pimpl_->start(code); });
+ simgrid::kernel::actor::simcall_answered([this, &code] { pimpl_->start(code); });
return this;
}
{
const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
kernel::actor::ActorImpl* actor =
- kernel::actor::simcall([self, &name, host, &code] { return self->init(name, host)->start(code); });
+ kernel::actor::simcall_answered([self, &name, host, &code] { return self->init(name, host)->start(code); });
return actor->get_iface();
}
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
const kernel::actor::ActorImpl* target = pimpl_;
kernel::actor::simcall_blocking([issuer, target, timeout] {
- if (target->finished_) {
+ if (target->wannadie()) {
// The joined actor is already finished, just wake up the issuer right away
issuer->simcall_answer();
} else {
});
}
-void Actor::set_auto_restart(bool autorestart)
+Actor* Actor::set_auto_restart(bool autorestart)
{
- kernel::actor::simcall([this, autorestart]() {
- xbt_assert(autorestart && not pimpl_->has_to_auto_restart()); // FIXME: handle all cases
+ if (autorestart == pimpl_->has_to_auto_restart()) // not changed
+ return this;
+
+ kernel::actor::simcall_answered([this, autorestart]() {
+ xbt_assert(autorestart, "Asking an actor to stop being autorestart is not implemented yet. Ask us if you need it.");
pimpl_->set_auto_restart(autorestart);
auto* arg = new kernel::actor::ProcessArg(pimpl_->get_host(), pimpl_);
XBT_DEBUG("Adding %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
pimpl_->get_host()->get_impl()->add_actor_at_boot(arg);
});
+ return this;
+}
+int Actor::get_restart_count() const
+{
+ return pimpl_->get_restart_count();
}
void Actor::on_exit(const std::function<void(bool /*failed*/)>& fun) const
{
- kernel::actor::simcall([this, &fun] { pimpl_->on_exit->emplace_back(fun); });
+ kernel::actor::simcall_answered([this, &fun] { pimpl_->on_exit->emplace_back(fun); });
}
void Actor::set_host(Host* new_host)
{
const s4u::Host* previous_location = get_host();
- kernel::actor::simcall([this, new_host]() {
+ kernel::actor::simcall_answered([this, new_host]() {
for (auto const& activity : pimpl_->activities_) {
// FIXME: implement the migration of other kinds of activities
if (auto exec = boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(activity))
return this->pimpl_->get_host();
}
-void Actor::daemonize()
+Actor* Actor::daemonize()
{
- kernel::actor::simcall([this]() { pimpl_->daemonize(); });
+ kernel::actor::simcall_answered([this]() { pimpl_->daemonize(); });
+ return this;
}
bool Actor::is_daemon() const
void Actor::resume()
{
- kernel::actor::simcall([this] { pimpl_->resume(); });
+ kernel::actor::simcall_answered([this] { pimpl_->resume(); });
s4u::Actor::on_resume(*this);
}
void Actor::set_kill_time(double kill_time)
{
- kernel::actor::simcall([this, kill_time] { pimpl_->set_kill_time(kill_time); });
+ kernel::actor::simcall_answered([this, kill_time] { pimpl_->set_kill_time(kill_time); });
}
/** @brief Get the kill time of an actor(or 0 if unset). */
void Actor::kill()
{
const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
- kernel::actor::simcall([this, self] { self->kill(pimpl_); });
+ kernel::actor::simcall_answered([this, self] { self->kill(pimpl_); });
}
// ***** Static functions *****
void Actor::kill_all()
{
const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
- kernel::actor::simcall([self] { self->kill_all(); });
+ kernel::actor::simcall_answered([self] { self->kill_all(); });
}
const std::unordered_map<std::string, std::string>* Actor::get_properties() const
void Actor::set_property(const std::string& key, const std::string& value)
{
- kernel::actor::simcall([this, &key, &value] { pimpl_->set_property(key, value); });
+ kernel::actor::simcall_answered([this, &key, &value] { pimpl_->set_property(key, value); });
}
Actor* Actor::restart()
{
- return kernel::actor::simcall([this]() { return pimpl_->restart(); });
+ return kernel::actor::simcall_answered([this]() { return pimpl_->restart(); });
}
// ***** this_actor *****
void yield()
{
- kernel::actor::simcall([] { /* do nothing*/ });
+ kernel::actor::simcall_answered([] { /* do nothing*/ });
}
XBT_PUBLIC void sleep_until(double wakeup_time)
exec_init(hosts, flops_amounts, bytes_amounts)->wait();
}
+void thread_execute(s4u::Host* host, double flops_amount, int thread_count)
+{
+ Exec::init()->set_flops_amount(flops_amount)->set_host(host)->set_thread_count(thread_count)->wait();
+}
+
ExecPtr exec_init(double flops_amount)
{
return Exec::init()->set_flops_amount(flops_amount)->set_host(get_host());
void exit()
{
kernel::actor::ActorImpl* self = simgrid::kernel::actor::ActorImpl::self();
- simgrid::kernel::actor::simcall([self] { self->exit(); });
+ simgrid::kernel::actor::simcall_answered([self] { self->exit(); });
THROW_IMPOSSIBLE;
}