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
MailboxPtr looks like a smart pointer, but it's not. Kill it.
[simgrid.git]
/
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
c320b67
..
a91f203
100644
(file)
--- a/
examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp
+++ b/
examples/s4u/app-masterworkers/s4u-app-masterworkers-class.cpp
@@
-15,7
+15,7
@@
class Master {
long tasks_count = 0;
double compute_cost = 0;
double communicate_cost = 0;
long tasks_count = 0;
double compute_cost = 0;
double communicate_cost = 0;
- std::vector<simgrid::s4u::Mailbox
Ptr
> workers;
+ std::vector<simgrid::s4u::Mailbox
*
> workers;
public:
explicit Master(std::vector<std::string> args)
public:
explicit Master(std::vector<std::string> args)
@@
-35,7
+35,7
@@
public:
{
for (int i = 0; i < tasks_count; i++) { /* For each task to be executed: */
/* - Select a worker in a round-robin way */
{
for (int i = 0; i < tasks_count; i++) { /* For each task to be executed: */
/* - Select a worker in a round-robin way */
- simgrid::s4u::Mailbox
Ptr
mailbox = workers[i % workers.size()];
+ simgrid::s4u::Mailbox
*
mailbox = workers[i % workers.size()];
/* - Send the computation amount to the worker */
if (tasks_count < 10000 || (tasks_count < 100000 && i % 10000 == 0) || i % 100000 == 0)
/* - Send the computation amount to the worker */
if (tasks_count < 10000 || (tasks_count < 100000 && i % 10000 == 0) || i % 100000 == 0)
@@
-46,14
+46,14
@@
public:
XBT_INFO("All tasks have been dispatched. Request all workers to stop.");
for (unsigned int i = 0; i < workers.size(); i++) {
/* The workers stop when receiving a negative compute_cost */
XBT_INFO("All tasks have been dispatched. Request all workers to stop.");
for (unsigned int i = 0; i < workers.size(); i++) {
/* The workers stop when receiving a negative compute_cost */
- simgrid::s4u::Mailbox
Ptr
mailbox = workers[i % workers.size()];
+ simgrid::s4u::Mailbox
*
mailbox = workers[i % workers.size()];
mailbox->put(new double(-1.0), 0);
}
}
};
class Worker {
mailbox->put(new double(-1.0), 0);
}
}
};
class Worker {
- simgrid::s4u::Mailbox
Ptr
mailbox = nullptr;
+ simgrid::s4u::Mailbox
*
mailbox = nullptr;
public:
explicit Worker(std::vector<std::string> args)
public:
explicit Worker(std::vector<std::string> args)