-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2021. 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. */
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"
" 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);
- exit(1);
}
static void sender(std::vector<std::string> args)
XBT_INFO("Sender spec: %s", args[0].c_str());
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::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(mboxName->c_str());
+ auto* mboxName = new std::string("Test #" + std::to_string(test));
+ auto* mbox = simgrid::s4u::Mailbox::by_name(*mboxName);
switch (args[0][test - 1]) {
case 'r':
XBT_INFO("Test %u: r (regular send)", test);
- mbox->put((void*)mboxName, 42.0);
+ mbox->put(mboxName, 42.0);
break;
case 'R':
XBT_INFO("Test %u: R (sleep + regular send)", test);
simgrid::s4u::this_actor::sleep_for(0.5);
- mbox->put((void*)mboxName, 42.0);
+ mbox->put(mboxName, 42.0);
break;
case 'i':
XBT_INFO("Test %u: i (asynchronous isend)", test);
- mbox->put_async((void*)mboxName, 42.0)->wait();
+ mbox->put_async(mboxName, 42.0)->wait();
break;
case 'I':
XBT_INFO("Test %u: I (sleep + isend)", test);
simgrid::s4u::this_actor::sleep_for(0.5);
- mbox->put_async((void*)mboxName, 42.0)->wait();
+ mbox->put_async(mboxName, 42.0)->wait();
break;
case 'd':
XBT_INFO("Test %u: d (detached send)", test);
- mbox->put_init((void*)mboxName, 42.0)->detach();
+ mbox->put_init(mboxName, 42.0)->detach();
break;
case 'D':
XBT_INFO("Test %u: D (sleep + detached send)", test);
simgrid::s4u::this_actor::sleep_for(0.5);
- mbox->put_init((void*)mboxName, 42.0)->detach();
+ mbox->put_init(mboxName, 42.0)->detach();
break;
default:
xbt_die("Unknown sender spec for test %u: '%c'", test, args[0][test - 1]);
XBT_INFO("Receiver spec: %s", args[0].c_str());
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::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(mboxName.c_str());
- void* received = nullptr;
+ std::string mboxName = "Test #" + std::to_string(test);
+ simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(mboxName);
+ std::string* received = nullptr;
switch (args[0][test - 1]) {
case 'r':
XBT_INFO("Test %u: r (regular receive)", test);
- received = mbox->get();
+ received = mbox->get<std::string>();
break;
case 'R':
XBT_INFO("Test %u: R (sleep + regular receive)", test);
simgrid::s4u::this_actor::sleep_for(0.5);
- received = mbox->get();
+ received = mbox->get<std::string>();
break;
case 'i':
XBT_INFO("Test %u: i (asynchronous irecv)", test);
- mbox->get_async(&received)->wait();
+ mbox->get_async<std::string>(&received)->wait();
break;
case 'I':
XBT_INFO("Test %u: I (sleep + asynchronous irecv)", test);
simgrid::s4u::this_actor::sleep_for(0.5);
- mbox->get_async(&received)->wait();
+ mbox->get_async<std::string>(&received)->wait();
break;
case 'p':
XBT_INFO("Test %u: p (regular receive on permanent mailbox)", test);
mbox->set_receiver(simgrid::s4u::Actor::self());
- received = mbox->get();
+ received = mbox->get<std::string>();
break;
case 'P':
XBT_INFO("Test %u: P (sleep + regular receive on permanent mailbox)", test);
simgrid::s4u::this_actor::sleep_for(0.5);
mbox->set_receiver(simgrid::s4u::Actor::self());
- received = mbox->get();
+ received = mbox->get<std::string>();
break;
case 'j':
XBT_INFO("Test %u: j (irecv on permanent mailbox)", test);
mbox->set_receiver(simgrid::s4u::Actor::self());
- mbox->get_async(&received)->wait();
+ mbox->get_async<std::string>(&received)->wait();
break;
case 'J':
XBT_INFO("Test %u: J (sleep + irecv on permanent mailbox)", test);
simgrid::s4u::this_actor::sleep_for(0.5);
mbox->set_receiver(simgrid::s4u::Actor::self());
- mbox->get_async(&received)->wait();
+ mbox->get_async<std::string>(&received)->wait();
break;
default:
xbt_die("Unknown receiver spec for test %u: '%c'", test, args[0][test - 1]);
}
- std::string* receivedStr = static_cast<std::string*>(received);
- xbt_assert(*receivedStr == mboxName);
- delete receivedStr;
+ xbt_assert(*received == mboxName);
+ delete received;
XBT_INFO("Test %u OK", test);
}
simgrid::s4u::this_actor::sleep_for(0.5);
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());
+ return 1;
+ }
e.load_platform(argv[1]);
if (argc >= 3) {
argSend.clear();
- argSend.push_back(argv[2]);
+ argSend.emplace_back(argv[2]);
}
if (argc >= 4) {
argRecv.clear();
- argRecv.push_back(argv[3]);
+ argRecv.emplace_back(argv[3]);
}
xbt_assert(argSend.front().size() == argRecv.front().size(), "Sender and receiver spec must be of the same size");
simgrid::s4u::Actor::create("recver", hosts[1], receiver, argRecv);
e.run();
- XBT_INFO("Simulation time %g", e.get_clock());
+ XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
return 0;
}
