X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72b7977026be2ec4497220e10118d392a76b310b..b9625f82f86db0674e911887addce45dca31b57f:/src/kernel/actor/ActorImpl.hpp diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index f4ee3a8857..6e9691f35f 100644 --- a/src/kernel/actor/ActorImpl.hpp +++ b/src/kernel/actor/ActorImpl.hpp @@ -1,14 +1,14 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ -#ifndef SIMIX_ACTORIMPL_H -#define SIMIX_ACTORIMPL_H +#ifndef SIMGRID_KERNEL_ACTOR_ACTORIMPL_HPP +#define SIMGRID_KERNEL_ACTOR_ACTORIMPL_HPP #include "simgrid/s4u/Actor.hpp" #include "src/simix/popping_private.hpp" -#include "src/surf/PropertyHolder.hpp" +#include "xbt/PropertyHolder.hpp" #include #include #include @@ -19,24 +19,27 @@ namespace simgrid { namespace kernel { namespace actor { -class XBT_PUBLIC ActorImpl : public surf::PropertyHolder { +class XBT_PUBLIC ActorImpl : public xbt::PropertyHolder { s4u::Host* host_ = nullptr; /* the host on which the actor is running */ + // XBT_DEPRECATED_v329 void* userdata_ = nullptr; /* kept for compatibility, it 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 */ bool auto_restart_ = false; + unsigned stacksize_; // set to default value in constructor public: xbt::string name_; - ActorImpl(const xbt::string& name, s4u::Host* host); + ActorImpl(xbt::string name, s4u::Host* host); ActorImpl(const ActorImpl&) = delete; ActorImpl& operator=(const ActorImpl&) = delete; ~ActorImpl(); - double get_kill_time(); + static ActorImpl* self(); + double get_kill_time() const; void set_kill_time(double kill_time); - boost::intrusive::list_member_hook<> host_process_list_hook; /* simgrid::simix::Host::process_list */ + 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<> smx_synchro_hook; /* {mutex,cond,sem}->sleeping */ @@ -46,42 +49,51 @@ public: // Accessors to private fields s4u::Host* get_host() { return host_; } void set_host(s4u::Host* dest); + // XBT_DEPRECATED_v329 void* get_user_data() { return userdata_; } + // XBT_DEPRECATED_v329 void set_user_data(void* data) { userdata_ = data; } 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() { return daemon_; } /** Whether this actor has been daemonized */ - bool has_to_auto_restart() { return auto_restart_; } + bool is_daemon() const { return daemon_; } /** Whether this actor has been daemonized */ + 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; } + unsigned get_stacksize() const { return stacksize_; } std::unique_ptr context_; /* the context (uctx/raw/thread) that executes the user function */ std::exception_ptr exception_; bool finished_ = false; - bool blocked_ = false; /* FIXME this field is never set to true. Either use it or remove it. */ bool suspended_ = false; - activity::ActivityImplPtr waiting_synchro = nullptr; /* the current blocking synchro if any */ - std::list comms; /* the current non-blocking communication synchros */ - s_smx_simcall simcall; - std::vector> on_exit; /* list of functions executed when the process dies */ + 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::shared_ptr>> on_exit = + std::make_shared>>(); - std::function code; - simix::Timer* kill_timer = nullptr; + std::function code_; + simix::Timer* kill_timer_ = nullptr; private: /* Refcounting */ std::atomic_int_fast32_t refcount_{0}; public: + int get_refcount() const { 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 - // But then, we have a threading issue when an actor commits a suicide: - // it seems that in this case, the worker thread kills the last occurrence of the actor - // while usually, the maestro does so. FIXME: we should change how actors suicide - actor->refcount_.fetch_add(1, std::memory_order_seq_cst); + // This whole memory consistency semantic drives me nuts. + // std::memory_order_relaxed proves to not be enough: There is a threading issue when actors commit suicide. + // My guess is that the maestro context wants to propagate changes to the actor's fields after the + // actor context frees that memory area or something. But I'm not 100% certain of what's going on. + // std::memory_order_seq_cst works but that's rather demanding. + // AFAIK, std::memory_order_acq_rel works on all tested platforms, so let's stick to it. + // Reducing the requirements to _relaxed would require to fix our suicide procedure, which is a messy piece of code. + actor->refcount_.fetch_add(1, std::memory_order_acq_rel); } friend void intrusive_ptr_release(ActorImpl* actor) { @@ -97,33 +109,44 @@ public: /* S4U/implem interfaces */ private: s4u::Actor piface_; // Our interface is part of ourselves + + void cleanup_from_simix(); + void undaemonize(); + public: s4u::ActorPtr iface() { return s4u::ActorPtr(&piface_); } s4u::Actor* ciface() { return &piface_; } - ActorImplPtr init(const std::string& name, s4u::Host* host); - ActorImpl* start(const simix::ActorCode& code); + ActorImplPtr init(const std::string& name, s4u::Host* host) const; + ActorImpl* start(const 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); + 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, - std::unordered_map* properties); + const std::unordered_map* properties); static void detach(); void cleanup(); void exit(); - void kill(ActorImpl* actor); - void kill_all(); + void kill(ActorImpl* actor) const; + void kill_all() const; void yield(); void daemonize(); - bool is_suspended() { return suspended_; } + bool is_suspended() const { return suspended_; } s4u::Actor* restart(); - activity::ActivityImplPtr suspend(ActorImpl* issuer); + void suspend(); void resume(); - activity::ActivityImplPtr join(ActorImpl* actor, double timeout); + activity::ActivityImplPtr join(const ActorImpl* actor, double timeout); activity::ActivityImplPtr sleep(double duration); /** Ask the actor to throw an exception right away */ void throw_exception(std::exception_ptr e); + + /** execute the pending simcall -- must be called from the maestro context */ + void simcall_handle(int value); + /** Terminates a simcall currently executed in maestro context. The actor will be restarted in the next scheduling + * round */ + void simcall_answer(); }; class ProcessArg { @@ -133,9 +156,12 @@ 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; + /* list of functions executed when the process dies */ + const std::shared_ptr>> on_exit; + ProcessArg() = default; explicit ProcessArg(const std::string& name, const std::function& code, void* data, s4u::Host* host, @@ -153,12 +179,13 @@ 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()) , 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())) {}); } @@ -170,12 +197,15 @@ typedef boost::intrusive::list& code); +XBT_PUBLIC int get_maxpid(); } // namespace actor } // namespace kernel } // namespace simgrid extern void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr actor); -XBT_PRIVATE void SIMIX_process_sleep_destroy(simgrid::kernel::activity::SleepImplPtr synchro); +XBT_PUBLIC smx_actor_t simcall_process_create(const std::string& name, const simgrid::kernel::actor::ActorCode& code, + void* data, sg_host_t host, + std::unordered_map* properties); #endif