X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/649bd7b5c26e344eee9bd9a70625e644d302ba3d..aa67057cbae409c22a57e9dcf4d82a2859e97f45:/examples/s4u/async-waitall/s4u-async-waitall.cpp diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp index 332ce0ab6d..6ac940dcf0 100644 --- a/examples/s4u/async-waitall/s4u-async-waitall.cpp +++ b/examples/s4u/async-waitall/s4u-async-waitall.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. */ @@ -13,105 +13,98 @@ */ #include "simgrid/s4u.hpp" -#include "xbt/str.h" #include #include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this s4u example"); -class sender { - long messages_count; - long receivers_count; - double msg_size; /* in bytes */ +class Sender { + long messages_count; /* - number of tasks */ + long receivers_count; /* - number of receivers */ + double msg_size; /* - communication cost in bytes */ public: - explicit sender(std::vector args) -{ - xbt_assert(args.size() == 4, "This function expects 4 parameters from the XML deployment file but got %zu", - args.size()); - messages_count = std::stol(args[1]); - msg_size = std::stod(args[2]); - receivers_count = std::stol(args[3]); + 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::stod(args[2]); + receivers_count = std::stol(args[3]); + } + void operator()() + { + std::vector pending_comms; + + /* Start dispatching all messages to receivers, in a round robin fashion */ + for (int i = 0; i < messages_count; i++) { + + std::string mboxName = std::string("receiver-") + std::to_string(i % receivers_count); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(mboxName); + std::string msgName = std::string("Message ") + std::to_string(i); + std::string* payload = new std::string(msgName); // copy the data we send: + // 'msgName' is not a stable storage location + XBT_INFO("Send '%s' to '%s'", msgName.c_str(), mboxName.c_str()); + /* Create a communication representing the ongoing communication */ + simgrid::s4u::CommPtr comm = mbox->put_async(payload, msg_size); + /* Add this comm to the vector of all known comms */ + pending_comms.push_back(comm); + } -} -void operator()() -{ - std::vector* pending_comms = new std::vector(); + /* Start sending messages to let the workers know that they should stop */ + for (int i = 0; i < receivers_count; i++) { + std::string mboxName = std::string("receiver-") + std::to_string(i % receivers_count); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(mboxName); + std::string* payload = new std::string("finalize"); // Make a copy of the data we will send - /* Start dispatching all messages to receivers, in a round robin fashion */ - for (int i = 0; i < messages_count; i++) { + simgrid::s4u::CommPtr comm = mbox->put_async(payload, 0); + pending_comms.push_back(comm); + XBT_INFO("Send 'finalize' to 'receiver-%ld'", i % receivers_count); + } + XBT_INFO("Done dispatching all messages"); - std::string mboxName = std::string("receiver-") + std::to_string(i % receivers_count); - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName); - std::string msgName = std::string("Message ") + std::to_string(i); - char* payload = xbt_strdup(msgName.c_str()); // copy the data we send: 'msgName' is not a stable storage location + /* Now that all message exchanges were initiated, wait for their completion in one single call */ + simgrid::s4u::Comm::wait_all(&pending_comms); - XBT_INFO("Send '%s' to '%s'", msgName.c_str(), mboxName.c_str()); - /* Create a communication representing the ongoing communication */ - simgrid::s4u::CommPtr comm = mbox->put_async((void*)payload, msg_size); - /* Add this comm to the vector of all known comms */ - pending_comms->push_back(comm); + XBT_INFO("Goodbye now!"); } - /* Start sending messages to let the workers know that they should stop */ - for (int i = 0; i < receivers_count; i++) { - std::string mbox_name = std::string("receiver-") + std::to_string(i % receivers_count); - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mbox_name); - char* payload = xbt_strdup("finalize"); // Make a copy of the data we will send - - simgrid::s4u::CommPtr comm = mbox->put_async((void*)payload, 0); - pending_comms->push_back(comm); - XBT_INFO("Send 'finalize' to 'receiver-%ld'", i % receivers_count); - } - XBT_INFO("Done dispatching all messages"); - - /* Now that all message exchanges were initiated, wait for their completion in one single call */ - simgrid::s4u::Comm::wait_all(pending_comms); - - XBT_INFO("Goodbye now!"); - delete pending_comms; -} }; -class receiver { +/* Receiver actor expects 1 argument: its ID */ +class Receiver { simgrid::s4u::MailboxPtr mbox; public: - explicit receiver(std::vector args) -{ - xbt_assert(args.size() == 2, "This function expects 2 parameters from the XML deployment file but got %zu", - args.size()); - int id = xbt_str_parse_int(args[1].c_str(), "Any process of this example must have a numerical name, not %s"); - std::string mbox_name = std::string("receiver-") + std::to_string(id); - mbox = simgrid::s4u::Mailbox::byName(mbox_name); -} -void operator()() -{ - XBT_INFO("Wait for my first message"); - while (1) { - char* received = static_cast(mbox->get()); - XBT_INFO("I got a '%s'.", received); - if (std::strcmp(received, "finalize") == 0) { /* If it's a finalize message, we're done */ - xbt_free(received); - break; + 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 = simgrid::s4u::Mailbox::by_name(mboxName); + } + void operator()() + { + XBT_INFO("Wait for my first message"); + for (bool cont = true; cont;) { + std::string* received = static_cast(mbox->get()); + 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 + delete received; } - /* Otherwise receiving the message was all we were supposed to do */ - xbt_free(received); } -} }; int main(int argc, char *argv[]) { - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); - xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n", argv[0]); - e->registerFunction("sender"); - e->registerFunction("receiver"); + simgrid::s4u::Engine e(&argc, argv); + e.register_actor("sender"); + e.register_actor("receiver"); - e->loadPlatform(argv[1]); - e->loadDeployment(argv[2]); - e->run(); + e.load_platform(argv[1]); + e.load_deployment(argv[2]); + e.run(); return 0; }