From: Martin Quinson Date: Mon, 2 Oct 2017 22:05:38 +0000 (+0200) Subject: various cosmetics in the s4u-async-wait example X-Git-Tag: v3_17~44 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4d117a5908ecb0e19765890a3607ccedd81de2fa various cosmetics in the s4u-async-wait example --- diff --git a/examples/s4u/async-wait/s4u-async-wait.cpp b/examples/s4u/async-wait/s4u-async-wait.cpp index 73f3bff50a..f1bb5aa2d3 100644 --- a/examples/s4u/async-wait/s4u-async-wait.cpp +++ b/examples/s4u/async-wait/s4u-async-wait.cpp @@ -3,13 +3,14 @@ /* 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. */ -/* This example shows how to block until the completion of a communication. +/* This example shows how to start many asynchronous communications, + * and block on them later. */ - #include "simgrid/s4u.hpp" - #include "xbt/str.h" - #include - #include +#include "simgrid/s4u.hpp" +#include "xbt/str.h" +#include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this s4u example"); @@ -17,48 +18,51 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this s4u exa class sender { long messages_count; /* - number of tasks */ long receivers_count; /* - number of receivers */ - double sleep_start_time; /* - start time */ - double sleep_test_time; /* - test time */ - double msg_size; /* - computational cost */ - double task_comm_size; /* - communication cost */ + double msg_size; /* - communication cost in bytes */ simgrid::s4u::MailboxPtr mbox; public: explicit sender(std::vector args) { - xbt_assert(args.size() == 7, "The sender function expects 6 arguments from the XML deployment file"); + xbt_assert(args.size() == 4, "The sender function expects 3 arguments from the XML deployment file"); messages_count = std::stol(args[1]); - msg_size = std::stod(args[2]); - task_comm_size = std::stod(args[3]); - receivers_count = std::stol(args[4]); - double sleep_start_time = std::stod(args[5]); - double sleep_test_time = std::stod(args[6]); - XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, sleep_test_time); + msg_size = std::stod(args[2]); + receivers_count = std::stol(args[3]); } void operator()() { + std::vector* pending_comms = new std::vector(); + /* Start dispatching all messages to receivers, in a round robin fashion */ for (int i = 0; i < messages_count; i++) { - char mailbox[80]; - char taskname[80]; std::string mbox_name = std::string("receiver-") + std::to_string(i % receivers_count); mbox = simgrid::s4u::Mailbox::byName(mbox_name); - snprintf(mailbox,79, "receiver-%ld", i % receivers_count); - snprintf(taskname,79, "Task_%d", i); /* Create a communication representing the ongoing communication */ - simgrid::s4u::CommPtr comm = mbox->put_async((void*)mailbox, msg_size); + 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 + + simgrid::s4u::CommPtr comm = mbox->put_async((void*)payload, msg_size); XBT_INFO("Send to receiver-%ld Task_%d", i % receivers_count, i); - comm->wait(task_comm_size); + pending_comms->push_back(comm); } - /* Start sending messages to let the workers know that they should stop */ + + /* Now that all comms are in flight, wait for all of them (one after the other) */ + for (int i = 0; i < messages_count; i++) { + 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 + } + } + + /* Start sending messages to let the workers know that they should stop (in a synchronous way) */ for (int i = 0; i < receivers_count; i++) { char mailbox[80]; char* payload = xbt_strdup("finalize"); snprintf(mailbox, 79, "receiver-%d", i); - simgrid::s4u::CommPtr comm = mbox->put_async((void*)payload, 0); - comm->wait(task_comm_size); + mbox->put((void*)payload, 0); // instantaneous message (payload size is 0) sent in a synchronous way (with put) XBT_INFO("Send to receiver-%d finalize", i); } @@ -67,32 +71,23 @@ void operator()() } }; -/* Receiver process expects 3 arguments: */ +/* Receiver process expects 1 arguments: its ID */ class receiver { - int id; /* - unique id */ - double sleep_start_time; /* - start time */ - double sleep_test_time; /* - test time */ simgrid::s4u::MailboxPtr mbox; public: explicit receiver(std::vector args) { - xbt_assert(args.size() == 4, "The relay_runner function does not accept any parameter from the XML deployment file"); - id = std::stoi(args[1]); - sleep_start_time = std::stod(args[2]); - sleep_test_time = std::stod(args[3]); - XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, sleep_test_time); - std::string mbox_name = std::string("receiver-") + std::to_string(id); - mbox = simgrid::s4u::Mailbox::byName(mbox_name); + xbt_assert(args.size() == 2, "The receiver function takes a unique parameter from the XML deployment file"); + std::string mbox_name = std::string("receiver-") + args[1]; + mbox = simgrid::s4u::Mailbox::byName(mbox_name); } void operator()() { - char mailbox[80]; - snprintf(mailbox,79, "receiver-%d", id); while (1) { - char* received = static_cast(mbox->get()); XBT_INFO("Wait to receive a task"); + 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); @@ -104,16 +99,16 @@ void operator()() 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"); - - e->loadPlatform(argv[1]); - e->loadDeployment(argv[2]); - e->run(); - - return 0; + simgrid::s4u::Engine e(&argc, argv); + + xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n", argv[0]); + + e.registerFunction("sender"); + e.registerFunction("receiver"); + + e.loadPlatform(argv[1]); + e.loadDeployment(argv[2]); + e.run(); + + return 0; } diff --git a/examples/s4u/async-wait/s4u-async-wait.tesh b/examples/s4u/async-wait/s4u-async-wait.tesh index b46b2e849e..3dd57fb0a8 100644 --- a/examples/s4u/async-wait/s4u-async-wait.tesh +++ b/examples/s4u/async-wait/s4u-async-wait.tesh @@ -3,18 +3,16 @@ p Test1 Sleep_sender > Sleep_receiver $ $SG_TEST_EXENV ${bindir:=.}/s4u-async-wait ${srcdir:=.}/small_platform_fatpipe.xml ${srcdir:=.}/../s4u/async-wait/s4u-async-wait_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:sender@Tremblay) sleep_start_time : 5.000000 , sleep_test_time : 0.100000 -> [ 0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000 +> [ 0.000000] (2:receiver@Ruby) Wait to receive a task > [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_0 +> [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_1 +> [ 0.000000] (1:sender@Tremblay) Send to receiver-0 Task_2 +> [ 0.105458] (2:receiver@Ruby) I got a 'Message 0'. > [ 0.105458] (2:receiver@Ruby) Wait to receive a task -> [ 0.105458] (2:receiver@Ruby) I got a 'receiver-0'. -> [ 0.105458] (1:sender@Tremblay) Send to receiver-0 Task_1 +> [ 0.210917] (2:receiver@Ruby) I got a 'Message 1'. > [ 0.210917] (2:receiver@Ruby) Wait to receive a task -> [ 0.210917] (2:receiver@Ruby) I got a 'receiver-0'. -> [ 0.210917] (1:sender@Tremblay) Send to receiver-0 Task_2 +> [ 0.316375] (2:receiver@Ruby) I got a 'Message 2'. > [ 0.316375] (2:receiver@Ruby) Wait to receive a task -> [ 0.316375] (2:receiver@Ruby) I got a 'receiver-0'. -> [ 0.318326] (2:receiver@Ruby) Wait to receive a task > [ 0.318326] (2:receiver@Ruby) I got a 'finalize'. > [ 0.318326] (1:sender@Tremblay) Send to receiver-0 finalize > [ 0.318326] (1:sender@Tremblay) Goodbye now! \ No newline at end of file diff --git a/examples/s4u/async-wait/s4u-async-wait_d.xml b/examples/s4u/async-wait/s4u-async-wait_d.xml index 580374b8cd..e6f11cff4b 100644 --- a/examples/s4u/async-wait/s4u-async-wait_d.xml +++ b/examples/s4u/async-wait/s4u-async-wait_d.xml @@ -5,15 +5,10 @@ - - - - + - - - + \ No newline at end of file diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp index 55f645e4e1..de61d34a3e 100644 --- a/examples/s4u/async-waitall/s4u-async-waitall.cpp +++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp @@ -32,7 +32,6 @@ public: messages_count = std::stol(args[1]); msg_size = std::stod(args[2]); receivers_count = std::stol(args[3]); - } void operator()() {