simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_creation;
simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_suspend;
simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_resume;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_sleep;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_wake_up;
simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_migration_start;
simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_migration_end;
simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_destruction;
simgrid::simix::simcall([this, autorestart]() { pimpl_->auto_restart = autorestart; });
}
-void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data)
+void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
+{
+ simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); });
+}
+
+void Actor::on_exit(std::function<void(int, void*)> fun, void* data)
{
simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); });
}
simgrid::simix::simcall([&self] { SIMIX_process_killall(self); });
}
-std::map<std::string, std::string>* Actor::get_properties()
+std::unordered_map<std::string, std::string>* Actor::get_properties()
{
- return simgrid::simix::simcall([this] { return this->pimpl_->getProperties(); });
+ return simgrid::simix::simcall([this] { return this->pimpl_->get_properties(); });
}
/** Retrieve the property value (or nullptr if not set) */
const char* Actor::get_property(const char* key)
{
- return simgrid::simix::simcall([this, key] { return pimpl_->getProperty(key); });
+ return simgrid::simix::simcall([this, key] { return pimpl_->get_property(key); });
}
void Actor::set_property(const char* key, const char* value)
{
- simgrid::simix::simcall([this, key, value] { pimpl_->setProperty(key, value); });
+ simgrid::simix::simcall([this, key, value] { pimpl_->set_property(key, value); });
}
Actor* Actor::restart()
void sleep_for(double duration)
{
- if (duration > 0)
+ if (duration > 0) {
+ smx_actor_t actor = SIMIX_process_self();
+ simgrid::s4u::Actor::on_sleep(actor->iface());
+
simcall_process_sleep(duration);
+
+ simgrid::s4u::Actor::on_wake_up(actor->iface());
+ }
}
void yield()
{
double now = SIMIX_get_clock();
if (timeout > now)
- simcall_process_sleep(timeout - now);
+ sleep_for(timeout - now);
}
void execute(double flops)
simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); });
}
-void on_exit(int_f_pvoid_pvoid_t fun, void* data)
+void on_exit(std::function<void(int, void*)> fun, void* data)
{
SIMIX_process_self()->iface()->on_exit(fun, data);
}
{
return is_suspended();
}
-void onExit /* deprecated */ (int_f_pvoid_pvoid_t fun, void* data)
+void on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
{
- on_exit(fun, data);
+ SIMIX_process_self()->iface()->on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
+}
+void onExit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
+{
+ on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
}
} // namespace this_actor
{
xbt_assert(actor != nullptr, "Invalid parameter: First argument must not be nullptr");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
- std::map<std::string, std::string>* props = actor->get_properties();
+ std::unordered_map<std::string, std::string>* props = actor->get_properties();
if (props == nullptr)
return nullptr;
- for (auto const& elm : *props) {
- xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr);
+ for (auto const& kv : *props) {
+ xbt_dict_set(as_dict, kv.first.c_str(), xbt_strdup(kv.second.c_str()), nullptr);
}
return as_dict;
}
return actor->restart();
}
+/**
+ * \ingroup m_actor_management
+ * \brief Sets the "auto-restart" flag of the actor.
+ * If the flag is set to 1, the actor will be automatically restarted when its host comes back up.
+ */
+void sg_actor_set_auto_restart(sg_actor_t actor, int auto_restart)
+{
+ actor->set_auto_restart(auto_restart);
+}
+
/** @ingroup m_actor_management
* @brief This actor will be terminated automatically when the last non-daemon actor finishes
*/