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
Engine should be destroyed through RAII here (fix invalid free).
[simgrid.git]
/
teshsuite
/
s4u
/
comm-pt2pt
/
comm-pt2pt.cpp
diff --git
a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
index
76b4fef
..
07838b5
100644
(file)
--- a/
teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
+++ b/
teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
9
. 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. */
/* 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. */
@@
-18,7
+18,7
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example")
static void usage(const char* binaryName, const char* defaultSend, const char* defaultRecv)
{
static void usage(const char* binaryName, const char* defaultSend, const char* defaultRecv)
{
- std::fprintf(stderr, "Usage: %s examples/platforms/cluster.xml <send_spec> <recv_spec>\n"
+ std::fprintf(stderr, "Usage: %s examples/platforms/cluster
_backbone
.xml <send_spec> <recv_spec>\n"
"where spec is a list of letters giving the kind of tests you want to see.\n"
"Existing sender spec:\n"
" r regular send\n"
"where spec is a list of letters giving the kind of tests you want to see.\n"
"Existing sender spec:\n"
" r regular send\n"
@@
-37,10
+37,9
@@
static void usage(const char* binaryName, const char* defaultSend, const char* d
" j irecv on permanent mailbox (after a little delay)\n"
" J irecv on permanent mailbox (after a little delay)\n"
"\n"
" j irecv on permanent mailbox (after a little delay)\n"
" J irecv on permanent mailbox (after a little delay)\n"
"\n"
- "Example 1: %s examples/platforms/cluster.xml rRiIdD rrrrrr # testing all send functions\n"
+ "Example 1: %s examples/platforms/cluster
_backbone
.xml rRiIdD rrrrrr # testing all send functions\n"
"Default specs: %s %s (all possible pairs)\n",
binaryName, binaryName, defaultSend, defaultRecv);
"Default specs: %s %s (all possible pairs)\n",
binaryName, binaryName, defaultSend, defaultRecv);
- exit(1);
}
static void sender(std::vector<std::string> args)
}
static void sender(std::vector<std::string> args)
@@
-49,7
+48,7
@@
static void sender(std::vector<std::string> args)
for (unsigned int test = 1; test <= args[0].size(); test++) {
simgrid::s4u::this_actor::sleep_until(test * 5 - 5);
std::string* mboxName = new std::string("Test #" + std::to_string(test));
for (unsigned int test = 1; test <= args[0].size(); test++) {
simgrid::s4u::this_actor::sleep_until(test * 5 - 5);
std::string* mboxName = new std::string("Test #" + std::to_string(test));
- simgrid::s4u::Mailbox
Ptr mbox = simgrid::s4u::Mailbox::by_name(mboxName->c_str()
);
+ simgrid::s4u::Mailbox
* mbox = simgrid::s4u::Mailbox::by_name(*mboxName
);
switch (args[0][test - 1]) {
case 'r':
switch (args[0][test - 1]) {
case 'r':
@@
-96,7
+95,7
@@
static void receiver(std::vector<std::string> args)
for (unsigned int test = 1; test <= args[0].size(); test++) {
simgrid::s4u::this_actor::sleep_until(test * 5 - 5);
std::string mboxName = "Test #" + std::to_string(test);
for (unsigned int test = 1; test <= args[0].size(); test++) {
simgrid::s4u::this_actor::sleep_until(test * 5 - 5);
std::string mboxName = "Test #" + std::to_string(test);
- simgrid::s4u::Mailbox
Ptr mbox = simgrid::s4u::Mailbox::by_name(mboxName.c_str()
);
+ simgrid::s4u::Mailbox
* mbox = simgrid::s4u::Mailbox::by_name(mboxName
);
void* received = nullptr;
switch (args[0][test - 1]) {
void* received = nullptr;
switch (args[0][test - 1]) {
@@
-165,8
+164,10
@@
int main(int argc, char* argv[])
std::vector<std::string> argRecv{specRecv.c_str()};
simgrid::s4u::Engine e(&argc, argv);
std::vector<std::string> argRecv{specRecv.c_str()};
simgrid::s4u::Engine e(&argc, argv);
- if (argc < 2)
+ if (argc < 2)
{
usage(argv[0], specSend.c_str(), specRecv.c_str());
usage(argv[0], specSend.c_str(), specRecv.c_str());
+ return 1;
+ }
e.load_platform(argv[1]);
e.load_platform(argv[1]);