X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a64ca4c11a1eb7ba2ecd102f877ac571486a034..4c753f8d4cabd4104f3f7109823f16be2ebdcce3:/examples/cpp/comm-waitall/s4u-comm-waitall.cpp diff --git a/examples/cpp/comm-waitall/s4u-comm-waitall.cpp b/examples/cpp/comm-waitall/s4u-comm-waitall.cpp index 79e78acbe7..19431a0d7d 100644 --- a/examples/cpp/comm-waitall/s4u-comm-waitall.cpp +++ b/examples/cpp/comm-waitall/s4u-comm-waitall.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. 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. */ @@ -20,94 +20,74 @@ namespace sg4 = simgrid::s4u; XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_async_waitall, "Messages specific for this s4u example"); -class Sender { - long messages_count; /* - number of messages */ - long receivers_count; /* - number of receivers */ - long msg_size; /* - message size in bytes */ - -public: - explicit Sender(std::vector args) - { - xbt_assert(args.size() == 4, "Expecting 3 parameters from the XML deployment file but got %zu", args.size()); - messages_count = std::stol(args[1]); - msg_size = std::stol(args[2]); - receivers_count = std::stol(args[3]); +static void sender(unsigned int messages_count, unsigned int receivers_count, long msg_size) +{ + if (messages_count == 0 || receivers_count == 0) { + XBT_WARN("Sender has nothing to do. Bail out!"); + return; } - void operator()() const - { - // sphinx-doc: init-begin (this line helps the doc to build; ignore it) - /* Vector in which we store all ongoing communications */ - std::vector pending_comms; - - /* Make a vector of the mailboxes to use */ - std::vector mboxes; - for (int i = 0; i < receivers_count; i++) - mboxes.push_back(sg4::Mailbox::by_name(std::string("receiver-") + std::to_string(i))); - // sphinx-doc: init-end - - /* Start dispatching all messages to receivers, in a round robin fashion */ - for (int i = 0; i < messages_count; i++) { - std::string msg_content = std::string("Message ") + std::to_string(i); - // Copy the data we send: the 'msg_content' variable is not a stable storage location. - // It will be destroyed when this actor leaves the loop, ie before the receiver gets it - auto* payload = new std::string(msg_content); - - XBT_INFO("Send '%s' to '%s'", msg_content.c_str(), mboxes[i % receivers_count]->get_cname()); - - /* Create a communication representing the ongoing communication, and store it in pending_comms */ - sg4::CommPtr comm = mboxes[i % receivers_count]->put_async(payload, msg_size); - pending_comms.push_back(comm); - } - - /* Start sending messages to let the workers know that they should stop */ // sphinx-doc: put-begin - for (int i = 0; i < receivers_count; i++) { - XBT_INFO("Send 'finalize' to 'receiver-%d'", i); - sg4::CommPtr comm = mboxes[i]->put_async(new std::string("finalize"), 0); - pending_comms.push_back(comm); - } - XBT_INFO("Done dispatching all messages"); - - /* Now that all message exchanges were initiated, wait for their completion in one single call */ - sg4::Comm::wait_all(&pending_comms); - // sphinx-doc: put-end - - XBT_INFO("Goodbye now!"); + // sphinx-doc: init-begin (this line helps the doc to build; ignore it) + /* Vector in which we store all ongoing communications */ + std::vector pending_comms; + + /* Make a vector of the mailboxes to use */ + std::vector mboxes; + for (unsigned int i = 0; i < receivers_count; i++) + mboxes.push_back(sg4::Mailbox::by_name("receiver-" + std::to_string(i))); + // sphinx-doc: init-end + + /* Start dispatching all messages to receivers, in a round robin fashion */ + for (unsigned int i = 0; i < messages_count; i++) { + std::string msg_content = "Message " + std::to_string(i); + // Copy the data we send: the 'msg_content' variable is not a stable storage location. + // It will be destroyed when this actor leaves the loop, ie before the receiver gets it + auto* payload = new std::string(msg_content); + + XBT_INFO("Send '%s' to '%s'", msg_content.c_str(), mboxes[i % receivers_count]->get_cname()); + + /* Create a communication representing the ongoing communication, and store it in pending_comms */ + sg4::CommPtr comm = mboxes[i % receivers_count]->put_async(payload, msg_size); + pending_comms.push_back(comm); } -}; -/* Receiver actor expects 1 argument: its ID */ -class Receiver { - sg4::Mailbox* mbox; - -public: - explicit Receiver(std::vector args) - { - xbt_assert(args.size() == 2, "Expecting one parameter from the XML deployment file but got %zu", args.size()); - std::string mboxName = std::string("receiver-") + args[1]; - mbox = sg4::Mailbox::by_name(mboxName); + /* Start sending messages to let the workers know that they should stop */ // sphinx-doc: put-begin + for (unsigned int i = 0; i < receivers_count; i++) { + XBT_INFO("Send 'finalize' to 'receiver-%u'", i); + sg4::CommPtr comm = mboxes[i]->put_async(new std::string("finalize"), 0); + pending_comms.push_back(comm); } - void operator()() - { - XBT_INFO("Wait for my first message"); - for (bool cont = true; cont;) { - auto received = mbox->get_unique(); - XBT_INFO("I got a '%s'.", received->c_str()); - cont = (*received != "finalize"); // If it's a finalize message, we're done - // Receiving the message was all we were supposed to do - } + XBT_INFO("Done dispatching all messages"); + + /* Now that all message exchanges were initiated, wait for their completion in one single call */ + sg4::Comm::wait_all(pending_comms); + // sphinx-doc: put-end + + XBT_INFO("Goodbye now!"); +} + +/* Receiver actor expects 1 argument: its ID */ +static void receiver(int id) +{ + sg4::Mailbox* mbox = sg4::Mailbox::by_name("receiver-" + std::to_string(id)); + XBT_INFO("Wait for my first message"); + for (bool cont = true; cont;) { + auto received = mbox->get_unique(); + XBT_INFO("I got a '%s'.", received->c_str()); + cont = (*received != "finalize"); // If it's a finalize message, we're done + // Receiving the message was all we were supposed to do } -}; +} int main(int argc, char* argv[]) { - xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n", argv[0]); - sg4::Engine e(&argc, argv); - e.register_actor("sender"); - e.register_actor("receiver"); e.load_platform(argv[1]); - e.load_deployment(argv[2]); + + sg4::Actor::create("sender", e.host_by_name("Tremblay"), sender, 5, 2, 1e6); + sg4::Actor::create("receiver", e.host_by_name("Ruby"), receiver, 0); + sg4::Actor::create("receiver", e.host_by_name("Perl"), receiver, 1); + e.run(); return 0;