X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1acdb6e20d63bf8987e6fbcf65e40949831a206d..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/simix/ActorImpl.hpp diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index 5986a190ee..5c1bfcaaef 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -7,131 +7,164 @@ #define SIMIX_ACTORIMPL_H #include "simgrid/s4u/Actor.hpp" -#include "src/simix/popping_private.h" -#include "xbt/swag.h" -#include - -typedef struct s_smx_process_exit_fun { - int_f_pvoid_pvoid_t fun; +#include "src/simix/popping_private.hpp" +#include "src/surf/PropertyHolder.hpp" +#include +#include +#include +#include + +struct s_smx_process_exit_fun_t { + std::function fun; void *arg; -} s_smx_process_exit_fun_t, *smx_process_exit_fun_t; +}; namespace simgrid { -namespace simix { - -class ProcessArg { -public: - std::string name; - std::function code; - void *data = nullptr; - sg_host_t host = nullptr; - double kill_time = 0.0; - xbt_dict_t properties = nullptr; - bool auto_restart = false; -}; +namespace kernel { +namespace actor { -class ActorImpl { +class ActorImpl : public simgrid::surf::PropertyHolder { public: ActorImpl() : piface_(this) {} + ~ActorImpl(); + + void set_auto_restart(bool autorestart) { auto_restart_ = autorestart; } - // TODO, replace with boost intrusive container hooks - s_xbt_swag_hookup_t process_hookup = { nullptr, nullptr }; /* simix_global->process_list */ - s_xbt_swag_hookup_t synchro_hookup = { nullptr, nullptr }; /* {mutex,cond,sem}->sleeping */ - s_xbt_swag_hookup_t host_proc_hookup = { nullptr, nullptr }; /* smx_host->process_lis */ - s_xbt_swag_hookup_t destroy_hookup = { nullptr, nullptr }; /* simix_global->process_to_destroy */ + boost::intrusive::list_member_hook<> host_process_list_hook; /* simgrid::simix::Host::process_list */ + boost::intrusive::list_member_hook<> smx_destroy_list_hook; /* simix_global->process_to_destroy */ + boost::intrusive::list_member_hook<> smx_synchro_hook; /* {mutex,cond,sem}->sleeping */ - unsigned long pid = 0; - unsigned long ppid = -1; - simgrid::xbt::string name; - const char* cname() { return name.c_str(); } - s4u::Host* host = nullptr; /* the host on which the process is running */ - smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */ + aid_t pid_ = 0; + aid_t ppid_ = -1; + simgrid::xbt::string name_; + const simgrid::xbt::string& get_name() const { return name_; } + const char* get_cname() const { return name_.c_str(); } + s4u::Host* host_ = nullptr; /* the host on which the process is running */ + smx_context_t context_ = nullptr; /* the context (uctx/raw/thread) that executes the user function */ - // TODO, pack them std::exception_ptr exception; - bool finished = false; - bool blocked = false; - bool suspended = false; - bool auto_restart = false; + bool finished_ = false; + bool blocked_ = false; + bool suspended_ = false; + bool auto_restart_ = false; - sg_host_t new_host = nullptr; /* if not null, the host on which the process must migrate to */ smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */ - std::list comms ; /* the current non-blocking communication synchros */ - xbt_dict_t properties = nullptr; - s_smx_simcall_t simcall; - void *data = nullptr; /* kept for compatibility, it should be replaced with moddata */ - xbt_dynar_t on_exit = nullptr; /* list of functions executed when the process dies */ + 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 */ std::function code; smx_timer_t kill_timer = nullptr; - int segment_index = -1; /* Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/ +private: + void* userdata_ = nullptr; /* kept for compatibility, it should be replaced with moddata */ + /* Refcounting */ + std::atomic_int_fast32_t refcount_{0}; + +public: friend void intrusive_ptr_add_ref(ActorImpl* process) { - // Atomic operation! Do not split in two instructions! - auto previous = (process->refcount_)++; - xbt_assert(previous != 0); - (void) previous; + // 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 + process->refcount_.fetch_add(1, std::memory_order_seq_cst); } friend void intrusive_ptr_release(ActorImpl* process) { - // Atomic operation! Do not split in two instructions! - auto count = --(process->refcount_); - if (count == 0) + // inspired from http://www.boost.org/doc/libs/1_55_0/doc/html/atomic/usage_examples.html + if (process->refcount_.fetch_sub(1, std::memory_order_release) == 1) { + // Make sure that any changes done on other threads before their acquire are committed before our delete + // http://stackoverflow.com/questions/27751025/why-is-an-acquire-barrier-needed-before-deleting-the-data-in-an-atomically-refer + std::atomic_thread_fence(std::memory_order_acquire); delete process; + } } - ~ActorImpl(); - + /* S4U/implem interfaces */ +private: + simgrid::s4u::Actor piface_; // Our interface is part of ourselves +public: simgrid::s4u::ActorPtr iface() { return s4u::ActorPtr(&piface_); } + simgrid::s4u::Actor* ciface() { return &piface_; } + /* Daemon actors are automatically killed when the last non-daemon leaves */ private: - std::atomic_int_fast32_t refcount_ { 1 }; - simgrid::s4u::Actor piface_; // Our interface is part of ourselves + bool daemon_ = false; +public: + void daemonize(); + bool is_daemon() { return daemon_; } /** Whether this actor has been daemonized */ + bool is_suspended() { return suspended_; } + simgrid::s4u::Actor* restart(); + smx_activity_t suspend(ActorImpl* issuer); + void resume(); + smx_activity_t sleep(double duration); + void set_user_data(void* data) { userdata_ = data; } + void* get_user_data() { return userdata_; } }; -} -} +class ProcessArg { +public: + std::string name; + std::function code; + void* data = nullptr; + s4u::Host* host = nullptr; + double kill_time = 0.0; + std::shared_ptr> properties = nullptr; + bool auto_restart = false; + ProcessArg() = default; + + explicit ProcessArg(std::string name, std::function code, void* data, s4u::Host* host, double kill_time, + std::shared_ptr> properties, bool auto_restart) + : name(name) + , code(std::move(code)) + , data(data) + , host(host) + , kill_time(kill_time) + , properties(properties) + , auto_restart(auto_restart) + { + } -typedef simgrid::simix::ProcessArg *smx_process_arg_t; + explicit ProcessArg(s4u::Host* host, ActorImpl* actor) + : name(actor->get_name()) + , code(std::move(actor->code)) + , data(actor->get_user_data()) + , host(host) + , kill_time(SIMIX_timer_get_date(actor->kill_timer)) + , auto_restart(actor->auto_restart_) + { + properties.reset(actor->get_properties(), [](decltype(actor->get_properties())) {}); + } +}; -typedef simgrid::simix::ActorImpl* smx_actor_t; +/* Used to keep the list of actors blocked on a synchro */ +typedef boost::intrusive::list, + &ActorImpl::smx_synchro_hook>> + SynchroList; -SG_BEGIN_DECL() +XBT_PUBLIC void create_maestro(std::function code); +} +} // namespace kernel +} // namespace simgrid -XBT_PRIVATE smx_actor_t SIMIX_process_create( - const char *name, - std::function code, - void *data, - sg_host_t host, - xbt_dict_t properties, - smx_actor_t parent_process); +typedef simgrid::kernel::actor::ActorImpl* smx_actor_t; + +XBT_PRIVATE smx_actor_t SIMIX_process_create(std::string name, std::function code, void* data, sg_host_t host, + std::unordered_map* properties, + smx_actor_t parent_process); XBT_PRIVATE void SIMIX_process_runall(); XBT_PRIVATE void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer); -XBT_PRIVATE void SIMIX_process_killall(smx_actor_t issuer, int reset_pid); +XBT_PRIVATE void SIMIX_process_killall(smx_actor_t issuer); XBT_PRIVATE void SIMIX_process_cleanup(smx_actor_t arg); XBT_PRIVATE void SIMIX_process_empty_trash(); XBT_PRIVATE void SIMIX_process_yield(smx_actor_t self); -XBT_PRIVATE void SIMIX_process_exception_terminate(xbt_ex_t * e); XBT_PRIVATE void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest); -XBT_PRIVATE smx_activity_t SIMIX_process_suspend(smx_actor_t process, smx_actor_t issuer); -XBT_PRIVATE void SIMIX_process_resume(smx_actor_t process); -XBT_PRIVATE int SIMIX_process_get_PID(smx_actor_t self); -XBT_PRIVATE void SIMIX_process_set_data(smx_actor_t process, void *data); -XBT_PRIVATE smx_actor_t SIMIX_process_get_by_name(const char* name); -XBT_PRIVATE int SIMIX_process_is_suspended(smx_actor_t process); -XBT_PRIVATE xbt_dict_t SIMIX_process_get_properties(smx_actor_t process); -XBT_PRIVATE smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout); -XBT_PRIVATE smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration); -XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_activity_t synchro); -XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart); -XBT_PRIVATE smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer); - -void SIMIX_segment_index_set(smx_actor_t process, int segment_index); -extern void (*SMPI_switch_data_segment)(int dest); +extern void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr actor); -SG_END_DECL() +XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_activity_t synchro); +XBT_PRIVATE smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout); #endif