-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2020. 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 "simgrid/s4u/Actor.hpp"
#include "src/simix/popping_private.hpp"
-#include "src/surf/PropertyHolder.hpp"
+#include "xbt/PropertyHolder.hpp"
#include <boost/intrusive/list.hpp>
#include <functional>
#include <list>
namespace kernel {
namespace actor {
-class XBT_PUBLIC ActorImpl : public surf::PropertyHolder {
+class XBT_PUBLIC ActorImpl : public xbt::PropertyHolder {
s4u::Host* host_ = nullptr; /* the host on which the actor is running */
- // XBT_DEPRECATED_v329
- void* userdata_ = nullptr; /* kept for compatibility, it should be replaced with moddata */
+ void* userdata_ = nullptr; /* XBT_ATTRIB_DEPRECATED_v329 kept for compatibility, should be replaced with moddata */
aid_t pid_ = 0;
aid_t ppid_ = -1;
bool daemon_ = false; /* Daemon actors are automatically killed when the last non-daemon leaves */
bool auto_restart_ = false;
+ unsigned stacksize_; // set to default value in constructor
public:
xbt::string name_;
~ActorImpl();
static ActorImpl* self();
- double get_kill_time();
+ double get_kill_time() const;
void set_kill_time(double kill_time);
boost::intrusive::list_member_hook<> host_actor_list_hook; /* simgrid::simix::Host::process_list */
boost::intrusive::list_member_hook<> smx_destroy_list_hook; /* simix_global->actors_to_destroy */
// Accessors to private fields
s4u::Host* get_host() { return host_; }
void set_host(s4u::Host* dest);
- // XBT_DEPRECATED_v329
- void* get_user_data() { return userdata_; }
- // XBT_DEPRECATED_v329
- void set_user_data(void* data) { userdata_ = data; }
+ void* get_user_data() { return userdata_; } // XBT_ATTRIB_DEPRECATED_v329
+ void set_user_data(void* data) { userdata_ = data; } // XBT_ATTRIB_DEPRECATED_v329
aid_t get_pid() const { return pid_; }
aid_t get_ppid() const { return ppid_; }
void set_ppid(aid_t ppid) { ppid_ = ppid; }
- bool is_daemon() { return daemon_; } /** Whether this actor has been daemonized */
- bool has_to_auto_restart() { return auto_restart_; }
+ bool is_daemon() const { return daemon_; } /** Whether this actor has been daemonized */
+ bool has_to_auto_restart() const { return auto_restart_; }
void set_auto_restart(bool autorestart) { auto_restart_ = autorestart; }
+ void set_stacksize(unsigned stacksize) { stacksize_ = stacksize; }
+ unsigned get_stacksize() const { return stacksize_; }
std::unique_ptr<context::Context> context_; /* the context (uctx/raw/thread) that executes the user function */
bool finished_ = false;
bool suspended_ = false;
- activity::ActivityImplPtr waiting_synchro = nullptr; /* the current blocking synchro if any */
- std::list<activity::ActivityImplPtr> comms; /* the current non-blocking communication synchros */
- s_smx_simcall simcall;
+ activity::ActivityImplPtr waiting_synchro_ = nullptr; /* the current blocking synchro if any */
+ std::list<activity::ActivityImplPtr> activities_; /* the current non-blocking synchros */
+ s_smx_simcall simcall_;
/* list of functions executed when the process dies */
std::shared_ptr<std::vector<std::function<void(bool)>>> on_exit =
std::make_shared<std::vector<std::function<void(bool)>>>();
std::function<void()> code_;
- simix::Timer* kill_timer = nullptr;
+ simix::Timer* kill_timer_ = nullptr;
private:
/* Refcounting */
std::atomic_int_fast32_t refcount_{0};
public:
- int get_refcount() { return refcount_; }
+ int get_refcount() const { return refcount_; }
friend void intrusive_ptr_add_ref(ActorImpl* actor)
{
// This whole memory consistency semantic drives me nuts.
private:
s4u::Actor piface_; // Our interface is part of ourselves
+ void cleanup_from_simix();
void undaemonize();
public:
- s4u::ActorPtr iface() { return s4u::ActorPtr(&piface_); }
- s4u::Actor* ciface() { return &piface_; }
+ s4u::ActorPtr get_iface() { return s4u::ActorPtr(&piface_); }
+ s4u::Actor* get_ciface() { return &piface_; }
- ActorImplPtr init(const std::string& name, s4u::Host* host);
- ActorImpl* start(const simix::ActorCode& code);
+ ActorImplPtr init(const std::string& name, s4u::Host* host) const;
+ ActorImpl* start(const ActorCode& code);
- static ActorImplPtr create(const std::string& name, const simix::ActorCode& code, void* data, s4u::Host* host,
- const std::unordered_map<std::string, std::string>* properties, ActorImpl* parent_actor);
+ static ActorImplPtr create(const std::string& name, const ActorCode& code, void* data, s4u::Host* host,
+ const std::unordered_map<std::string, std::string>* properties,
+ const ActorImpl* parent_actor);
static ActorImplPtr attach(const std::string& name, void* data, s4u::Host* host,
const std::unordered_map<std::string, std::string>* properties);
static void detach();
void cleanup();
void exit();
- void kill(ActorImpl* actor);
- void kill_all();
+ void kill(ActorImpl* actor) const;
+ void kill_all() const;
void yield();
void daemonize();
- bool is_suspended() { return suspended_; }
+ bool is_suspended() const { return suspended_; }
s4u::Actor* restart();
void suspend();
void resume();
- activity::ActivityImplPtr join(ActorImpl* actor, double timeout);
+ activity::ActivityImplPtr join(const ActorImpl* actor, double timeout);
activity::ActivityImplPtr sleep(double duration);
/** Ask the actor to throw an exception right away */
void throw_exception(std::exception_ptr e);
};
/* 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;
+using SynchroList =
+ boost::intrusive::list<ActorImpl, boost::intrusive::member_hook<ActorImpl, boost::intrusive::list_member_hook<>,
+ &ActorImpl::smx_synchro_hook>>;
XBT_PUBLIC void create_maestro(const std::function<void()>& code);
-XBT_PUBLIC int get_maxpid();
+XBT_PUBLIC unsigned long get_maxpid();
} // namespace actor
} // namespace kernel
} // namespace simgrid
