X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/548b728b10e5f7833929f3c4445fe6a53e319763..fe304706848f0a64477d4687b3ea97d5b9a0c35c:/src/kernel/actor/ActorImpl.hpp diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index bbc6a5a9f5..6e4dd5a80c 100644 --- a/src/kernel/actor/ActorImpl.hpp +++ b/src/kernel/actor/ActorImpl.hpp @@ -65,10 +65,10 @@ public: std::list comms; /* the current non-blocking communication synchros */ s_smx_simcall simcall; /* list of functions executed when the process dies */ - const std::shared_ptr>> on_exit = + std::shared_ptr>> on_exit = std::make_shared>>(); - std::function code; + std::function code_; simix::Timer* kill_timer = nullptr; private: @@ -98,6 +98,9 @@ public: /* S4U/implem interfaces */ private: s4u::Actor piface_; // Our interface is part of ourselves + + void undaemonize(); + public: s4u::ActorPtr iface() { return s4u::ActorPtr(&piface_); } s4u::Actor* ciface() { return &piface_; } @@ -157,7 +160,7 @@ public: explicit ProcessArg(s4u::Host* host, ActorImpl* actor) : name(actor->get_name()) - , code(actor->code) + , code(actor->code_) , data(actor->get_user_data()) , host(host) , kill_time(actor->get_kill_time())