X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa3595ed3c903167f52eeeab8e636bec96b258dd..5b471fd312578823ddf19badd84c523c024e99bf:/include/simgrid/s4u/Actor.hpp diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index 7bc02e7e37..4d948964e9 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -16,14 +16,11 @@ #include #include -#include - -#include +#include #include #include #include -#include #include namespace simgrid { @@ -130,11 +127,13 @@ namespace s4u { * @{ */ -/** @brief Simulation Agent (see \ref s4u_actor)*/ -XBT_PUBLIC_CLASS Actor { +/** @brief Simulation Agent */ +XBT_PUBLIC_CLASS Actor : public simgrid::xbt::Extendable +{ friend Mailbox; friend simgrid::simix::ActorImpl; - smx_actor_t pimpl_ = nullptr; + friend simgrid::kernel::activity::MailboxImpl; + simix::ActorImpl* pimpl_ = nullptr; /** Wrap a (possibly non-copyable) single-use task into a `std::function` */ template @@ -143,9 +142,7 @@ XBT_PUBLIC_CLASS Actor { typedef decltype(f(std::move(args)...)) R; auto task = std::make_shared>( simgrid::xbt::makeTask(std::move(f), std::move(args)...)); - return [=] { - (*task)(); - }; + return [task] { (*task)(); }; } explicit Actor(smx_actor_t pimpl) : pimpl_(pimpl) {} @@ -153,22 +150,12 @@ XBT_PUBLIC_CLASS Actor { public: // ***** No copy ***** - 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 */ @@ -178,11 +165,12 @@ public: * * If the actor is restarted, the actor has a fresh copy of the function. */ - static ActorPtr createActor(const char* name, s4u::Host *host, double killTime, std::function code); + static ActorPtr createActor(const char* name, s4u::Host* host, std::function code); - 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, -1.0, std::move(code)); + return createActor(name, host, [code](std::vector* args) { code(args); }, args); } /** Create an actor using code @@ -203,75 +191,100 @@ public: // Create actor from function name: - static ActorPtr createActor(const char* name, s4u::Host *host, double killTime, - const char* function, std::vector args); - - static ActorPtr createActor(const char* name, s4u::Host *host, const char* function, - std::vector args) - { - return createActor(name, host, -1.0, function, std::move(args)); - } + static ActorPtr createActor(const char* name, s4u::Host* host, const char* function, std::vector args); // ***** Methods ***** + /** This actor will be automatically terminated when the last non-daemon process finishes **/ + void daemonize(); - /** Retrieves the actor that have the given PID (or NULL if not existing) */ - //static Actor *byPid(int pid); not implemented - - /** Retrieves the name of that actor */ + /** Retrieves the name of that actor as a C string */ + const char* getCname(); + /** Retrieves the name of that actor as a C++ string */ simgrid::xbt::string getName(); /** Retrieves the host on which that actor is running */ - s4u::Host *getHost(); - /** Retrieves the PID of that actor */ - int getPid(); - /** Retrieves the PPID of that actor */ - int getPpid(); + s4u::Host* getHost(); + /** Retrieves the PID of that actor + * + * actor_id_t is an alias for unsigned long */ + aid_t getPid(); + /** Retrieves the PPID of that actor + * + * actor_id_t is an alias for unsigned long */ + aid_t getPpid(); + + /** Suspend an actor by suspending the task on which it was waiting for the completion. */ + void suspend(); + + /** 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); + + /** Add a function to the list of "on_exit" functions for the current actor. The on_exit functions are the functions + * executed when your actor is killed. You should use them to free the data used by your process. + */ + void onExit(int_f_pvoid_pvoid_t fun, void* data); + /** Sets the time at which that actor should be killed */ void setKillTime(double time); /** Retrieves the time at which that actor will be killed (or -1 if not set) */ double getKillTime(); + 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. - * We are working on it to fix the issues. + * 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 ActorPtr forPid(int pid); - - /** - * Wait for the actor to finish. - */ + static void kill(aid_t pid); + + /** Retrieves the actor that have the given PID (or nullptr if not existing) */ + 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. */ static void killAll(); + static void killAll(int resetPid); -protected: /** Returns the internal implementation of this actor */ - smx_actor_t getImpl(); + simix::ActorImpl* getImpl(); + + /** Retrieve the property value (or nullptr if not set) */ + const char* getProperty(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) @@ -287,33 +300,61 @@ namespace this_actor { } /** Block the actor, computing the given amount of flops */ - XBT_PUBLIC(e_smx_state_t) execute(double flop); + XBT_PUBLIC(void) execute(double flop); /** Block the actor until it gets a message from the given mailbox. * * See \ref Comm for the full communication API (including non blocking communications). */ - XBT_PUBLIC(void*) recv(MailboxPtr chan); + XBT_PUBLIC(void*) XBT_ATTRIB_DEPRECATED("Please use Mailbox::get") recv(MailboxPtr chan); // 3.17 + XBT_PUBLIC(void*) XBT_ATTRIB_DEPRECATED("Please use Mailbox::get") recv(MailboxPtr chan, double timeout); // 3.17 + XBT_PUBLIC(CommPtr) + XBT_ATTRIB_DEPRECATED("Please use Mailbox::recv_async") irecv(MailboxPtr chan, void** data); // 3.17 /** 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, size_t simulatedSize); - - /** - * Return the PID of the current actor. - */ - XBT_PUBLIC(int) getPid(); - - /** - * Return the PPID of the current actor. - */ - int getPpid(); + XBT_PUBLIC(void) + XBT_ATTRIB_DEPRECATED("Please use Mailbox::put") send(MailboxPtr chan, void* payload, double simulatedSize); // 3.17 + XBT_PUBLIC(void) + XBT_ATTRIB_DEPRECATED("Please use Mailbox::put") + send(MailboxPtr chan, void* payload, double simulatedSize, double timeout); // 3.17 + + XBT_PUBLIC(CommPtr) + XBT_ATTRIB_DEPRECATED("Please use Mailbox::put_async") isend(MailboxPtr chan, void* payload, double simulatedSize); + + /** @brief Returns the actor ID of the current actor (same as pid). */ + XBT_PUBLIC(aid_t) getPid(); + + /** @brief Returns the ancestor's actor ID of the current actor (same as ppid). */ + XBT_PUBLIC(aid_t) getPpid(); + + /** @brief Returns the name of the current actor. */ + XBT_PUBLIC(std::string) getName(); + + /** @brief Returns the name of the host on which the process is running. */ + XBT_PUBLIC(Host*) getHost(); + + /** @brief Suspend the actor. */ + XBT_PUBLIC(void) suspend(); + + /** @brief Resume the actor. */ + XBT_PUBLIC(void) resume(); + + XBT_PUBLIC(bool) isSuspended(); + + /** @brief kill the actor. */ + XBT_PUBLIC(void) kill(); + + /** @brief Add a function to the list of "on_exit" functions. */ + XBT_PUBLIC(void) onExit(int_f_pvoid_pvoid_t fun, void* data); + /** @brief Migrate the actor to a new host. */ + XBT_PUBLIC(void) migrate(Host* new_host); }; -/** @} */ +/** @} */ }} // namespace simgrid::s4u