X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72b7977026be2ec4497220e10118d392a76b310b..22a6d90e2d923507bc5b418147c8e3d5c9a8f9e9:/src/kernel/actor/ActorImpl.hpp diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index f4ee3a8857..3394c36c16 100644 --- a/src/kernel/actor/ActorImpl.hpp +++ b/src/kernel/actor/ActorImpl.hpp @@ -105,9 +105,9 @@ public: ActorImpl* start(const simix::ActorCode& code); static ActorImplPtr create(const std::string& name, const simix::ActorCode& code, void* data, s4u::Host* host, - std::unordered_map* properties, ActorImpl* parent_actor); + const std::unordered_map* properties, ActorImpl* parent_actor); static ActorImplPtr attach(const std::string& name, void* data, s4u::Host* host, - std::unordered_map* properties); + const std::unordered_map* properties); static void detach(); void cleanup(); void exit(); @@ -133,9 +133,11 @@ public: void* data = nullptr; s4u::Host* host = nullptr; double kill_time = 0.0; - std::shared_ptr> properties = nullptr; + std::shared_ptr> properties = nullptr; bool auto_restart = false; bool daemon_ = false; + std::vector> on_exit; /* list of functions executed when the process dies */ + ProcessArg() = default; explicit ProcessArg(const std::string& name, const std::function& code, void* data, s4u::Host* host, @@ -159,6 +161,7 @@ public: , kill_time(actor->get_kill_time()) , auto_restart(actor->has_to_auto_restart()) , daemon_(actor->is_daemon()) + , on_exit(actor->on_exit) { properties.reset(actor->get_properties(), [](decltype(actor->get_properties())) {}); } @@ -176,6 +179,4 @@ XBT_PUBLIC void create_maestro(const std::function& code); extern void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr actor); -XBT_PRIVATE void SIMIX_process_sleep_destroy(simgrid::kernel::activity::SleepImplPtr synchro); - #endif