-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2018. 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. */
-#include "xbt/str.h"
#include "xbt/sysdep.h"
#include <simgrid/s4u.hpp>
#include <string>
{
for (int i = 0; i < number_of_tasks; i++) { /* For each task to be executed: */
/* - Select a @ref worker in a round-robin way */
- mailbox = simgrid::s4u::Mailbox::byName(std::string("worker-") + std::to_string(i % workers_count));
+ mailbox = simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(i % workers_count));
if (number_of_tasks < 10000 || i % 10000 == 0)
XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", (std::string("Task_") + std::to_string(i)).c_str(),
- number_of_tasks, mailbox->getName());
+ number_of_tasks, mailbox->get_cname());
/* - Send the computation amount to the @ref worker */
mailbox->put(new double(comp_size), 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));
+ mailbox = simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(i % workers_count));
mailbox->put(new double(-1.0), 0);
}
}
xbt_assert(args.size() == 2, "The worker expects a single argument from the XML deployment file: "
"its worker ID (its numerical rank)");
id = std::stol(args[1]);
- mailbox = simgrid::s4u::Mailbox::byName(std::string("worker-") + std::to_string(id));
+ mailbox = simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(id));
}
void operator()()
int main(int argc, char* argv[])
{
- simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv);
+ simgrid::s4u::Engine e(&argc, argv);
xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
"\tExample: %s msg_platform.xml msg_deployment.xml\n",
argv[0], argv[0]);
- e->loadPlatform(argv[1]); /** - Load the platform description */
- e->registerFunction<Master>("master");
- e->registerFunction<Worker>("worker"); /** - Register the function to be executed by the processes */
- e->loadDeployment(argv[2]); /** - Deploy the application */
+ e.load_platform(argv[1]); /* Load the platform description */
+ e.register_actor<Master>("master"); /* Register the class representing the actors */
+ e.register_actor<Worker>("worker");
+ e.load_deployment(argv[2]); /* Deploy the application */
- e->run(); /** - Run the simulation */
+ e.run(); /** - Run the simulation */
- XBT_INFO("Simulation time %g", e->getClock());
+ XBT_INFO("Simulation time %g", e.get_clock());
- delete e;
return 0;
}