A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
cleanup: use actor::yield() instead of a compute(0)
[simgrid.git]
/
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
7265a80
..
68d0fa8
100644
(file)
--- a/
examples/s4u/app-masterworker/s4u-app-masterworker.cpp
+++ b/
examples/s4u/app-masterworker/s4u-app-masterworker.cpp
@@
-33,9
+33,9
@@
public:
{
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::by
N
ame(std::string("worker-") + std::to_string(i % workers_count));
+ mailbox = simgrid::s4u::Mailbox::by
_n
ame(std::string("worker-") + std::to_string(i % workers_count));
- if (number_of_tasks < 10000 ||
i % 1
0000 == 0)
+ if (number_of_tasks < 10000 ||
(number_of_tasks < 100000 && i % 10000 == 0) || i % 10
0000 == 0)
XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", (std::string("Task_") + std::to_string(i)).c_str(),
number_of_tasks, mailbox->get_cname());
@@
-46,7
+46,7
@@
public:
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::by
N
ame(std::string("worker-") + std::to_string(i % workers_count));
+ mailbox = simgrid::s4u::Mailbox::by
_n
ame(std::string("worker-") + std::to_string(i % workers_count));
mailbox->put(new double(-1.0), 0);
}
}
@@
-62,7
+62,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 = std::stol(args[1]);
- mailbox = simgrid::s4u::Mailbox::by
N
ame(std::string("worker-") + std::to_string(id));
+ mailbox = simgrid::s4u::Mailbox::by
_n
ame(std::string("worker-") + std::to_string(id));
}
void operator()()
@@
-89,14
+89,14
@@
int main(int argc, char* argv[])
"\tExample: %s msg_platform.xml msg_deployment.xml\n",
argv[0], argv[0]);
- e.load
Platform(argv[1]); /** -
Load the platform description */
- e.register
Function<Master>("master");
- e.register
Function<Worker>("worker"); /** - Register the function to be executed by the processes */
- e.load
Deployment(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 */
- XBT_INFO("Simulation time %g", e.get
C
lock());
+ XBT_INFO("Simulation time %g", e.get
_c
lock());
return 0;
}