-/* Copyright (c) 2010-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2017. 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. */
{
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);
}
/* - Send the task to the @ref worker */
char* payload = bprintf("%f", comp_size);
- simgrid::s4u::this_actor::send(mailbox, payload, comm_size);
+ mailbox->send(payload, comm_size);
}
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));
- simgrid::s4u::this_actor::send(mailbox, xbt_strdup("finalize"), 0);
+ mailbox->send(xbt_strdup("finalize"), 0);
}
}
};
{
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));
}
void operator()()
{
while (1) { /* The worker waits in an infinite loop for tasks sent by the \ref master */
- char* res = static_cast<char*>(simgrid::s4u::this_actor::recv(mailbox));
+ char* res = static_cast<char*>(mailbox->recv());
xbt_assert(res != nullptr, "MSG_task_get failed");
if (strcmp(res, "finalize") == 0) { /* - Exit if 'finalize' is received */
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);
}
XBT_INFO("Simulation time %g", e->getClock());
+ delete e;
return 0;
}