X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..5dac84d65eed08644367fe040c41df162c02e5fa:/docs/source/tuto_s4u/master-workers-lab3.cpp diff --git a/docs/source/tuto_s4u/master-workers-lab3.cpp b/docs/source/tuto_s4u/master-workers-lab3.cpp index 8f964ce0b8..d369ecc7b2 100644 --- a/docs/source/tuto_s4u/master-workers-lab3.cpp +++ b/docs/source/tuto_s4u/master-workers-lab3.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -19,12 +19,11 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_masterworker, "Messages specific for this e static void worker() { const std::string mailbox_name = std::string("worker-") + std::to_string(simgrid::s4u::this_actor::get_pid()); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name); - double compute_cost; while (true) { // Master forcefully kills the workers by the end of the simulation - double* msg = static_cast(mailbox->get()); - compute_cost = *msg; + double* msg = mailbox->get(); + double compute_cost = *msg; delete msg; simgrid::s4u::this_actor::execute(compute_cost); @@ -51,11 +50,11 @@ static void master(std::vector args) } int task_id = 0; - while (e->get_clock() < simulation_duration) { /* For each task: */ + while (simgrid::s4u::Engine::get_clock() < simulation_duration) { /* For each task: */ /* - Select a worker in a round-robin way */ aid_t worker_pid = actors.at(task_id % actors.size())->get_pid(); std::string mailbox_name = std::string("worker-") + std::to_string(worker_pid); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name); /* - Send the computation cost to that worker */ if (task_id % 100 == 0)