X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c369294a45d31c519186fcb6cb10670ec1c1ac8..3721210a272c9593a3bccd52f63178403b5729e3:/examples/s4u/async-wait/s4u-async-wait.cpp diff --git a/examples/s4u/async-wait/s4u-async-wait.cpp b/examples/s4u/async-wait/s4u-async-wait.cpp index b4c36a6be4..b2f5a11a7f 100644 --- a/examples/s4u/async-wait/s4u-async-wait.cpp +++ b/examples/s4u/async-wait/s4u-async-wait.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. */ @@ -12,105 +12,86 @@ */ #include "simgrid/s4u.hpp" -#include "xbt/str.h" #include #include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this s4u example"); -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, "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]); +static int sender(int argc, char** argv) +{ + xbt_assert(argc == 4, "Expecting 3 parameters from the XML deployment file but got %d", argc); + long messages_count = std::stol(argv[1]); /* - number of tasks */ + double msg_size = std::stol(argv[2]); /* - communication cost in bytes */ + long receivers_count = std::stod(argv[3]); /* - number of receivers */ + + 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::byName(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; - - /* 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::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 - - 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); - } - - /* 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::byName(mboxName); - 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 order of creation. */ - while (not pending_comms.empty()) { - simgrid::s4u::CommPtr comm = pending_comms.back(); - comm->wait(); // we could provide a timeout as a parameter - pending_comms.pop_back(); // remove it from the list - } - - 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 mboxName = std::string("receiver-") + std::to_string(i % receivers_count); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(mboxName); + std::string* payload = new std::string("finalize"); // Make a copy of the data we will send + + 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"); -/* Receiver actor expects 1 argument: its ID */ -class Receiver { - simgrid::s4u::MailboxPtr 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 = simgrid::s4u::Mailbox::byName(mboxName); + /* Now that all message exchanges were initiated, wait for their completion, in order of creation. */ + while (not pending_comms.empty()) { + simgrid::s4u::CommPtr comm = pending_comms.back(); + comm->wait(); // we could provide a timeout as a parameter + pending_comms.pop_back(); // remove it from the list } - 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; - } - /* Otherwise receiving the message was all we were supposed to do */ - xbt_free(received); - } + XBT_INFO("Goodbye now!"); + return 0; +} + +/* Receiver actor expects 1 argument: its ID */ +static int receiver(int argc, char** argv) +{ + xbt_assert(argc == 2, "Expecting one parameter from the XML deployment file but got %d", argc); + simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(std::string("receiver-") + argv[1]); + + 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()); + if (*received == "finalize") + cont = false; // If it's a finalize message, we're done. + delete received; } -}; + return 0; +} int main(int argc, char *argv[]) { xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n", argv[0]); simgrid::s4u::Engine e(&argc, argv); - e.registerFunction("sender"); - e.registerFunction("receiver"); + e.register_function("sender", &sender); + e.register_function("receiver", &receiver); - e.loadPlatform(argv[1]); - e.loadDeployment(argv[2]); + e.load_platform(argv[1]); + e.load_deployment(argv[2]); e.run(); return 0;