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
start snake_casing s4u::Actor
[simgrid.git]
/
teshsuite
/
s4u
/
listen_async
/
listen_async.cpp
diff --git
a/teshsuite/s4u/listen_async/listen_async.cpp
b/teshsuite/s4u/listen_async/listen_async.cpp
index
c1a0364
..
53dde41
100644
(file)
--- a/
teshsuite/s4u/listen_async/listen_async.cpp
+++ b/
teshsuite/s4u/listen_async/listen_async.cpp
@@
-17,41
+17,40
@@
static void server()
{
simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName("mailbox");
- simgrid::s4u::CommPtr sendComm =
simgrid::s4u::this_actor::isend(mailbox, xbt_strdup
("Some data"), 0);
+ simgrid::s4u::CommPtr sendComm =
mailbox->put_async(new std::string
("Some data"), 0);
xbt_assert(mailbox->listen()); // True (1)
XBT_INFO("Task listen works on regular mailboxes");
-
char* res = static_cast<char*>(simgrid::s4u::this_actor::recv(mailbox
));
+
std::string* res = static_cast<std::string*>(mailbox->get(
));
- xbt_assert(
not strcmp("Some data", res), "Data received: %s", res
);
+ xbt_assert(
*res == "Some data", "Data received: %s", res->c_str()
);
XBT_INFO("Data successfully received from regular mailbox");
-
xbt_free(res)
;
+
delete res
;
sendComm->wait();
simgrid::s4u::MailboxPtr mailbox2 = simgrid::s4u::Mailbox::byName("mailbox2");
mailbox2->setReceiver(simgrid::s4u::Actor::self());
-
simgrid::s4u::this_actor::dsend(mailbox2, xbt_strdup("More data"), 0
);
+
mailbox2->put_init(new std::string("More data"), 0)->detach(
);
xbt_assert(mailbox2->listen()); // used to break.
XBT_INFO("Task listen works on asynchronous mailboxes");
- res = static_cast<
char*>(simgrid::s4u::this_actor::recv(mailbox2
));
- xbt_assert(
not strcmp("More data", res)
);
-
xbt_free(res)
;
+ res = static_cast<
std::string*>(mailbox2->get(
));
+ xbt_assert(
*res == "More data"
);
+
delete res
;
XBT_INFO("Data successfully received from asynchronous mailbox");
}
int main(int argc, char* argv[])
{
- simgrid::s4u::Engine
* e = new simgrid::s4u::Engin
e(&argc, argv);
- e
->
loadPlatform(argv[1]);
+ simgrid::s4u::Engine
e(&argc, argv);
+ e
.
loadPlatform(argv[1]);
- simgrid::s4u::Actor::create
Actor
("test", simgrid::s4u::Host::by_name("Tremblay"), server);
+ simgrid::s4u::Actor::create("test", simgrid::s4u::Host::by_name("Tremblay"), server);
- e
->
run();
+ e
.
run();
- delete e;
return 0;
}