X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/35e02c75e39b9d81ad7ab1a971e8627d396a8dac..052f2deb51abb0bdbb2a2b6c7d052acdc030cfd5:/src/s4u/s4u_Actor.cpp diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 836de05be3..99d80a7781 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -21,23 +21,23 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors"); namespace simgrid { namespace s4u { -xbt::signal s4u::Actor::on_creation; -xbt::signal s4u::Actor::on_suspend; -xbt::signal s4u::Actor::on_resume; -xbt::signal s4u::Actor::on_sleep; -xbt::signal s4u::Actor::on_wake_up; -xbt::signal s4u::Actor::on_migration_start; -xbt::signal s4u::Actor::on_migration_end; -xbt::signal s4u::Actor::on_destruction; +xbt::signal s4u::Actor::on_creation; +xbt::signal s4u::Actor::on_suspend; +xbt::signal s4u::Actor::on_resume; +xbt::signal s4u::Actor::on_sleep; +xbt::signal s4u::Actor::on_wake_up; +xbt::signal s4u::Actor::on_migration_start; +xbt::signal s4u::Actor::on_migration_end; +xbt::signal s4u::Actor::on_destruction; // ***** Actor creation ***** -ActorPtr Actor::self() +Actor* Actor::self() { - smx_context_t self_context = kernel::context::Context::self(); + kernel::context::Context* self_context = kernel::context::Context::self(); if (self_context == nullptr) - return ActorPtr(); + return nullptr; - return self_context->get_actor()->iface(); + return self_context->get_actor()->ciface(); } ActorPtr Actor::init(const std::string& name, s4u::Host* host) { @@ -101,27 +101,19 @@ void Actor::set_auto_restart(bool autorestart) }); } -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 */ -{ - simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); }); -} - void Actor::on_exit(const std::function& fun, void* data) /* deprecated */ { - on_exit([fun, data](bool exit) { fun(exit, data); }); + on_exit([fun, data](bool failed) { fun(failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS, data); }); } -void Actor::on_exit(const std::function& fun) +void Actor::on_exit(const std::function& fun) const { - simix::simcall( - [this, fun] { SIMIX_process_on_exit(pimpl_, [fun](int a, void* /*data*/) { fun(a != 0); }, nullptr); }); + simix::simcall([this, &fun] { SIMIX_process_on_exit(pimpl_, fun); }); } void Actor::migrate(Host* new_host) { - s4u::Actor::on_migration_start(this); + s4u::Actor::on_migration_start(*this); simix::simcall([this, new_host]() { if (pimpl_->waiting_synchro != nullptr) { @@ -135,10 +127,10 @@ void Actor::migrate(Host* new_host) this->pimpl_->set_host(new_host); }); - s4u::Actor::on_migration_end(this); + s4u::Actor::on_migration_end(*this); } -s4u::Host* Actor::get_host() +s4u::Host* Actor::get_host() const { return this->pimpl_->get_host(); } @@ -175,14 +167,14 @@ aid_t Actor::get_ppid() const void Actor::suspend() { - s4u::Actor::on_suspend(this); + s4u::Actor::on_suspend(*this); simcall_process_suspend(pimpl_); } void Actor::resume() { simix::simcall([this] { pimpl_->resume(); }); - s4u::Actor::on_resume(this); + s4u::Actor::on_resume(*this); } bool Actor::is_suspended() @@ -223,11 +215,6 @@ void Actor::kill() }); } -kernel::actor::ActorImpl* Actor::get_impl() -{ - return pimpl_; -} - // ***** Static functions ***** ActorPtr Actor::by_pid(aid_t pid) @@ -245,15 +232,15 @@ void Actor::kill_all() simix::simcall([self] { self->kill_all(); }); } -std::unordered_map* Actor::get_properties() +std::unordered_map* Actor::get_properties() const { - return simix::simcall([this] { return this->pimpl_->get_properties(); }); + return pimpl_->get_properties(); } /** Retrieve the property value (or nullptr if not set) */ -const char* Actor::get_property(const std::string& key) +const char* Actor::get_property(const std::string& key) const { - return simix::simcall([this, &key] { return pimpl_->get_property(key); }); + return pimpl_->get_property(key); } void Actor::set_property(const std::string& key, const std::string& value) @@ -289,11 +276,11 @@ void sleep_for(double duration) { if (duration > 0) { kernel::actor::ActorImpl* actor = SIMIX_process_self(); - Actor::on_sleep(actor->iface()); + Actor::on_sleep(*actor->ciface()); simcall_process_sleep(duration); - Actor::on_wake_up(actor->iface()); + Actor::on_wake_up(*actor->ciface()); } } @@ -418,7 +405,7 @@ Host* get_host() void suspend() { kernel::actor::ActorImpl* actor = SIMIX_process_self(); - Actor::on_suspend(actor->iface()); + Actor::on_suspend(*actor->ciface()); simcall_process_suspend(actor); } @@ -427,7 +414,7 @@ void resume() { kernel::actor::ActorImpl* self = SIMIX_process_self(); simix::simcall([self] { self->resume(); }); - Actor::on_resume(self->iface()); + Actor::on_resume(*self->ciface()); } void exit() @@ -455,38 +442,6 @@ void migrate(Host* new_host) SIMIX_process_self()->iface()->migrate(new_host); } -std::string getName() /* deprecated */ -{ - return get_name(); -} -const char* getCname() /* deprecated */ -{ - return get_cname(); -} -bool isMaestro() /* deprecated */ -{ - return is_maestro(); -} -aid_t getPid() /* deprecated */ -{ - return get_pid(); -} -aid_t getPpid() /* deprecated */ -{ - return get_ppid(); -} -Host* getHost() /* deprecated */ -{ - return get_host(); -} -void on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ -{ - 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, data](int a) { fun((void*)(intptr_t)a, data); }); -} void kill() /* deprecated */ { exit();