X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/873e5ee63a46ed55fa5901c9140247810b45b6bc..7f2b1b735c94c604996643f6c915d6209b0db958:/src/kernel/actor/ActorImpl.hpp diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index 32d37ed84b..69741aceee 100644 --- a/src/kernel/actor/ActorImpl.hpp +++ b/src/kernel/actor/ActorImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -9,18 +9,40 @@ #include "Simcall.hpp" #include "simgrid/kernel/Timer.hpp" #include "simgrid/s4u/Actor.hpp" +#include "src/kernel/actor/Simcall.hpp" #include "xbt/PropertyHolder.hpp" + +#include #include #include #include #include +#include +#include #include -namespace simgrid { -namespace kernel { -namespace actor { +namespace simgrid::kernel::actor { class ProcessArg; +/*------------------------- [ ActorIDTrait ] -------------------------*/ +class XBT_PUBLIC ActorIDTrait { + std::string name_; + aid_t pid_ = 0; + aid_t ppid_ = -1; + + static unsigned long maxpid_; + +public: + explicit ActorIDTrait(const std::string& name, aid_t ppid); + const std::string& get_name() const { return name_; } + const char* get_cname() const { return name_.c_str(); } + aid_t get_pid() const { return pid_; } + aid_t get_ppid() const { return ppid_; } + + static unsigned long get_maxpid() { return maxpid_; } +}; + +/*------------------------- [ ActorRestartingTrait ] -------------------------*/ class XBT_PUBLIC ActorRestartingTrait { bool auto_restart_ = false; int restart_count_ = 0; @@ -33,26 +55,23 @@ public: int get_restart_count() const { return restart_count_; } }; -class XBT_PUBLIC ActorImpl : public xbt::PropertyHolder, public ActorRestartingTrait { +/*------------------------- [ ActorImpl ] -------------------------*/ +class XBT_PUBLIC ActorImpl : public xbt::PropertyHolder, public ActorIDTrait, public ActorRestartingTrait { s4u::Host* host_ = nullptr; /* the host on which the actor is running */ - aid_t pid_ = 0; - aid_t ppid_ = -1; bool daemon_ = false; /* Daemon actors are automatically killed when the last non-daemon leaves */ unsigned stacksize_; // set to default value in constructor + bool iwannadie_ = false; // True if we need to do some cleanups in actor mode. + bool to_be_freed_ = false; // True if cleanups in actor mode done, but cleanups in kernel mode pending - std::vector mailboxes; + std::vector mailboxes_; friend activity::MailboxImpl; public: - xbt::string name_; - ActorImpl(xbt::string name, s4u::Host* host); + ActorImpl(const std::string& name, s4u::Host* host, aid_t ppid); ActorImpl(const ActorImpl&) = delete; ActorImpl& operator=(const ActorImpl&) = delete; ~ActorImpl(); - /** Retrieve the actor implementation from its PID (or nullptr if non-existent) */ - static ActorImpl* by_pid(aid_t pid); - static ActorImpl* self(); double get_kill_time() const; void set_kill_time(double kill_time); @@ -60,35 +79,39 @@ public: boost::intrusive::list_member_hook<> kernel_destroy_list_hook; /* EngineImpl actors_to_destroy */ boost::intrusive::list_member_hook<> smx_synchro_hook; /* {mutex,cond,sem}->sleeping */ - const xbt::string& get_name() const { return name_; } - const char* get_cname() const { return name_.c_str(); } + + // Life-cycle + bool wannadie() const { return iwannadie_; } + void set_wannadie(bool value = true); + bool to_be_freed() const { return to_be_freed_; } + void set_to_be_freed() { to_be_freed_ = true; } // Accessors to private fields s4u::Host* get_host() const { return host_; } void set_host(s4u::Host* dest); - aid_t get_pid() const { return pid_; } - aid_t get_ppid() const { return ppid_; } - void set_ppid(aid_t ppid) { ppid_ = ppid; } - bool is_daemon() const { return daemon_; } /** Whether this actor has been daemonized */ bool is_maestro() const; /** Whether this actor is actually maestro (cheap call but may segfault before actor creation / after terminaison) */ void set_stacksize(unsigned stacksize) { stacksize_ = stacksize; } unsigned get_stacksize() const { return stacksize_; } + // Daemonize + bool is_daemon() const { return daemon_; } /** Whether this actor has been daemonized */ + void daemonize(); + void undaemonize(); + std::unique_ptr context_; /* the context (uctx/raw/thread) that executes the user function */ std::exception_ptr exception_; - bool finished_ = false; bool suspended_ = false; activity::ActivityImplPtr waiting_synchro_ = nullptr; /* the current blocking synchro if any */ - std::list activities_; /* the current non-blocking synchros */ + std::set activities_; /* the current non-blocking synchros */ Simcall simcall_; /* list of functions executed when the actor dies */ std::shared_ptr>> on_exit = std::make_shared>>(); - std::function code_; + std::function code_; // to restart the actor on host reboot timer::Timer* kill_timer_ = nullptr; private: @@ -96,7 +119,7 @@ private: std::atomic_int_fast32_t refcount_{0}; public: - int get_refcount() const { return refcount_; } + int get_refcount() const { return static_cast(refcount_); } friend void intrusive_ptr_add_ref(ActorImpl* actor) { // This whole memory consistency semantic drives me nuts. @@ -123,8 +146,6 @@ public: private: s4u::Actor piface_; // Our interface is part of ourselves - void cleanup_from_simix(); - void undaemonize(); public: s4u::ActorPtr get_iface() { return s4u::ActorPtr(&piface_); } @@ -138,13 +159,13 @@ public: static ActorImplPtr create(ProcessArg* args); static ActorImplPtr attach(const std::string& name, void* data, s4u::Host* host); static void detach(); - void cleanup(); + void cleanup_from_self(); + void cleanup_from_kernel(); void exit(); void kill(ActorImpl* actor) const; void kill_all() const; void yield(); - void daemonize(); bool is_suspended() const { return suspended_; } s4u::Actor* restart(); void suspend(); @@ -214,11 +235,7 @@ using SynchroList = &ActorImpl::smx_synchro_hook>>; XBT_PUBLIC void create_maestro(const std::function& code); -XBT_PUBLIC unsigned long get_maxpid(); -XBT_PUBLIC unsigned long* get_maxpid_addr(); // In MC mode, the application sends this pointers to the MC -} // namespace actor -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::actor #endif