From 36a6fab77ef7d4e4a24aa06d5648ec7a0df7f111 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 6 Sep 2018 21:39:26 +0200 Subject: [PATCH] dont use send/receive on mailboxes, but put/get --- docs/source/app_s4u.rst | 8 ++++---- examples/s4u/async-waitall/s4u-async-waitall.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst index f386d13bec..a4a661a074 100644 --- a/docs/source/app_s4u.rst +++ b/docs/source/app_s4u.rst @@ -41,8 +41,8 @@ completion of these activities. When **communicating**, data is not directly sent to other actors but posted onto a |Mailbox|_ that serve as rendez-vous point between communicating actors. This means that you don't need to know who you -are talking to, you just put your communication `Send` request in a -mailbox, and it will be matched with a complementary `Receive` +are talking to, you just put your communication `Put` request in a +mailbox, and it will be matched with a complementary `Get` request. Alternatively, actors can interact through **classical synchronization mechanisms** such as |Barrier|_, |Semaphore|_, |Mutex|_ and |ConditionVariable|_. @@ -197,8 +197,8 @@ with .. literalinclude:: ../../examples/s4u/async-waitall/s4u-async-waitall.cpp :language: c++ - :start-after: send-begin - :end-before: send-end + :start-after: put-begin + :end-before: put-end :dedent: 4 diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp index 7c7c908b79..f49f7bff88 100644 --- a/examples/s4u/async-waitall/s4u-async-waitall.cpp +++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp @@ -58,7 +58,7 @@ public: pending_comms.push_back(comm); } - /* Start sending messages to let the workers know that they should stop */ // sphinx-doc: send-begin + /* Start sending messages to let the workers know that they should stop */ // sphinx-doc: put-begin for (int i = 0; i < receivers_count; i++) { XBT_INFO("Send 'finalize' to 'receiver-%d'", i); simgrid::s4u::CommPtr comm = mboxes[i]->put_async(new std::string("finalize"), 0); @@ -68,7 +68,7 @@ public: /* Now that all message exchanges were initiated, wait for their completion in one single call */ simgrid::s4u::Comm::wait_all(&pending_comms); - // sphinx-doc: send-end + // sphinx-doc: put-end XBT_INFO("Goodbye now!"); } -- 2.20.1