X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e22c862d29ac2455672f2bc7f50bbcc9ade21c2..901293dfbce6b7e0f555dbdc53358aa347fd1a3d:/examples/s4u/app-masterworker/s4u-app-masterworker.cpp diff --git a/examples/s4u/app-masterworker/s4u-app-masterworker.cpp b/examples/s4u/app-masterworker/s4u-app-masterworker.cpp index e35991f737..6b519cceb9 100644 --- a/examples/s4u/app-masterworker/s4u-app-masterworker.cpp +++ b/examples/s4u/app-masterworker/s4u-app-masterworker.cpp @@ -33,9 +33,9 @@ public: { for (int i = 0; i < number_of_tasks; i++) { /* For each task to be executed: */ /* - Select a @ref worker in a round-robin way */ - mailbox = simgrid::s4u::Mailbox::byName(std::string("worker-") + std::to_string(i % workers_count)); + mailbox = simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(i % workers_count)); - if (number_of_tasks < 10000 || i % 10000 == 0) + if (number_of_tasks < 10000 || (number_of_tasks < 100000 && i % 10000 == 0) || i % 100000 == 0) XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", (std::string("Task_") + std::to_string(i)).c_str(), number_of_tasks, mailbox->get_cname()); @@ -46,7 +46,7 @@ public: XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over."); for (int i = 0; i < workers_count; i++) { /* - Eventually tell all the workers to stop by sending a "finalize" task */ - mailbox = simgrid::s4u::Mailbox::byName(std::string("worker-") + std::to_string(i % workers_count)); + mailbox = simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(i % workers_count)); mailbox->put(new double(-1.0), 0); } } @@ -62,12 +62,12 @@ public: xbt_assert(args.size() == 2, "The worker expects a single argument from the XML deployment file: " "its worker ID (its numerical rank)"); id = std::stol(args[1]); - mailbox = simgrid::s4u::Mailbox::byName(std::string("worker-") + std::to_string(id)); + mailbox = simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(id)); } void operator()() { - while (1) { /* The worker waits in an infinite loop for tasks sent by the \ref master */ + while (1) { /* The worker waits in an infinite loop for tasks sent by the @ref master */ double* task = static_cast(mailbox->get()); xbt_assert(task != nullptr, "mailbox->get() failed"); double comp_size = *task;