X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/548b728b10e5f7833929f3c4445fe6a53e319763..a4c8f1898670317d0fa33bf1b1a904ea922b78cc:/src/kernel/actor/ActorImpl.hpp diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index bbc6a5a9f5..cc97cb3184 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: @@ -76,6 +76,7 @@ private: std::atomic_int_fast32_t refcount_{0}; public: + int get_refcount() { return refcount_; } friend void intrusive_ptr_add_ref(ActorImpl* actor) { // std::memory_order_relaxed ought to be enough here instead of std::memory_order_seq_cst @@ -98,6 +99,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 +161,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())