X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7dfcd2aaf386196ce3022317d5402a7016279d43..518f95f235ccf91a7ebb529b43f5675625e9ec2f:/src/s4u/s4u_Actor.cpp diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 18339edffd..0e3ee32f8a 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -7,7 +7,9 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/kernel/activity/ExecImpl.hpp" #include "src/simix/smx_private.hpp" + #include XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors"); @@ -34,13 +36,13 @@ ActorPtr Actor::self() return self_context->process()->iface(); } -ActorPtr Actor::create(const char* name, s4u::Host* host, std::function code) +ActorPtr Actor::create(std::string name, s4u::Host* host, std::function code) { simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); return actor->iface(); } -ActorPtr Actor::create(const char* name, s4u::Host* host, const char* function, std::vector args) +ActorPtr Actor::create(std::string name, s4u::Host* host, std::string function, std::vector args) { simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function); simgrid::simix::ActorCode code = factory(std::move(args)); @@ -71,10 +73,15 @@ void Actor::join(double timeout) void Actor::set_auto_restart(bool autorestart) { - simgrid::simix::simcall([this, autorestart]() { pimpl_->auto_restart = autorestart; }); + simgrid::simix::simcall([this, autorestart]() { pimpl_->set_auto_restart(autorestart); }); +} + +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(int_f_pvoid_pvoid_t fun, void* data) +void Actor::on_exit(std::function fun, void* data) { simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); }); } @@ -109,7 +116,7 @@ void Actor::migrate(Host* new_host) s4u::Host* Actor::get_host() { - return this->pimpl_->host; + return this->pimpl_->host_; } void Actor::daemonize() @@ -119,7 +126,7 @@ void Actor::daemonize() bool Actor::is_daemon() const { - return this->pimpl_->isDaemon(); + return this->pimpl_->is_daemon(); } const simgrid::xbt::string& Actor::get_name() const @@ -134,12 +141,12 @@ const char* Actor::get_cname() const aid_t Actor::get_pid() const { - return this->pimpl_->pid; + return this->pimpl_->pid_; } aid_t Actor::get_ppid() const { - return this->pimpl_->ppid; + return this->pimpl_->ppid_; } void Actor::suspend() @@ -154,9 +161,9 @@ void Actor::resume() s4u::Actor::on_resume(this); } -int Actor::is_suspended() +bool Actor::is_suspended() { - return simgrid::simix::simcall([this] { return pimpl_->suspended; }); + return simgrid::simix::simcall([this] { return pimpl_->suspended_; }); } void Actor::set_kill_time(double time) @@ -212,20 +219,20 @@ void Actor::kill_all() simgrid::simix::simcall([&self] { SIMIX_process_killall(self); }); } -std::map* Actor::get_properties() +std::unordered_map* 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) +const char* Actor::get_property(std::string 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) +void Actor::set_property(std::string key, std::string 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() @@ -316,12 +323,12 @@ ExecPtr exec_async(double flops) aid_t get_pid() { - return SIMIX_process_self()->pid; + return SIMIX_process_self()->pid_; } aid_t get_ppid() { - return SIMIX_process_self()->ppid; + return SIMIX_process_self()->ppid_; } std::string get_name() @@ -336,7 +343,7 @@ const char* get_cname() Host* get_host() { - return SIMIX_process_self()->host; + return SIMIX_process_self()->host_; } void suspend() @@ -357,16 +364,16 @@ void resume() bool is_suspended() { smx_actor_t process = SIMIX_process_self(); - return simgrid::simix::simcall([process] { return process->suspended; }); + return simgrid::simix::simcall([process] { return process->suspended_; }); } -void kill() +void exit() { smx_actor_t process = SIMIX_process_self(); 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 fun, void* data) { SIMIX_process_self()->iface()->on_exit(fun, data); } @@ -408,9 +415,17 @@ bool isSuspended() /* deprecated */ { 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 */ +{ + 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); +} +void kill() /* deprecated */ { - on_exit(fun, data); + exit(); } } // namespace this_actor @@ -491,11 +506,11 @@ xbt_dict_t sg_actor_get_properties(sg_actor_t 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* props = actor->get_properties(); + std::unordered_map* 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; }