X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bfa729b876a8c3e0f32ca4cb9c39d595e66b610..76f61e396704568a26dfb982cf3deb4db1c8ae83:/include/simgrid/s4u/Actor.hpp diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index bef7072932..6aff62b8f6 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 { @@ -179,6 +175,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 @@ -310,7 +312,7 @@ namespace this_actor { * See \ref Comm for the full communication API (including non blocking communications). */ XBT_PUBLIC(void*) recv(MailboxPtr chan); - XBT_PUBLIC(Comm&) irecv(MailboxPtr chan, void** data); + 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 * @@ -319,7 +321,8 @@ namespace this_actor { XBT_PUBLIC(void) send(MailboxPtr chan, void* payload, double simulatedSize); XBT_PUBLIC(void) send(MailboxPtr chan, void* payload, double simulatedSize, double timeout); - XBT_PUBLIC(Comm&) isend(MailboxPtr chan, void* payload, double simulatedSize); + XBT_PUBLIC(CommPtr) isend(MailboxPtr chan, void* payload, double simulatedSize); + XBT_PUBLIC(void) dsend(MailboxPtr chan, void* payload, double simulatedSize); /** @brief Returns the actor ID of the current actor (same as pid). */ XBT_PUBLIC(aid_t) pid(); @@ -351,7 +354,7 @@ namespace this_actor { XBT_PUBLIC(void) migrate(Host* new_host); }; -/** @} */ +/** @} */ }} // namespace simgrid::s4u