-/* 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. */
#include "src/simix/popping_private.hpp"
#include "src/surf/PropertyHolder.hpp"
#include <boost/intrusive/list.hpp>
+#include <functional>
#include <list>
#include <map>
struct s_smx_process_exit_fun_t {
- int_f_pvoid_pvoid_t fun;
+ std::function<void(int, void*)> fun;
void *arg;
};
namespace simgrid {
-namespace simix {
-
-class ProcessArg {
-public:
- std::string name;
- std::function<void()> code;
- void* data = nullptr;
- s4u::Host* host = nullptr;
- double kill_time = 0.0;
- std::shared_ptr<std::map<std::string, std::string>> properties;
- bool auto_restart = false;
- ProcessArg() = default;
- explicit ProcessArg(std::string name, std::function<void()> code, void* data, s4u::Host* host, double kill_time,
- std::shared_ptr<std::map<std::string, std::string>> properties, bool auto_restart)
- : name(name)
- , code(std::move(code))
- , data(data)
- , host(host)
- , kill_time(kill_time)
- , properties(properties)
- , auto_restart(auto_restart)
- {
- }
-};
+namespace kernel {
+namespace actor {
class ActorImpl : public simgrid::surf::PropertyHolder {
public:
ActorImpl() : piface_(this) {}
~ActorImpl();
+ void set_auto_restart(bool autorestart) { auto_restart_ = autorestart; }
+
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 */
- 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(); }
- 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;
smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */
std::list<smx_activity_t> 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<s_smx_process_exit_fun_t> on_exit; /* list of functions executed when the process dies */
std::function<void()> 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:
/* Daemon actors are automatically killed when the last non-daemon leaves */
private:
- bool daemon = false;
+ bool daemon_ = false;
public:
void daemonize();
- bool isDaemon() { return daemon; } /** Whether this actor has been daemonized */
- bool isSuspended() { return suspended; }
+ 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 setUserData(void* data) { userdata = data; }
- void* getUserData() { return userdata; }
+ void set_user_data(void* data) { userdata_ = data; }
+ void* get_user_data() { return userdata_; }
+};
+
+class ProcessArg {
+public:
+ std::string name;
+ std::function<void()> code;
+ void* data = nullptr;
+ s4u::Host* host = nullptr;
+ double kill_time = 0.0;
+ std::shared_ptr<std::unordered_map<std::string, std::string>> properties = nullptr;
+ bool auto_restart = false;
+ ProcessArg() = default;
+
+ explicit ProcessArg(std::string name, std::function<void()> code, void* data, s4u::Host* host, double kill_time,
+ std::shared_ptr<std::unordered_map<std::string, std::string>> 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_)
+ {
+ properties.reset(actor->get_properties(), [](decltype(actor->get_properties())) {});
+ }
};
/* Used to keep the list of actors blocked on a synchro */
typedef boost::intrusive::list<ActorImpl, boost::intrusive::member_hook<ActorImpl, boost::intrusive::list_member_hook<>,
&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(std::function<void()> 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<void()> code, void* data, sg_host_t host,
- std::map<std::string, std::string>* properties,
+XBT_PRIVATE smx_actor_t SIMIX_process_create(std::string name, std::function<void()> code, void* data, sg_host_t host,
+ std::unordered_map<std::string, std::string>* 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);
