X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ebc53f4ea63c0ec84680e5484ad9c9a81c85ff3..58bb531bcf303874a5e1356c750423a8490617e9:/src/simix/ActorImpl.hpp diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index 605e6d857f..684b322919 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -23,34 +23,13 @@ namespace simgrid { namespace kernel { namespace actor { -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; - 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) - { - } -}; - class ActorImpl : public simgrid::surf::PropertyHolder { public: - ActorImpl() : piface_(this) {} + ActorImpl(simgrid::xbt::string name, simgrid::s4u::Host* host); ~ActorImpl(); + void set_auto_restart(bool autorestart) { auto_restart_ = autorestart; } + 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<> smx_destroy_list_hook; /* simix_global->process_to_destroy */ boost::intrusive::list_member_hook<> smx_synchro_hook; /* {mutex,cond,sem}->sleeping */ @@ -83,22 +62,22 @@ private: std::atomic_int_fast32_t refcount_{0}; public: - friend void intrusive_ptr_add_ref(ActorImpl* process) + 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 - process->refcount_.fetch_add(1, std::memory_order_seq_cst); + actor->refcount_.fetch_add(1, std::memory_order_seq_cst); } - friend void intrusive_ptr_release(ActorImpl* process) + friend void intrusive_ptr_release(ActorImpl* actor) { // 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) { + if (actor->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; + delete actor; } } @@ -113,15 +92,62 @@ public: private: bool daemon_ = false; public: + static ActorImplPtr create(std::string name, simix::ActorCode code, void* data, s4u::Host* host, + std::unordered_map* properties, smx_actor_t parent_actor); + void exit(); + void kill(smx_actor_t actor); + void kill_all(); + 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 join(smx_actor_t actor, double timeout); smx_activity_t sleep(double duration); void set_user_data(void* data) { userdata_ = data; } void* get_user_data() { return userdata_; } + /** Ask the actor to throw an exception right away */ + void throw_exception(std::exception_ptr e); + void set_host(sg_host_t dest); +}; + +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; + bool daemon_ = 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) + { + } + + 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_) + , daemon_(actor->is_daemon()) + { + properties.reset(actor->get_properties(), [](decltype(actor->get_properties())) {}); + } }; /* Used to keep the list of actors blocked on a synchro */ @@ -136,23 +162,13 @@ XBT_PUBLIC void create_maestro(std::function code); typedef simgrid::kernel::actor::ActorImpl* smx_actor_t; -XBT_PRIVATE smx_actor_t SIMIX_process_create(const char* 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); 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_change_host(smx_actor_t process, sg_host_t dest); - -XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart); extern void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr actor); 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