X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd02d8d308feab888032539a30702bf2fb4b445f..c0a4a200c90b3384121aa4b6e30acaed9e3bd0ac:/src/simix/ActorImpl.hpp diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index ff1073cc80..e1ffbdac9f 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -3,21 +3,13 @@ /* 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 SIMIX_ACTORIMPL_H +#define SIMIX_ACTORIMPL_H -#include -#include -#include - -#include -#include - -#include -#include - -#include "simgrid/simix.h" -#include "popping_private.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; @@ -41,6 +33,7 @@ public: class ActorImpl { public: ActorImpl() : piface_(this) {} + ~ActorImpl(); // TODO, replace with boost intrusive container hooks s_xbt_swag_hookup_t process_hookup = { nullptr, nullptr }; /* simix_global->process_list */ @@ -48,10 +41,11 @@ public: 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 */ - unsigned long pid = 0; - unsigned long ppid = 0; + aid_t pid = 0; + aid_t ppid = -1; simgrid::xbt::string name; - sg_host_t host = nullptr; /* the host on which the process is running */ + 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 */ // TODO, pack them @@ -63,38 +57,52 @@ public: 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 */ - xbt_fifo_t comms = nullptr; /* the current non-blocking communication synchros */ + 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::vector on_exit; /* list of functions executed when the process dies */ std::function code; smx_timer_t kill_timer = nullptr; - int segment_index = 0; /* Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/ + int segment_index = -1; /* Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/ + /* Refcounting */ +private: + std::atomic_int_fast32_t refcount_{1}; +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(); - - simgrid::s4u::Actor& getIface() { return piface_; } + /* 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_; + bool daemon = false; +public: + void daemonize(); + bool isDaemon(); }; } @@ -111,15 +119,12 @@ XBT_PRIVATE smx_actor_t SIMIX_process_create( std::function code, void *data, sg_host_t host, - double kill_time, xbt_dict_t properties, - int auto_restart, 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_stop(smx_actor_t arg); 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); @@ -128,7 +133,6 @@ 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_get_data(smx_actor_t process); 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);