// ***** Actor creation *****
/** Retrieve a reference to myself */
- static ActorPtr self();
+ static Actor* self();
/** Signal to others that a new actor has been created **/
- static xbt::signal<void(ActorPtr)> on_creation;
+ static xbt::signal<void(Actor&)> on_creation;
/** Signal to others that an actor has been suspended**/
- static xbt::signal<void(ActorPtr)> on_suspend;
+ static xbt::signal<void(Actor const&)> on_suspend;
/** Signal to others that an actor has been resumed **/
- static xbt::signal<void(ActorPtr)> on_resume;
+ static xbt::signal<void(Actor const&)> on_resume;
/** Signal to others that an actor is sleeping **/
- static xbt::signal<void(ActorPtr)> on_sleep;
+ static xbt::signal<void(Actor const&)> on_sleep;
/** Signal to others that an actor wakes up for a sleep **/
- static xbt::signal<void(ActorPtr)> on_wake_up;
+ static xbt::signal<void(Actor const&)> on_wake_up;
/** Signal to others that an actor is going to migrated to another host**/
- static xbt::signal<void(ActorPtr)> on_migration_start;
+ static xbt::signal<void(Actor const&)> on_migration_start;
/** Signal to others that an actor is has been migrated to another host **/
- static xbt::signal<void(ActorPtr)> on_migration_end;
+ static xbt::signal<void(Actor const&)> on_migration_end;
/** Signal indicating that an actor is about to disappear.
* This signal is fired for any dying actor, which is mostly useful when designing plugins and extensions. If you
* want to register to the termination of a given actor, use this_actor::on_exit() instead.*/
- static xbt::signal<void(ActorPtr)> on_destruction;
+ static xbt::signal<void(Actor const&)> on_destruction;
/** Create an actor from a std::function<void()>
*
/** Retrieve the property value (or nullptr if not set) */
std::unordered_map<std::string, std::string>*
- get_properties(); // FIXME: do not export the map, but only the keys or something
- const char* get_property(const std::string& key);
+ get_properties() const; // FIXME: do not export the map, but only the keys or something
+ const char* get_property(const std::string& key) const;
void set_property(const std::string& key, const std::string& value);
#ifndef DOXYGEN
const std::function<void(int, void*)>& fun, void* data);
XBT_ATTRIB_DEPRECATED_v325("Please use Actor::by_pid(pid).kill() instead") static void kill(aid_t pid);
-
- /** @deprecated See Actor::create() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::create()") static ActorPtr
- createActor(const char* name, s4u::Host* host, const std::function<void()>& code)
- {
- return create(name, host, code);
- }
- /** @deprecated See Actor::create() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::create()") static ActorPtr
- createActor(const char* name, s4u::Host* host, const std::function<void(std::vector<std::string>*)>& code,
- std::vector<std::string>* args)
- {
- return create(name, host, code, args);
- }
- /** @deprecated See Actor::create() */
- template <class F, class... Args, typename = typename std::result_of<F(Args...)>::type>
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::create()") static ActorPtr createActor(
- const char* name, s4u::Host* host, F code, Args... args)
- {
- return create(name, host, code, std::move(args)...);
- }
- /** @deprecated See Actor::create() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::create()") static ActorPtr createActor(
- const char* name, s4u::Host* host, const char* function, std::vector<std::string> args)
- {
- return create(name, host, function, args);
- }
- /** @deprecated See Actor::is_daemon() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::is_daemon()") bool isDaemon() const;
- /** @deprecated See Actor::get_name() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_name()") const simgrid::xbt::string& getName() const
- {
- return get_name();
- }
- /** @deprecated See Actor::get_cname() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_cname()") const char* getCname() const { return get_cname(); }
- /** @deprecated See Actor::get_host() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_host()") Host* getHost() { return get_host(); }
- /** @deprecated See Actor::get_pid() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_pid()") aid_t getPid() { return get_pid(); }
- /** @deprecated See Actor::get_ppid() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_ppid()") aid_t getPpid() { return get_ppid(); }
- /** @deprecated See Actor::is_suspended() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::is_suspended()") int isSuspended() { return is_suspended(); }
- /** @deprecated See Actor::set_auto_restart() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::set_auto_restart()") void setAutoRestart(bool a)
- {
- set_auto_restart(a);
- }
- /** @deprecated Please use a std::function<void(int, void*)> for first parameter */
- XBT_ATTRIB_DEPRECATED_v323("Please use a std::function<void(int, void*)> for first parameter.") void on_exit(
- int_f_pvoid_pvoid_t fun, void* data);
- /** @deprecated See Actor::on_exit() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::on_exit()") void onExit(int_f_pvoid_pvoid_t fun, void* data)
- {
- on_exit([fun, data](bool a) { fun((void*)(uintptr_t)a, data); });
- }
- /** @deprecated See Actor::set_kill_time() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::set_kill_time()") void setKillTime(double time) { set_kill_time(time); }
- /** @deprecated See Actor::get_kill_time() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_kill_time()") double getKillTime() { return get_kill_time(); }
- /** @deprecated See Actor::by_pid() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::by_pid()") static ActorPtr byPid(aid_t pid) { return by_pid(pid); }
- /** @deprecated See Actor::kill_all() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::kill_all()") static void killAll() { kill_all(); }
- /** @deprecated See Actor::kill_all() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::kill_all() with no parameter") static void killAll(
- int XBT_ATTRIB_UNUSED resetPid)
- {
- kill_all();
- }
- /** @deprecated See Actor::get_impl() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_impl()") kernel::actor::ActorImpl* getImpl() { return get_impl(); }
- /** @deprecated See Actor::get_property() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_property()") const char* getProperty(const char* key)
- {
- return get_property(key);
- }
- /** @deprecated See Actor::get_properties() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::get_properties()") std::map<std::string, std::string>* getProperties()
- {
- std::map<std::string, std::string>* res = new std::map<std::string, std::string>();
- std::unordered_map<std::string, std::string>* props = get_properties();
- for (auto const& kv : *props)
- res->insert(kv);
- return res;
- }
- /** @deprecated See Actor::get_properties() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Actor::set_property()") void setProperty(const char* key, const char* value)
- {
- set_property(key, value);
- }
#endif
};
XBT_ATTRIB_DEPRECATED_v325("Please use std::function<void(bool)> for first parameter.") XBT_PUBLIC
void on_exit(const std::function<void(int, void*)>& fun, void* data);
-/** @deprecated Please use std::function<void(int, void*)> for first parameter */
-XBT_ATTRIB_DEPRECATED_v323("Please use std::function<void(bool)> for first parameter.") XBT_PUBLIC
- void on_exit(int_f_pvoid_pvoid_t fun, void* data);
-/** @deprecated See this_actor::get_name() */
-XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_name()") XBT_PUBLIC std::string getName();
-/** @deprecated See this_actor::get_cname() */
-XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_cname()") XBT_PUBLIC const char* getCname();
-/** @deprecated See this_actor::is_maestro() */
-XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::is_maestro()") XBT_PUBLIC bool isMaestro();
-/** @deprecated See this_actor::get_pid() */
-XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_pid()") XBT_PUBLIC aid_t getPid();
-/** @deprecated See this_actor::get_ppid() */
-XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_ppid()") XBT_PUBLIC aid_t getPpid();
-/** @deprecated See this_actor::get_host() */
-XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_host()") XBT_PUBLIC Host* getHost();
-/** @deprecated See this_actor::on_exit() */
-XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::on_exit()") XBT_PUBLIC void onExit(int_f_pvoid_pvoid_t fun, void* data);
/** @deprecated See this_actor::exit() */
XBT_ATTRIB_DEPRECATED_v324("Please use this_actor::exit()") XBT_PUBLIC void kill();
#endif
