X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db176451b42c9d524f82e6bb9951447e098dd492..62a32394d08487c948e60b95817e03d81f1af91d:/include/simgrid/s4u/Actor.hpp diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index 58e1b4b76e..1168847e21 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -16,15 +16,11 @@ #include #include -#include - #include -#include #include #include #include -#include #include namespace simgrid { @@ -157,17 +153,9 @@ public: Actor(Actor const&) = delete; Actor& operator=(Actor const&) = delete; - // ***** Reference count (delegated to pimpl_) ***** - friend void intrusive_ptr_add_ref(Actor* actor) - { - xbt_assert(actor != nullptr); - SIMIX_process_ref(actor->pimpl_); - } - friend void intrusive_ptr_release(Actor* actor) - { - xbt_assert(actor != nullptr); - SIMIX_process_unref(actor->pimpl_); - } + // ***** Reference count ***** + friend void intrusive_ptr_add_ref(Actor * actor); + friend void intrusive_ptr_release(Actor * actor); // ***** Actor creation ***** /** Retrieve a reference to myself */ @@ -179,6 +167,12 @@ public: */ static ActorPtr createActor(const char* name, s4u::Host* host, std::function code); + static ActorPtr createActor(const char* name, s4u::Host* host, std::function*)> code, + std::vector* args) + { + return createActor(name, host, [code](std::vector* args) { code(args); }, args); + } + /** Create an actor using code * * Using this constructor, move-only type can be used. The consequence is @@ -207,10 +201,14 @@ public: simgrid::xbt::string name(); /** Retrieves the host on which that actor is running */ s4u::Host* host(); - /** Retrieves the PID of that actor */ - int pid(); - /** Retrieves the PPID of that actor */ - int ppid(); + /** Retrieves the PID of that actor + * + * actor_id_t is an alias for unsigned long */ + aid_t pid(); + /** Retrieves the PPID of that actor + * + * actor_id_t is an alias for unsigned long */ + aid_t ppid(); /** Suspend an actor by suspending the task on which it was waiting for the completion. */ void suspend(); @@ -218,6 +216,9 @@ public: /** Resume a suspended process by resuming the task on which it was waiting for the completion. */ void resume(); + /** Returns true if the process is suspended. */ + int isSuspended(); + /** If set to true, the actor will automatically restart when its host reboots */ void setAutoRestart(bool autorestart); @@ -232,25 +233,28 @@ public: double killTime(); void migrate(Host * new_host); + /** Ask the actor to die. * - * It will only notice your request when doing a simcall next time (a communication or similar). - * SimGrid sometimes have issues when you kill actors that are currently communicating and such. + * Any blocking activity will be canceled, and it will be rescheduled to free its memory. + * Being killed is not something that actors can defer or avoid. + * + * SimGrid still have sometimes issues when you kill actors that are currently communicating and such. * Still. Please report any bug that you may encounter with a minimal working example. */ void kill(); - static void kill(int pid); + static void kill(aid_t pid); /** Retrieves the actor that have the given PID (or nullptr if not existing) */ - static ActorPtr byPid(int pid); + static ActorPtr byPid(aid_t pid); /** @brief Wait for the actor to finish. * * This blocks the calling actor until the actor on which we call join() is terminated */ void join(); - + // Static methods on all actors: /** Ask kindly to all actors to die. Only the issuer will survive. */ @@ -259,21 +263,26 @@ public: /** Returns the internal implementation of this actor */ simix::ActorImpl* getImpl(); + + /** Retrieve the property value (or nullptr if not set) */ + const char* property(const char* key); + void setProperty(const char* key, const char* value); }; /** @ingroup s4u_api * @brief Static methods working on the current actor (see @ref s4u::Actor) */ namespace this_actor { - /** Block the actor sleeping for that amount of seconds (may throws hostFailure) */ - XBT_PUBLIC(void) sleep_for(double duration); - XBT_PUBLIC(void) sleep_until(double timeout); +XBT_PUBLIC(bool) isMaestro(); - template - inline void sleep_for(std::chrono::duration duration) - { - auto seconds = std::chrono::duration_cast(duration); - this_actor::sleep_for(seconds.count()); +/** Block the actor sleeping for that amount of seconds (may throws hostFailure) */ +XBT_PUBLIC(void) sleep_for(double duration); +XBT_PUBLIC(void) sleep_until(double timeout); + +template inline void sleep_for(std::chrono::duration duration) +{ + auto seconds = std::chrono::duration_cast(duration); + this_actor::sleep_for(seconds.count()); } template inline void sleep_until(const SimulationTimePoint& timeout_time) @@ -296,18 +305,24 @@ namespace this_actor { * See \ref Comm for the full communication API (including non blocking communications). */ XBT_PUBLIC(void*) recv(MailboxPtr chan); + XBT_PUBLIC(void*) recv(MailboxPtr chan, double timeout); + XBT_PUBLIC(CommPtr) irecv(MailboxPtr chan, void** data); /** Block the actor until it delivers a message of the given simulated size to the given mailbox * * See \ref Comm for the full communication API (including non blocking communications). */ XBT_PUBLIC(void) send(MailboxPtr chan, void* payload, double simulatedSize); + XBT_PUBLIC(void) send(MailboxPtr chan, void* payload, double simulatedSize, double timeout); - /** @brief Returns the PID of the current actor. */ - XBT_PUBLIC(int) pid(); + XBT_PUBLIC(CommPtr) isend(MailboxPtr chan, void* payload, double simulatedSize); + XBT_PUBLIC(void) dsend(MailboxPtr chan, void* payload, double simulatedSize); - /** @brief Returns the PPID of the current actor. */ - XBT_PUBLIC(int) ppid(); + /** @brief Returns the actor ID of the current actor (same as pid). */ + XBT_PUBLIC(aid_t) pid(); + + /** @brief Returns the ancestor's actor ID of the current actor (same as ppid). */ + XBT_PUBLIC(aid_t) ppid(); /** @brief Returns the name of the current actor. */ XBT_PUBLIC(std::string) name(); @@ -321,6 +336,8 @@ namespace this_actor { /** @brief Resume the actor. */ XBT_PUBLIC(void) resume(); + XBT_PUBLIC(int) isSuspended(); + /** @brief kill the actor. */ XBT_PUBLIC(void) kill(); @@ -331,7 +348,7 @@ namespace this_actor { XBT_PUBLIC(void) migrate(Host* new_host); }; -/** @} */ +/** @} */ }} // namespace simgrid::s4u