X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c92907fc7a130fd6abc60b98791daa320742ba2..2f8d17b7da365107340aab6f75763d0a9f2cecbb:/src/simix/ActorImpl.hpp diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index 213cd6b47d..9e4930deac 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; @@ -32,7 +24,7 @@ public: std::string name; std::function code; void *data = nullptr; - const char *hostname = nullptr; + sg_host_t host = nullptr; double kill_time = 0.0; xbt_dict_t properties = nullptr; bool auto_restart = false; @@ -49,9 +41,10 @@ public: s_xbt_swag_hookup_t destroy_hookup = { nullptr, nullptr }; /* simix_global->process_to_destroy */ unsigned long pid = 0; - unsigned long ppid = 0; + unsigned long 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 @@ -62,39 +55,42 @@ public: bool auto_restart = false; sg_host_t new_host = nullptr; /* if not null, the host on which the process must migrate to */ - smx_synchro_t waiting_synchro = nullptr; /* the current blocking synchro if any */ - xbt_fifo_t comms = nullptr; /* the current non-blocking communication synchros */ + 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::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*/ 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; + process->refcount_.fetch_add(1, std::memory_order_relaxed); } 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) { + std::atomic_thread_fence(std::memory_order_acquire); delete process; + } } ~ActorImpl(); - simgrid::s4u::Actor& getIface() { return piface_; } + simgrid::s4u::ActorPtr iface() { return s4u::ActorPtr(&piface_); } + simgrid::s4u::Actor* ciface() { return &piface_; } + + void daemonize(); + bool isDaemon(); private: + bool daemon = false; std::atomic_int_fast32_t refcount_ { 1 }; - simgrid::s4u::Actor piface_; + simgrid::s4u::Actor piface_; // Our interface is part of ourselves }; } @@ -102,45 +98,41 @@ private: typedef simgrid::simix::ProcessArg *smx_process_arg_t; -typedef simgrid::simix::ActorImpl* smx_process_t; +typedef simgrid::simix::ActorImpl* smx_actor_t; SG_BEGIN_DECL() -XBT_PRIVATE smx_process_t SIMIX_process_create( +XBT_PRIVATE smx_actor_t SIMIX_process_create( const char *name, std::function code, void *data, - const char *hostname, - double kill_time, + sg_host_t host, xbt_dict_t properties, - int auto_restart, - smx_process_t parent_process); + smx_actor_t parent_process); XBT_PRIVATE void SIMIX_process_runall(); -XBT_PRIVATE void SIMIX_process_kill(smx_process_t process, smx_process_t issuer); -XBT_PRIVATE void SIMIX_process_killall(smx_process_t issuer, int reset_pid); -XBT_PRIVATE void SIMIX_process_stop(smx_process_t arg); -XBT_PRIVATE void SIMIX_process_cleanup(smx_process_t arg); +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_cleanup(smx_actor_t arg); XBT_PRIVATE void SIMIX_process_empty_trash(); -XBT_PRIVATE void SIMIX_process_yield(smx_process_t self); +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_process_t process, sg_host_t dest); -XBT_PRIVATE smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer); -XBT_PRIVATE void SIMIX_process_resume(smx_process_t process, smx_process_t issuer); -XBT_PRIVATE int SIMIX_process_get_PID(smx_process_t self); -XBT_PRIVATE void* SIMIX_process_get_data(smx_process_t process); -XBT_PRIVATE void SIMIX_process_set_data(smx_process_t process, void *data); -XBT_PRIVATE smx_process_t SIMIX_process_get_by_name(const char* name); -XBT_PRIVATE int SIMIX_process_is_suspended(smx_process_t process); -XBT_PRIVATE xbt_dict_t SIMIX_process_get_properties(smx_process_t process); -XBT_PRIVATE smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout); -XBT_PRIVATE smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration); - -XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_synchro_t synchro); -XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart); -XBT_PRIVATE smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer); - -void SIMIX_segment_index_set(smx_process_t process, int segment_index); +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); SG_END_DECL()