X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08e7455d67920bbd7a87f440d00f2c1e071314a0..ea74f5d95928a521a588737e81f1de94eef25d19:/src/kernel/actor/ActorImpl.hpp?ds=sidebyside diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index ee2c5b6aa9..678de9a206 100644 --- a/src/kernel/actor/ActorImpl.hpp +++ b/src/kernel/actor/ActorImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2022. 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. */ @@ -6,6 +6,7 @@ #ifndef SIMGRID_KERNEL_ACTOR_ACTORIMPL_HPP #define SIMGRID_KERNEL_ACTOR_ACTORIMPL_HPP +#include "simgrid/kernel/Timer.hpp" #include "simgrid/s4u/Actor.hpp" #include "src/simix/popping_private.hpp" #include "xbt/PropertyHolder.hpp" @@ -21,7 +22,6 @@ namespace actor { class XBT_PUBLIC ActorImpl : public xbt::PropertyHolder { s4u::Host* host_ = nullptr; /* the host on which the actor is running */ - void* userdata_ = nullptr; /* XBT_ATTRIB_DEPRECATED_v329 kept for compatibility, should be replaced with moddata */ aid_t pid_ = 0; aid_t ppid_ = -1; bool daemon_ = false; /* Daemon actors are automatically killed when the last non-daemon leaves */ @@ -36,13 +36,13 @@ public: ~ActorImpl(); /** Retrieve the actor implementation from its PID (or nullptr if non-existent) */ - static ActorImpl* by_PID(aid_t PID); + static ActorImpl* by_pid(aid_t pid); static ActorImpl* self(); double get_kill_time() const; void set_kill_time(double kill_time); - boost::intrusive::list_member_hook<> host_actor_list_hook; /* simgrid::simix::Host::process_list */ - boost::intrusive::list_member_hook<> smx_destroy_list_hook; /* simix_global->actors_to_destroy */ + boost::intrusive::list_member_hook<> host_actor_list_hook; /* resource::HostImpl::actor_list_ */ + 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_; } @@ -51,12 +51,12 @@ public: // Accessors to private fields s4u::Host* get_host() { return host_; } void set_host(s4u::Host* dest); - void* get_user_data() { return userdata_; } // XBT_ATTRIB_DEPRECATED_v329 - void set_user_data(void* data) { userdata_ = data; } // XBT_ATTRIB_DEPRECATED_v329 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) */ bool has_to_auto_restart() const { return auto_restart_; } void set_auto_restart(bool autorestart) { auto_restart_ = autorestart; } void set_stacksize(unsigned stacksize) { stacksize_ = stacksize; } @@ -71,12 +71,13 @@ public: activity::ActivityImplPtr waiting_synchro_ = nullptr; /* the current blocking synchro if any */ std::list activities_; /* the current non-blocking synchros */ s_smx_simcall simcall_; - /* list of functions executed when the process dies */ + std::vector observer_stack_; + /* list of functions executed when the actor dies */ std::shared_ptr>> on_exit = std::make_shared>>(); std::function code_; - simix::Timer* kill_timer_ = nullptr; + timer::Timer* kill_timer_ = nullptr; private: /* Refcounting */ @@ -121,10 +122,8 @@ public: ActorImpl* start(const ActorCode& code); static ActorImplPtr create(const std::string& name, const ActorCode& code, void* data, s4u::Host* host, - const std::unordered_map* properties, const ActorImpl* parent_actor); - static ActorImplPtr attach(const std::string& name, void* data, s4u::Host* host, - const std::unordered_map* properties); + static ActorImplPtr attach(const std::string& name, void* data, s4u::Host* host); static void detach(); void cleanup(); void exit(); @@ -156,16 +155,18 @@ public: void* data = nullptr; s4u::Host* host = nullptr; double kill_time = 0.0; - std::shared_ptr> properties = nullptr; + const std::unordered_map properties{}; bool auto_restart = false; bool daemon_ = false; - /* list of functions executed when the process dies */ + /* list of functions executed when the actor dies */ const std::shared_ptr>> on_exit; - ProcessArg() = default; + ProcessArg() = delete; + ProcessArg(const ProcessArg&) = delete; + ProcessArg& operator=(const ProcessArg&) = delete; explicit ProcessArg(const std::string& name, const std::function& code, void* data, s4u::Host* host, - double kill_time, std::shared_ptr> properties, + double kill_time, const std::unordered_map& properties, bool auto_restart) : name(name) , code(code) @@ -180,14 +181,13 @@ public: explicit ProcessArg(s4u::Host* host, ActorImpl* actor) : name(actor->get_name()) , code(actor->code_) - , data(actor->get_user_data()) + , data(actor->get_ciface()->get_data()) , host(host) , 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())) {}); } }; @@ -198,10 +198,10 @@ using SynchroList = 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 -extern void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr actor); - #endif