X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/691d7c891da0352a6fa38507a482b287c7e086de..8be118f09371c1e9fb4bdac52f6c7dad1fff44d8:/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp b/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp index a91f203ad8..7dd386058f 100644 --- a/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp +++ b/examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2019. 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. */ @@ -12,9 +12,9 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_masterworker, "Messages specific for this s4u example"); class Master { - long tasks_count = 0; - double compute_cost = 0; - double communicate_cost = 0; + long tasks_count = 0; + double compute_cost = 0; + long communicate_cost = 0; std::vector workers; public: @@ -24,7 +24,7 @@ public: tasks_count = std::stol(args[1]); compute_cost = std::stod(args[2]); - communicate_cost = std::stod(args[3]); + communicate_cost = std::stol(args[3]); for (unsigned int i = 4; i < args.size(); i++) workers.push_back(simgrid::s4u::Mailbox::by_name(args[i])); @@ -67,13 +67,12 @@ public: { double compute_cost; do { - double* msg = static_cast(mailbox->get()); + const auto* msg = static_cast(mailbox->get()); compute_cost = *msg; delete msg; if (compute_cost > 0) /* If compute_cost is valid, execute a computation of that cost */ simgrid::s4u::this_actor::execute(compute_cost); - } while (compute_cost > 0); /* Stop when receiving an invalid compute_cost */ XBT_INFO("Exiting now.");