X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp b/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp index e3727c031e..072903b77f 100644 --- a/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp +++ b/examples/s4u/app-masterworkers/s4u-app-masterworkers-fun.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2020. 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,7 +19,7 @@ static void master(std::vector args) long tasks_count = std::stol(args[1]); double compute_cost = std::stod(args[2]); double communication_cost = std::stod(args[3]); - std::vector workers; + std::vector workers; for (unsigned int i = 4; i < args.size(); i++) workers.push_back(simgrid::s4u::Mailbox::by_name(args[i])); @@ -27,7 +27,7 @@ static void master(std::vector args) for (int i = 0; i < tasks_count; i++) { /* For each task to be executed: */ /* - Select a worker in a round-robin way */ - simgrid::s4u::MailboxPtr mailbox = workers[i % workers.size()]; + simgrid::s4u::Mailbox* mailbox = workers[i % workers.size()]; /* - Send the computation cost to that worker */ XBT_INFO("Sending task %d of %ld to mailbox '%s'", i, tasks_count, mailbox->get_cname()); @@ -37,7 +37,7 @@ static void master(std::vector args) XBT_INFO("All tasks have been dispatched. Request all workers to stop."); for (unsigned int i = 0; i < workers.size(); i++) { /* The workers stop when receiving a negative compute_cost */ - simgrid::s4u::MailboxPtr mailbox = workers[i % workers.size()]; + simgrid::s4u::Mailbox* mailbox = workers[i % workers.size()]; mailbox->put(new double(-1.0), 0); } @@ -49,12 +49,12 @@ static void worker(std::vector args) { xbt_assert(args.size() == 1, "The worker expects no argument"); - simgrid::s4u::Host* my_host = simgrid::s4u::this_actor::get_host(); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(my_host->get_name()); + const simgrid::s4u::Host* my_host = simgrid::s4u::this_actor::get_host(); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(my_host->get_name()); double compute_cost; do { - double* msg = static_cast(mailbox->get()); + const double* msg = static_cast(mailbox->get()); compute_cost = *msg; delete msg;