X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b63f78dc217b79305cef05bd2200069d3e24475..76a018f7f259011afdaf57e31439dee9313fad4c:/src/simix/ActorImpl.hpp diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index 28409f3180..c650cd2027 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. 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. */ @@ -10,29 +10,31 @@ #include "src/simix/popping_private.hpp" #include "src/surf/PropertyHolder.hpp" #include +#include #include #include struct s_smx_process_exit_fun_t { - int_f_pvoid_pvoid_t fun; + std::function fun; void *arg; }; namespace simgrid { -namespace simix { +namespace kernel { +namespace actor { class ProcessArg { public: std::string name; - std::function code; + simgrid::simix::ActorCode code; void* data = nullptr; s4u::Host* host = nullptr; double kill_time = 0.0; - std::shared_ptr> properties; + 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) + explicit ProcessArg(std::string name, simgrid::simix::ActorCode code, void* data, s4u::Host* host, double kill_time, + std::shared_ptr> properties, bool auto_restart) : name(name) , code(std::move(code)) , data(data) @@ -56,12 +58,11 @@ public: aid_t pid = 0; aid_t ppid = -1; simgrid::xbt::string name; - const simgrid::xbt::string& getName() const { return name; } - const char* getCname() const { return name.c_str(); } + 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; @@ -70,15 +71,15 @@ public: smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */ std::list comms; /* the current non-blocking communication synchros */ - s_smx_simcall_t simcall; - void* userdata = nullptr; /* kept for compatibility, it should be replaced with moddata */ + s_smx_simcall simcall; std::vector on_exit; /* list of functions executed when the process dies */ - std::function code; + simgrid::simix::ActorCode code; smx_timer_t kill_timer = nullptr; - /* Refcounting */ private: + void* userdata = nullptr; /* kept for compatibility, it should be replaced with moddata */ + /* Refcounting */ std::atomic_int_fast32_t refcount_{0}; public: @@ -113,48 +114,43 @@ private: bool daemon = false; public: void daemonize(); - bool isDaemon() { return daemon; } /** Whether this actor has been daemonized */ - bool isSuspended() { return suspended; } + bool isDaemon() const { return daemon; } /** Whether this actor has been daemonized */ + bool isSuspended() const { return suspended; } simgrid::s4u::Actor* restart(); smx_activity_t suspend(ActorImpl* issuer); void resume(); smx_activity_t sleep(double duration); void setUserData(void* data) { userdata = data; } - void* getUserData() { return userdata; } + void* getUserData() const { return userdata; } }; /* Used to keep the list of actors blocked on a synchro */ typedef boost::intrusive::list, &ActorImpl::smx_synchro_hook>> SynchroList; -} -} -typedef simgrid::simix::ProcessArg *smx_process_arg_t; - -typedef simgrid::simix::ActorImpl* smx_actor_t; +XBT_PUBLIC void create_maestro(simgrid::simix::ActorCode code); +} +} // namespace kernel +} // namespace simgrid -extern "C" { +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::map* properties, +XBT_PRIVATE smx_actor_t SIMIX_process_create(const char* name, simgrid::simix::ActorCode 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 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 void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart); -extern void (*SMPI_switch_data_segment)(int dest); -} +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);