X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e3b2f1d55a07271c05db2ed5b3fec27561097f9..08e94eb0482589e4b287cbea301b84daf52635bd:/src/s4u/s4u_Actor.cpp diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 1b92776b39..005dc0bc71 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -3,6 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "simgrid/Exception.hpp" #include "simgrid/actor.h" #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Exec.hpp" @@ -75,23 +76,26 @@ void Actor::join(double timeout) void Actor::set_auto_restart(bool autorestart) { simgrid::simix::simcall([this, autorestart]() { - xbt_assert(autorestart && not pimpl_->auto_restart_); // FIXME: handle all cases + xbt_assert(autorestart && not pimpl_->has_to_auto_restart()); // FIXME: handle all cases pimpl_->set_auto_restart(autorestart); - simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(pimpl_->host_, pimpl_); + simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(pimpl_->get_host(), pimpl_); XBT_DEBUG("Adding Process %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname()); - pimpl_->host_->pimpl_->actors_at_boot_.emplace_back(arg); + pimpl_->get_host()->pimpl_->actors_at_boot_.emplace_back(arg); }); } -void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ +void Actor::on_exit(int_f_pvoid_pvoid_t fun, + void* data) /* deprecated: cleanup SIMIX_process_on_exit: change prototype of second parameter and + remove the last one */ { simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); }); } -void Actor::on_exit(std::function fun, void* data) +void Actor::on_exit(std::function fun) { - simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); }); + simgrid::simix::simcall( + [this, fun] { SIMIX_process_on_exit(pimpl_, [fun](int a, void* data) { fun(a != 0); }, nullptr); }); } void Actor::migrate(Host* new_host) @@ -115,7 +119,7 @@ void Actor::migrate(Host* new_host) s4u::Host* Actor::get_host() { - return this->pimpl_->host_; + return this->pimpl_->get_host(); } void Actor::daemonize() @@ -140,12 +144,12 @@ const char* Actor::get_cname() const aid_t Actor::get_pid() const { - return this->pimpl_->pid_; + return this->pimpl_->get_pid(); } aid_t Actor::get_ppid() const { - return this->pimpl_->ppid_; + return this->pimpl_->get_ppid(); } void Actor::suspend() @@ -162,7 +166,7 @@ void Actor::resume() bool Actor::is_suspended() { - return simgrid::simix::simcall([this] { return pimpl_->suspended_; }); + return simgrid::simix::simcall([this] { return pimpl_->is_suspended(); }); } void Actor::set_kill_time(double kill_time) @@ -173,7 +177,7 @@ void Actor::set_kill_time(double kill_time) /** @brief Get the kill time of an actor(or 0 if unset). */ double Actor::get_kill_time() { - return SIMIX_timer_get_date(pimpl_->kill_timer); + return pimpl_->get_kill_time(); } void Actor::kill(aid_t pid) // deprecated @@ -301,6 +305,7 @@ void parallel_execute(const std::vector& hosts, const std::vector& hosts, const std::vector& flops_amounts, const std::vector& bytes_amounts, double timeout) { @@ -356,12 +361,12 @@ ExecPtr exec_async(double flops) aid_t get_pid() { - return SIMIX_process_self()->pid_; + return SIMIX_process_self()->get_pid(); } aid_t get_ppid() { - return SIMIX_process_self()->ppid_; + return SIMIX_process_self()->get_ppid(); } std::string get_name() @@ -376,7 +381,7 @@ const char* get_cname() Host* get_host() { - return SIMIX_process_self()->host_; + return SIMIX_process_self()->get_host(); } void suspend() @@ -400,9 +405,14 @@ void exit() simgrid::simix::simcall([actor] { actor->exit(); }); } -void on_exit(std::function fun, void* data) +void on_exit(std::function fun) +{ + SIMIX_process_self()->iface()->on_exit(fun); +} + +void on_exit(std::function fun, void* data) /* deprecated */ { - SIMIX_process_self()->iface()->on_exit(fun, data); + SIMIX_process_self()->iface()->on_exit([fun, data](bool exit) { fun(exit, data); }); } /** @brief Moves the current actor to another host @@ -440,11 +450,11 @@ Host* getHost() /* deprecated */ } 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); + SIMIX_process_self()->iface()->on_exit([fun, data](int a) { fun((void*)(intptr_t)a, 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); + on_exit([fun, data](int a) { fun((void*)(intptr_t)a, data); }); } void kill() /* deprecated */ { @@ -649,3 +659,31 @@ void sg_actor_sleep_for(double duration) { simgrid::s4u::this_actor::sleep_for(duration); } + +sg_actor_t sg_actor_attach(const char* name, void* data, sg_host_t host, xbt_dict_t properties) +{ + xbt_assert(host != nullptr, "Invalid parameters: host and code params must not be nullptr"); + std::unordered_map props; + xbt_dict_cursor_t cursor = nullptr; + char* key; + char* value; + xbt_dict_foreach (properties, cursor, key, value) + props[key] = value; + xbt_dict_free(&properties); + + /* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */ + smx_actor_t actor = nullptr; + try { + actor = simgrid::kernel::actor::ActorImpl::attach(name, data, host, &props).get(); + } catch (simgrid::HostFailureException const&) { + xbt_die("Could not attach"); + } + + simgrid::s4u::this_actor::yield(); + return actor->ciface(); +} + +void sg_actor_detach() +{ + simgrid::kernel::actor::ActorImpl::detach(); +}