X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e16ebb1333db2cee332bbfed4098df88777cec22..3721210a272c9593a3bccd52f63178403b5729e3:/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 bad54f17a8..ab82939ac0 100644 --- a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp +++ b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -50,43 +50,43 @@ static void sender(std::vector args) XBT_INFO("Sender spec: %s", args[0].c_str()); for (unsigned int test = 1; test <= args[0].size(); test++) { this_actor::sleep_until(test * 5 - 5); - char* mboxName = bprintf("Test #%u", test); - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName); + std::string* mboxName = new std::string("Test #" + std::to_string(test)); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName->c_str()); switch (args[0][test - 1]) { case 'r': - XBT_INFO("Test %d: r (regular send)", test); - simgrid::s4u::this_actor::send(mbox, (void*)mboxName, 42.0); + XBT_INFO("Test %u: r (regular send)", test); + mbox->put((void*)mboxName, 42.0); break; case 'R': - XBT_INFO("Test %d: R (sleep + regular send)", test); + XBT_INFO("Test %u: R (sleep + regular send)", test); simgrid::s4u::this_actor::sleep_for(0.5); - simgrid::s4u::this_actor::send(mbox, (void*)mboxName, 42.0); + mbox->put((void*)mboxName, 42.0); break; case 'i': - XBT_INFO("Test %d: i (asynchronous isend)", test); - simgrid::s4u::this_actor::isend(mbox, (void*)mboxName, 42.0)->wait(); + XBT_INFO("Test %u: i (asynchronous isend)", test); + mbox->put_async((void*)mboxName, 42.0)->wait(); break; case 'I': - XBT_INFO("Test %d: I (sleep + isend)", test); + XBT_INFO("Test %u: I (sleep + isend)", test); simgrid::s4u::this_actor::sleep_for(0.5); - simgrid::s4u::this_actor::isend(mbox, (void*)mboxName, 42.0)->wait(); + mbox->put_async((void*)mboxName, 42.0)->wait(); break; case 'd': - XBT_INFO("Test %d: d (detached send)", test); - simgrid::s4u::this_actor::isend(mbox, (void*)mboxName, 42.0)->detach(); + XBT_INFO("Test %u: d (detached send)", test); + mbox->put_init((void*)mboxName, 42.0)->detach(); break; case 'D': - XBT_INFO("Test %d: D (sleep + detached send)", test); + XBT_INFO("Test %u: D (sleep + detached send)", test); simgrid::s4u::this_actor::sleep_for(0.5); - simgrid::s4u::this_actor::isend(mbox, (void*)mboxName, 42.0)->detach(); + mbox->put_init((void*)mboxName, 42.0)->detach(); break; default: - xbt_die("Unknown sender spec for test %d: '%c'", test, args[0][test - 1]); + xbt_die("Unknown sender spec for test %u: '%c'", test, args[0][test - 1]); } - XBT_INFO("Test %d OK", test); + XBT_INFO("Test %u OK", test); } simgrid::s4u::this_actor::sleep_for(0.5); // FIXME: we should test what happens when the process ends before the end of remote comm instead of hiding it @@ -97,60 +97,59 @@ static void receiver(std::vector args) XBT_INFO("Receiver spec: %s", args[0].c_str()); for (unsigned int test = 1; test <= args[0].size(); test++) { this_actor::sleep_until(test * 5 - 5); - char* mboxName = bprintf("Test #%u", test); - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName); + std::string mboxName = "Test #" + std::to_string(test); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName.c_str()); void* received = nullptr; switch (args[0][test - 1]) { case 'r': - XBT_INFO("Test %d: r (regular receive)", test); - received = simgrid::s4u::this_actor::recv(mbox); + XBT_INFO("Test %u: r (regular receive)", test); + received = mbox->get(); break; case 'R': - XBT_INFO("Test %d: R (sleep + regular receive)", test); + XBT_INFO("Test %u: R (sleep + regular receive)", test); simgrid::s4u::this_actor::sleep_for(0.5); - received = simgrid::s4u::this_actor::recv(mbox); + received = mbox->get(); break; case 'i': - XBT_INFO("Test %d: i (asynchronous irecv)", test); - simgrid::s4u::this_actor::irecv(mbox, &received)->wait(); + XBT_INFO("Test %u: i (asynchronous irecv)", test); + mbox->get_async(&received)->wait(); break; case 'I': - XBT_INFO("Test %d: I (sleep + asynchronous irecv)", test); + XBT_INFO("Test %u: I (sleep + asynchronous irecv)", test); simgrid::s4u::this_actor::sleep_for(0.5); - simgrid::s4u::this_actor::irecv(mbox, &received)->wait(); + mbox->get_async(&received)->wait(); break; case 'p': - XBT_INFO("Test %d: p (regular receive on permanent mailbox)", test); + XBT_INFO("Test %u: p (regular receive on permanent mailbox)", test); mbox->setReceiver(Actor::self()); - received = simgrid::s4u::this_actor::recv(mbox); + received = mbox->get(); break; case 'P': - XBT_INFO("Test %d: P (sleep + regular receive on permanent mailbox)", test); + XBT_INFO("Test %u: P (sleep + regular receive on permanent mailbox)", test); simgrid::s4u::this_actor::sleep_for(0.5); mbox->setReceiver(Actor::self()); - received = simgrid::s4u::this_actor::recv(mbox); + received = mbox->get(); break; case 'j': - XBT_INFO("Test %d: j (irecv on permanent mailbox)", test); + XBT_INFO("Test %u: j (irecv on permanent mailbox)", test); mbox->setReceiver(Actor::self()); - simgrid::s4u::this_actor::irecv(mbox, &received)->wait(); + mbox->get_async(&received)->wait(); break; case 'J': - XBT_INFO("Test %d: J (sleep + irecv on permanent mailbox)", test); + XBT_INFO("Test %u: J (sleep + irecv on permanent mailbox)", test); simgrid::s4u::this_actor::sleep_for(0.5); mbox->setReceiver(Actor::self()); - simgrid::s4u::this_actor::irecv(mbox, &received)->wait(); + mbox->get_async(&received)->wait(); break; default: - xbt_die("Unknown receiver spec for test %d: '%c'", test, args[0][test - 1]); + xbt_die("Unknown receiver spec for test %u: '%c'", test, args[0][test - 1]); } - - xbt_assert(strcmp(static_cast(received), mboxName) == 0); - xbt_free(received); - xbt_free(mboxName); - XBT_INFO("Test %d OK", test); + std::string* receivedStr = static_cast(received); + xbt_assert(*receivedStr == mboxName); + delete receivedStr; + XBT_INFO("Test %u OK", test); } simgrid::s4u::this_actor::sleep_for(0.5); } @@ -167,11 +166,11 @@ int main(int argc, char* argv[]) std::vector argSend{specSend.c_str()}; std::vector argRecv{specRecv.c_str()}; - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); + simgrid::s4u::Engine e(&argc, argv); if (argc < 2) usage(argv[0], specSend.c_str(), specRecv.c_str()); - e->loadPlatform(argv[1]); + e.load_platform(argv[1]); if (argc >= 3) { argSend.clear(); @@ -183,14 +182,13 @@ int main(int argc, char* argv[]) } xbt_assert(argSend.front().size() == argRecv.front().size(), "Sender and receiver spec must be of the same size"); - simgrid::s4u::Host** hosts = sg_host_list(); - simgrid::s4u::Actor::createActor("sender", hosts[0], sender, argSend); - simgrid::s4u::Actor::createActor("recver", hosts[1], receiver, argRecv); - xbt_free(hosts); + std::vector hosts = e.get_all_hosts(); + + simgrid::s4u::Actor::create("sender", hosts[0], sender, argSend); + simgrid::s4u::Actor::create("recver", hosts[1], receiver, argRecv); - e->run(); - XBT_INFO("Simulation time %g", e->getClock()); + e.run(); + XBT_INFO("Simulation time %g", e.getClock()); - delete e; return 0; }