X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92ce16e6a3f85ac5c7efdbed957a8a9a79590eac..40ee10e13b61bfb28374d96ade010a262b5abd44:/examples/cpp/app-chainsend/s4u-app-chainsend.cpp diff --git a/examples/cpp/app-chainsend/s4u-app-chainsend.cpp b/examples/cpp/app-chainsend/s4u-app-chainsend.cpp index 0cd70a8b3a..bd7e25d56a 100644 --- a/examples/cpp/app-chainsend/s4u-app-chainsend.cpp +++ b/examples/cpp/app-chainsend/s4u-app-chainsend.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. 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. */ @@ -11,13 +11,14 @@ constexpr unsigned MESSAGE_BUILD_CHAIN_SIZE = 40; constexpr unsigned MESSAGE_SEND_DATA_HEADER_SIZE = 1; XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_chainsend, "Messages specific for chainsend"); +namespace sg4 = simgrid::s4u; class ChainMessage { public: - simgrid::s4u::Mailbox* prev_ = nullptr; - simgrid::s4u::Mailbox* next_ = nullptr; + sg4::Mailbox* prev_ = nullptr; + sg4::Mailbox* next_ = nullptr; unsigned int num_pieces = 0; - explicit ChainMessage(simgrid::s4u::Mailbox* prev, simgrid::s4u::Mailbox* next, const unsigned int num_pieces) + explicit ChainMessage(sg4::Mailbox* prev, sg4::Mailbox* next, const unsigned int num_pieces) : prev_(prev), next_(next), num_pieces(num_pieces) { } @@ -30,17 +31,17 @@ public: class Peer { public: - simgrid::s4u::Mailbox* prev = nullptr; - simgrid::s4u::Mailbox* next = nullptr; - simgrid::s4u::Mailbox* me = nullptr; - std::vector pending_recvs; - std::vector pending_sends; + sg4::Mailbox* prev = nullptr; + sg4::Mailbox* next = nullptr; + sg4::Mailbox* me = nullptr; + sg4::ActivitySet pending_recvs; + sg4::ActivitySet pending_sends; unsigned long long received_bytes = 0; unsigned int received_pieces = 0; unsigned int total_pieces = 0; - Peer() { me = simgrid::s4u::Mailbox::by_name(simgrid::s4u::Host::current()->get_cname()); } + Peer() { me = sg4::Mailbox::by_name(sg4::Host::current()->get_cname()); } void joinChain() { @@ -58,18 +59,17 @@ public: bool done = false; while (not done) { - simgrid::s4u::CommPtr comm = me->get_async(&received); - pending_recvs.push_back(comm); + sg4::CommPtr comm = me->get_async(&received); + pending_recvs.push(comm); - ssize_t idx = simgrid::s4u::Comm::wait_any(pending_recvs); - if (idx != -1) { - comm = pending_recvs.at(idx); + auto completed_one = pending_recvs.wait_any(); + if (completed_one != nullptr) { + comm = boost::dynamic_pointer_cast(completed_one); XBT_DEBUG("Peer %s got a 'SEND_DATA' message", me->get_cname()); - pending_recvs.erase(pending_recvs.begin() + idx); if (next != nullptr) { XBT_DEBUG("Sending (asynchronously) from %s to %s", me->get_cname(), next->get_cname()); - simgrid::s4u::CommPtr send = next->put_async(received, MESSAGE_SEND_DATA_HEADER_SIZE + PIECE_SIZE); - pending_sends.push_back(send); + sg4::CommPtr send = next->put_async(received, MESSAGE_SEND_DATA_HEADER_SIZE + PIECE_SIZE); + pending_sends.push(send); } else delete received; @@ -86,8 +86,8 @@ public: class Broadcaster { public: - simgrid::s4u::Mailbox* first = nullptr; - std::vector mailboxes; + sg4::Mailbox* first = nullptr; + std::vector mailboxes; unsigned int piece_count; void buildChain() @@ -97,11 +97,11 @@ public: first = mailboxes.front(); for (unsigned i = 0; i < mailboxes.size(); i++) { - simgrid::s4u::Mailbox* prev = i > 0 ? mailboxes[i - 1] : nullptr; - simgrid::s4u::Mailbox* next = i < mailboxes.size() - 1 ? mailboxes[i + 1] : nullptr; + sg4::Mailbox* prev = i > 0 ? mailboxes[i - 1] : nullptr; + sg4::Mailbox* next = i < mailboxes.size() - 1 ? mailboxes[i + 1] : nullptr; XBT_DEBUG("Building chain--broadcaster:\"%s\" dest:\"%s\" prev:\"%s\" next:\"%s\"", - simgrid::s4u::Host::current()->get_cname(), mailboxes[i]->get_cname(), - prev ? prev->get_cname() : nullptr, next ? next->get_cname() : nullptr); + sg4::Host::current()->get_cname(), mailboxes[i]->get_cname(), prev ? prev->get_cname() : nullptr, + next ? next->get_cname() : nullptr); /* Send message to current peer */ mailboxes[i]->put(new ChainMessage(prev, next, piece_count), MESSAGE_BUILD_CHAIN_SIZE); } @@ -109,22 +109,22 @@ public: void sendFile() { - std::vector pending_sends; + sg4::ActivitySet pending_sends; for (unsigned int current_piece = 0; current_piece < piece_count; current_piece++) { - XBT_DEBUG("Sending (send) piece %u from %s into mailbox %s", current_piece, - simgrid::s4u::Host::current()->get_cname(), first->get_cname()); - simgrid::s4u::CommPtr comm = first->put_async(new FilePiece(), MESSAGE_SEND_DATA_HEADER_SIZE + PIECE_SIZE); - pending_sends.push_back(comm); + XBT_DEBUG("Sending (send) piece %u from %s into mailbox %s", current_piece, sg4::Host::current()->get_cname(), + first->get_cname()); + sg4::CommPtr comm = first->put_async(new FilePiece(), MESSAGE_SEND_DATA_HEADER_SIZE + PIECE_SIZE); + pending_sends.push(comm); } - simgrid::s4u::Comm::wait_all(pending_sends); + pending_sends.wait_all(); } Broadcaster(int hostcount, unsigned int piece_count) : piece_count(piece_count) { for (int i = 1; i <= hostcount; i++) { - std::string name = std::string("node-") + std::to_string(i) + ".simgrid.org"; + std::string name = "node-" + std::to_string(i) + ".simgrid.org"; XBT_DEBUG("%s", name.c_str()); - mailboxes.push_back(simgrid::s4u::Mailbox::by_name(name)); + mailboxes.push_back(sg4::Mailbox::by_name(name)); } } }; @@ -135,12 +135,12 @@ static void peer() Peer p; - double start_time = simgrid::s4u::Engine::get_clock(); + double start_time = sg4::Engine::get_clock(); p.joinChain(); p.forwardFile(); - simgrid::s4u::Comm::wait_all(p.pending_sends); - double end_time = simgrid::s4u::Engine::get_clock(); + p.pending_sends.wait_all(); + double end_time = sg4::Engine::get_clock(); XBT_INFO("### %f %llu bytes (Avg %f MB/s); copy finished (simulated).", end_time - start_time, p.received_bytes, p.received_bytes / 1024.0 / 1024.0 / (end_time - start_time)); @@ -157,23 +157,23 @@ static void broadcaster(int hostcount, unsigned int piece_count) int main(int argc, char* argv[]) { - simgrid::s4u::Engine e(&argc, argv); + sg4::Engine e(&argc, argv); e.load_platform(argv[1]); - simgrid::s4u::Actor::create("broadcaster", e.host_by_name("node-0.simgrid.org"), broadcaster, 8, 256); + sg4::Actor::create("broadcaster", e.host_by_name("node-0.simgrid.org"), broadcaster, 8, 256); - simgrid::s4u::Actor::create("peer", e.host_by_name("node-1.simgrid.org"), peer); - simgrid::s4u::Actor::create("peer", e.host_by_name("node-2.simgrid.org"), peer); - simgrid::s4u::Actor::create("peer", e.host_by_name("node-3.simgrid.org"), peer); - simgrid::s4u::Actor::create("peer", e.host_by_name("node-4.simgrid.org"), peer); - simgrid::s4u::Actor::create("peer", e.host_by_name("node-5.simgrid.org"), peer); - simgrid::s4u::Actor::create("peer", e.host_by_name("node-6.simgrid.org"), peer); - simgrid::s4u::Actor::create("peer", e.host_by_name("node-7.simgrid.org"), peer); - simgrid::s4u::Actor::create("peer", e.host_by_name("node-8.simgrid.org"), peer); + sg4::Actor::create("peer", e.host_by_name("node-1.simgrid.org"), peer); + sg4::Actor::create("peer", e.host_by_name("node-2.simgrid.org"), peer); + sg4::Actor::create("peer", e.host_by_name("node-3.simgrid.org"), peer); + sg4::Actor::create("peer", e.host_by_name("node-4.simgrid.org"), peer); + sg4::Actor::create("peer", e.host_by_name("node-5.simgrid.org"), peer); + sg4::Actor::create("peer", e.host_by_name("node-6.simgrid.org"), peer); + sg4::Actor::create("peer", e.host_by_name("node-7.simgrid.org"), peer); + sg4::Actor::create("peer", e.host_by_name("node-8.simgrid.org"), peer); e.run(); - XBT_INFO("Total simulation time: %e", e.get_clock()); + XBT_INFO("Total simulation time: %e", sg4::Engine::get_clock()); return 0; }