X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..aa67057cbae409c22a57e9dcf4d82a2859e97f45:/examples/s4u/async-waitany/s4u-async-waitany.cpp diff --git a/examples/s4u/async-waitany/s4u-async-waitany.cpp b/examples/s4u/async-waitany/s4u-async-waitany.cpp index eff5ae28eb..afcbc90379 100644 --- a/examples/s4u/async-waitany/s4u-async-waitany.cpp +++ b/examples/s4u/async-waitany/s4u-async-waitany.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. */ @@ -45,7 +45,7 @@ public: 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); + 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 @@ -59,7 +59,7 @@ public: /* 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); + 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 simgrid::s4u::CommPtr comm = mbox->put_async(payload, 0); @@ -95,7 +95,7 @@ public: { 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); + mbox = simgrid::s4u::Mailbox::by_name(mboxName); } void operator()() { @@ -115,11 +115,11 @@ 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_actor("sender"); + e.register_actor("receiver"); - e.loadPlatform(argv[1]); - e.loadDeployment(argv[2]); + e.load_platform(argv[1]); + e.load_deployment(argv[2]); e.run(); return 0;