From: SUTER Frederic Date: Thu, 20 Jan 2022 08:11:03 +0000 (+0100) Subject: remove 2 avoidable deployment files X-Git-Tag: v3.30~82 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/792d345c65ef01853c9f0b32015ee7e28fdf4ea7 remove 2 avoidable deployment files --- diff --git a/MANIFEST.in b/MANIFEST.in index c5fd86b08e..94575172cd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -191,10 +191,8 @@ include examples/cpp/comm-wait/s4u-comm-wait.cpp include examples/cpp/comm-wait/s4u-comm-wait.tesh include examples/cpp/comm-waitall/s4u-comm-waitall.cpp include examples/cpp/comm-waitall/s4u-comm-waitall.tesh -include examples/cpp/comm-waitall/s4u-comm-waitall_d.xml include examples/cpp/comm-waitany/s4u-comm-waitany.cpp include examples/cpp/comm-waitany/s4u-comm-waitany.tesh -include examples/cpp/comm-waitany/s4u-comm-waitany_d.xml include examples/cpp/comm-waituntil/s4u-comm-waituntil.cpp include examples/cpp/comm-waituntil/s4u-comm-waituntil.tesh include examples/cpp/dag-comm/s4u-dag-comm.cpp diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index 00e51b3d97..2cdca7d1a1 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -228,8 +228,6 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-a ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworkers/s4u-app-masterworkers_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/comm-waitany/s4u-comm-waitany_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/comm-waitall/s4u-comm-waitall_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/dag-scheduling/Montage_25.xml ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/s4u-dht-kademlia_d.xml diff --git a/examples/cpp/comm-waitall/s4u-comm-waitall.cpp b/examples/cpp/comm-waitall/s4u-comm-waitall.cpp index 3b2c714f3d..8c5d2e51de 100644 --- a/examples/cpp/comm-waitall/s4u-comm-waitall.cpp +++ b/examples/cpp/comm-waitall/s4u-comm-waitall.cpp @@ -20,94 +20,70 @@ 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) +{ + // 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(std::string("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 = 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); } - 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!"); + + /* 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); } -}; + 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 */ -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); - } - 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 - } +static void receiver(int id) +{ + sg4::Mailbox* mbox = sg4::Mailbox::by_name(std::string("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; diff --git a/examples/cpp/comm-waitall/s4u-comm-waitall.tesh b/examples/cpp/comm-waitall/s4u-comm-waitall.tesh index 1bd34718de..cdf73659e3 100644 --- a/examples/cpp/comm-waitall/s4u-comm-waitall.tesh +++ b/examples/cpp/comm-waitall/s4u-comm-waitall.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u-comm-waitall ${platfdir}/small_platform_fatpipe.xml s4u-comm-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-waitall ${platfdir}/small_platform_fatpipe.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (2:receiver@Ruby) Wait for my first message > [ 0.000000] (3:receiver@Perl) Wait for my first message > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' diff --git a/examples/cpp/comm-waitall/s4u-comm-waitall_d.xml b/examples/cpp/comm-waitall/s4u-comm-waitall_d.xml deleted file mode 100644 index 65611cc077..0000000000 --- a/examples/cpp/comm-waitall/s4u-comm-waitall_d.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/cpp/comm-waitany/s4u-comm-waitany.cpp b/examples/cpp/comm-waitany/s4u-comm-waitany.cpp index 998ad9b2a7..d176df9793 100644 --- a/examples/cpp/comm-waitany/s4u-comm-waitany.cpp +++ b/examples/cpp/comm-waitany/s4u-comm-waitany.cpp @@ -25,102 +25,78 @@ namespace sg4 = simgrid::s4u; XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_comm_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) +{ + /* 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(std::string("receiver-") + std::to_string(i))); + + /* Start dispatching all messages to receivers, in a round robin fashion */ + for (unsigned 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 */ + 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()() const - { - /* 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))); - - /* 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 */ - 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 order of termination. - * - * This loop waits for first terminating message with wait_any() and remove it with erase(), until all comms are - * terminated - * Even in this simple example, the pending comms do not terminate in the exact same order of creation. - */ - while (not pending_comms.empty()) { - ssize_t changed_pos = sg4::Comm::wait_any(pending_comms); - pending_comms.erase(pending_comms.begin() + changed_pos); - if (changed_pos != 0) - XBT_INFO("Remove the %zdth pending comm: it terminated earlier than another comm that was initiated first.", - changed_pos); - } - - XBT_INFO("Goodbye now!"); + XBT_INFO("Done dispatching all messages"); + + /* Now that all message exchanges were initiated, wait for their completion, in order of termination. + * + * This loop waits for first terminating message with wait_any() and remove it with erase(), until all comms are + * terminated + * Even in this simple example, the pending comms do not terminate in the exact same order of creation. + */ + while (not pending_comms.empty()) { + ssize_t changed_pos = sg4::Comm::wait_any(pending_comms); + pending_comms.erase(pending_comms.begin() + changed_pos); + if (changed_pos != 0) + XBT_INFO("Remove the %zdth pending comm: it terminated earlier than another comm that was initiated first.", + changed_pos); } -}; + + XBT_INFO("Goodbye now!"); +} /* 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); - } - 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 - } +static void receiver(int id) +{ + sg4::Mailbox* mbox = sg4::Mailbox::by_name(std::string("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, 6, 2, 1e6); + sg4::Actor::create("receiver", e.host_by_name("Fafard"), receiver, 0); + sg4::Actor::create("receiver", e.host_by_name("Jupiter"), receiver, 1); + e.run(); return 0; diff --git a/examples/cpp/comm-waitany/s4u-comm-waitany.tesh b/examples/cpp/comm-waitany/s4u-comm-waitany.tesh index 9e5944aa9a..5fe9dc925e 100644 --- a/examples/cpp/comm-waitany/s4u-comm-waitany.tesh +++ b/examples/cpp/comm-waitany/s4u-comm-waitany.tesh @@ -3,7 +3,7 @@ p Testing this_actor->wait_any() ! output sort 19 -$ ${bindir:=.}/s4u-comm-waitany ${platfdir}/small_platform.xml s4u-comm-waitany_d.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" +$ ${bindir:=.}/s4u-comm-waitany ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" > [ 0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0' > [ 0.000000] (2:receiver@Fafard) Wait for my first message > [ 0.000000] (3:receiver@Jupiter) Wait for my first message diff --git a/examples/cpp/comm-waitany/s4u-comm-waitany_d.xml b/examples/cpp/comm-waitany/s4u-comm-waitany_d.xml deleted file mode 100644 index bbaccfc041..0000000000 --- a/examples/cpp/comm-waitany/s4u-comm-waitany_d.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - -