X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1311b96eb936192957d85c894f5d2fae1c04446d..0d5011ff9c6105a9e15d451ec5f3b644d5c86659:/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 68342bd3c7..bc5d34a138 100644 --- a/examples/s4u/app-masterworker/s4u_app-masterworker.cpp +++ b/examples/s4u/app-masterworker/s4u_app-masterworker.cpp @@ -22,10 +22,10 @@ public: { xbt_assert(args.size() == 5, "The master function expects 4 arguments from the XML deployment file"); - number_of_tasks = xbt_str_parse_int(args[1].c_str(), "Invalid amount of tasks: %s"); /* - Number of tasks */ - comp_size = xbt_str_parse_double(args[2].c_str(), "Invalid computational size: %s"); /* - Task compute cost */ - comm_size = xbt_str_parse_double(args[3].c_str(), "Invalid communication size: %s"); /* - Communication size */ - workers_count = xbt_str_parse_int(args[4 ].c_str(), "Invalid amount of workers: %s"); /* - Number of workers */ + number_of_tasks = std::stol(args[1]); + comp_size = std::stod(args[2]); + comm_size = std::stod(args[3]); + workers_count = std::stol(args[4]); XBT_INFO("Got %ld workers and %ld tasks to process", workers_count, number_of_tasks); } @@ -42,7 +42,7 @@ public: /* - Send the task to the @ref worker */ char* payload = bprintf("%f", comp_size); - simgrid::s4u::this_actor::send(mailbox, (void*)(payload), comm_size); + simgrid::s4u::this_actor::send(mailbox, payload, comm_size); } XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over."); @@ -63,7 +63,7 @@ public: { xbt_assert(args.size() == 2, "The worker expects a single argument from the XML deployment file: " "its worker ID (its numerical rank)"); - id = xbt_str_parse_int(args[1].c_str(), "Invalid argument %s"); + id = std::stol(args[1]); mailbox = simgrid::s4u::Mailbox::byName(std::string("worker-") + std::to_string(id)); } @@ -78,7 +78,7 @@ public: break; } /* - Otherwise, process the task */ - double comp_size = xbt_str_parse_double(res, nullptr); + double comp_size = std::stod(res); xbt_free(res); simgrid::s4u::this_actor::execute(comp_size); }