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
Use Mailbox::get_unique<>(), and save a few delete.
[simgrid.git]
/
examples
/
s4u
/
mc-bugged1-liveness
/
s4u-mc-bugged1-liveness.cpp
diff --git
a/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
b/examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
index
f9bf0a1
..
c69d369
100644
(file)
--- a/
examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
+++ b/
examples/s4u/mc-bugged1-liveness/s4u-mc-bugged1-liveness.cpp
@@
-47,13
+47,12
@@
static void garbage_stack(void)
static void coordinator()
{
int CS_used = 0;
static void coordinator()
{
int CS_used = 0;
- const Message* m = nullptr;
std::queue<simgrid::s4u::Mailbox*> requests;
simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name("coordinator");
while (true) {
std::queue<simgrid::s4u::Mailbox*> requests;
simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name("coordinator");
while (true) {
-
m = mbox->get
<Message>();
+
auto m = mbox->get_unique
<Message>();
if (m->kind == Message::Kind::REQUEST) {
if (CS_used) {
XBT_INFO("CS already used. Queue the request.");
if (m->kind == Message::Kind::REQUEST) {
if (CS_used) {
XBT_INFO("CS already used. Queue the request.");
@@
-81,7
+80,6
@@
static void coordinator()
CS_used = 0;
}
}
CS_used = 0;
}
}
- delete m;
}
}
}
}
@@
-101,7
+99,7
@@
static void client(int id)
XBT_INFO("Propositions changed : r=1, cs=0");
}
XBT_INFO("Propositions changed : r=1, cs=0");
}
-
const auto* grant = my_mailbox->get
<Message>();
+
auto grant = my_mailbox->get_unique
<Message>();
if ((id == 1) && (grant->kind == Message::Kind::GRANT)) {
cs = 1;
if ((id == 1) && (grant->kind == Message::Kind::GRANT)) {
cs = 1;
@@
-109,8
+107,6
@@
static void client(int id)
XBT_INFO("Propositions changed : r=0, cs=1");
}
XBT_INFO("Propositions changed : r=0, cs=1");
}
- delete grant;
-
XBT_INFO("%d got the answer. Sleep a bit and release it", id);
simgrid::s4u::this_actor::sleep_for(1);
XBT_INFO("%d got the answer. Sleep a bit and release it", id);
simgrid::s4u::this_actor::sleep_for(1);