#include "simgrid/Exception.hpp"
#include "simgrid/actor.h"
+#include "simgrid/modelchecker.h"
#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Exec.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/VirtualMachine.hpp"
+#include "src/include/mc/mc.h"
#include "src/kernel/activity/ExecImpl.hpp"
+#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
ActorPtr Actor::init(const std::string& name, s4u::Host* host)
{
smx_actor_t self = SIMIX_process_self();
- kernel::actor::ActorImpl* actor = simix::simcall([self, &name, host] { return self->init(name, host).get(); });
+ kernel::actor::ActorImpl* actor =
+ kernel::actor::simcall([self, &name, host] { return self->init(name, host).get(); });
return actor->iface();
}
ActorPtr Actor::start(const std::function<void()>& code)
{
- simgrid::simix::simcall([this, &code] { pimpl_->start(code); });
+ simgrid::kernel::actor::simcall([this, &code] { pimpl_->start(code); });
return this;
}
{
smx_actor_t self = SIMIX_process_self();
kernel::actor::ActorImpl* actor =
- simix::simcall([self, &name, host, &code] { return self->init(name, host)->start(code); });
+ kernel::actor::simcall([self, &name, host, &code] { return self->init(name, host)->start(code); });
return actor->iface();
}
{
auto issuer = SIMIX_process_self();
auto target = pimpl_;
- simix::simcall_blocking([issuer, target, timeout] {
+ kernel::actor::simcall_blocking<void>([issuer, target, timeout] {
if (target->finished_) {
// The joined process is already finished, just wake up the issuer right away
issuer->simcall_answer();
} else {
smx_activity_t sync = issuer->join(target, timeout);
- sync->simcalls_.push_back(&issuer->simcall);
- issuer->waiting_synchro = sync;
+ sync->register_simcall(&issuer->simcall);
}
});
}
void Actor::set_auto_restart(bool autorestart)
{
- simix::simcall([this, autorestart]() {
+ kernel::actor::simcall([this, autorestart]() {
xbt_assert(autorestart && not pimpl_->has_to_auto_restart()); // FIXME: handle all cases
pimpl_->set_auto_restart(autorestart);
});
}
-void Actor::on_exit(const std::function<void(int, void*)>& fun, void* data) /* deprecated */
-{
- on_exit([fun, data](bool failed) { fun(failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS, data); });
-}
-
void Actor::on_exit(const std::function<void(bool /*failed*/)>& fun) const
{
- simix::simcall([this, &fun] { SIMIX_process_on_exit(pimpl_, fun); });
+ kernel::actor::simcall([this, &fun] { SIMIX_process_on_exit(pimpl_, fun); });
}
void Actor::migrate(Host* new_host)
{
s4u::Actor::on_migration_start(*this);
- simix::simcall([this, new_host]() {
+ kernel::actor::simcall([this, new_host]() {
if (pimpl_->waiting_synchro != nullptr) {
// The actor is blocked on an activity. If it's an exec, migrate it too.
- // FIXME: implement the migration of other kind of activities
+ // FIXME: implement the migration of other kinds of activities
kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(pimpl_->waiting_synchro);
xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions.");
void Actor::daemonize()
{
- simix::simcall([this]() { pimpl_->daemonize(); });
+ kernel::actor::simcall([this]() { pimpl_->daemonize(); });
}
bool Actor::is_daemon() const
void Actor::suspend()
{
+ auto issuer = SIMIX_process_self();
+ auto target = pimpl_;
s4u::Actor::on_suspend(*this);
- simcall_process_suspend(pimpl_);
+ kernel::actor::simcall_blocking<void>([issuer, target]() {
+ target->suspend();
+ if (target != issuer) {
+ /* If we are suspending ourselves, then just do not finish the simcall now */
+ issuer->simcall_answer();
+ }
+ });
}
void Actor::resume()
{
- simix::simcall([this] { pimpl_->resume(); });
+ kernel::actor::simcall([this] { pimpl_->resume(); });
s4u::Actor::on_resume(*this);
}
bool Actor::is_suspended()
{
- return simix::simcall([this] { return pimpl_->is_suspended(); });
+ return pimpl_->is_suspended();
}
void Actor::set_kill_time(double kill_time)
{
- simix::simcall([this, kill_time] { pimpl_->set_kill_time(kill_time); });
+ kernel::actor::simcall([this, kill_time] { pimpl_->set_kill_time(kill_time); });
}
/** @brief Get the kill time of an actor(or 0 if unset). */
return pimpl_->get_kill_time();
}
-void Actor::kill(aid_t pid) // deprecated
-{
- kernel::actor::ActorImpl* killer = SIMIX_process_self();
- kernel::actor::ActorImpl* victim = SIMIX_process_from_PID(pid);
- if (victim != nullptr) {
- simix::simcall([killer, victim] { killer->kill(victim); });
- } else {
- std::ostringstream oss;
- oss << "kill: (" << pid << ") - No such actor" << std::endl;
- throw std::runtime_error(oss.str());
- }
-}
-
void Actor::kill()
{
kernel::actor::ActorImpl* process = SIMIX_process_self();
- simix::simcall([this, process] {
+ kernel::actor::simcall([this, process] {
xbt_assert(pimpl_ != simix_global->maestro_process, "Killing maestro is a rather bad idea");
process->kill(pimpl_);
});
void Actor::kill_all()
{
kernel::actor::ActorImpl* self = SIMIX_process_self();
- simix::simcall([self] { self->kill_all(); });
+ kernel::actor::simcall([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)
{
- simix::simcall([this, &key, &value] { pimpl_->set_property(key, value); });
+ kernel::actor::simcall([this, &key, &value] { pimpl_->set_property(key, value); });
}
Actor* Actor::restart()
{
- return simix::simcall([this]() { return pimpl_->restart(); });
+ return kernel::actor::simcall([this]() { return pimpl_->restart(); });
}
// ***** this_actor *****
void sleep_for(double duration)
{
- if (duration > 0) {
- kernel::actor::ActorImpl* actor = SIMIX_process_self();
- Actor::on_sleep(*actor->ciface());
+ xbt_assert(std::isfinite(duration), "duration is not finite!");
- simcall_process_sleep(duration);
-
- Actor::on_wake_up(*actor->ciface());
+ if (duration > 0) {
+ kernel::actor::ActorImpl* issuer = SIMIX_process_self();
+ Actor::on_sleep(*issuer->ciface());
+
+ kernel::actor::simcall_blocking<void>([issuer, duration]() {
+ if (MC_is_active() || MC_record_replay_is_active()) {
+ MC_process_clock_add(issuer, duration);
+ issuer->simcall_answer();
+ return;
+ }
+ smx_activity_t sync = issuer->sleep(duration);
+ sync->register_simcall(&issuer->simcall);
+ });
+
+ Actor::on_wake_up(*issuer->ciface());
}
}
void yield()
{
- simix::simcall([] { /* do nothing*/ });
+ kernel::actor::simcall([] { /* do nothing*/ });
}
XBT_PUBLIC void sleep_until(double wakeup_time)
exec_init(hosts, flops_amounts, bytes_amounts)->set_timeout(timeout)->wait();
}
-// deprecated
-void parallel_execute(int host_nb, s4u::Host* const* host_list, const double* flops_amount, const double* bytes_amount,
- double timeout)
-{
- smx_activity_t s =
- simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount, /* rate */ -1, timeout);
- simcall_execution_wait(s);
- delete[] flops_amount;
- delete[] bytes_amount;
-}
-
-// deprecated
-void parallel_execute(int host_nb, s4u::Host* const* host_list, const double* flops_amount, const double* bytes_amount)
-{
- smx_activity_t s = simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount,
- /* rate */ -1, /*timeout*/ -1);
- simcall_execution_wait(s);
- delete[] flops_amount;
- delete[] bytes_amount;
-}
-
ExecPtr exec_init(double flops_amount)
{
return ExecPtr(new ExecSeq(get_host(), flops_amount));
void suspend()
{
- kernel::actor::ActorImpl* actor = SIMIX_process_self();
- Actor::on_suspend(*actor->ciface());
-
- simcall_process_suspend(actor);
+ kernel::actor::ActorImpl* self = SIMIX_process_self();
+ s4u::Actor::on_suspend(*self->ciface());
+ kernel::actor::simcall_blocking<void>([self] { self->suspend(); });
}
void resume()
{
kernel::actor::ActorImpl* self = SIMIX_process_self();
- simix::simcall([self] { self->resume(); });
+ kernel::actor::simcall([self] { self->resume(); });
Actor::on_resume(*self->ciface());
}
void exit()
{
kernel::actor::ActorImpl* self = SIMIX_process_self();
- simgrid::simix::simcall([self] { self->exit(); });
+ simgrid::kernel::actor::simcall([self] { self->exit(); });
}
void on_exit(const std::function<void(bool)>& fun)
SIMIX_process_self()->iface()->on_exit(fun);
}
-void on_exit(const std::function<void(int, void*)>& fun, void* data) /* deprecated */
-{
- SIMIX_process_self()->iface()->on_exit([fun, data](bool exit) { fun(exit, data); });
-}
-
/** @brief Moves the current actor to another host
*
* @see simgrid::s4u::Actor::migrate() for more information
{
intrusive_ptr_release(actor);
}
+
+/** @brief Return the user data of a #sg_actor_t */
+void* sg_actor_data(sg_actor_t actor)
+{
+ return actor->get_data();
+}
+/** @brief Set the user data of a #sg_actor_t */
+void sg_actor_data_set(sg_actor_t actor, void* userdata)
+{
+ actor->set_data(userdata);
+}
