X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7c6662f2627dddac82f15cb8d4f1b42ac23e2b9..dc9b8feaddd53842f6204f4f24409b2382393fa9:/examples/s4u/actor-create/s4u-actor-create.cpp diff --git a/examples/s4u/actor-create/s4u-actor-create.cpp b/examples/s4u/actor-create/s4u-actor-create.cpp index 6f18c3ad4a..43cd620a96 100644 --- a/examples/s4u/actor-create/s4u-actor-create.cpp +++ b/examples/s4u/actor-create/s4u-actor-create.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. 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. */ @@ -7,8 +7,8 @@ * * The first step is to declare the code of your actors (what they do exactly does not matter to this example) and then * you ask SimGrid to start your actors. There is three ways of doing so: - * - Directly, by instantiating your actor as paramter to Actor::create() - * - By first registering your actors before instantiating it; + * - Directly, by instantiating your actor as parameter to Actor::create() + * - By first registering your actors before instantiating it * - Through the deployment file. * * This example shows all these solutions, even if you obviously should use only one of these solutions to start your @@ -27,9 +27,9 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_create, "The logging channel used in this * * Later, this actor class is instantiated within the simulation. */ -static void receiver(std::string mailbox_name) +static void receiver(const std::string& mailbox_name) { - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(mailbox_name); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(mailbox_name); XBT_INFO("Hello s4u, I'm ready to get any message you'd want on %s", mailbox->get_cname()); @@ -47,8 +47,8 @@ static void receiver(std::string mailbox_name) static int forwarder(int argc, char** argv) { xbt_assert(argc >= 3, "Actor forwarder requires 2 parameters, but got only %d", argc - 1); - simgrid::s4u::MailboxPtr in = simgrid::s4u::Mailbox::byName(argv[1]); - simgrid::s4u::MailboxPtr out = simgrid::s4u::Mailbox::byName(argv[2]); + simgrid::s4u::MailboxPtr in = simgrid::s4u::Mailbox::by_name(argv[1]); + simgrid::s4u::MailboxPtr out = simgrid::s4u::Mailbox::by_name(argv[2]); std::string* msg = static_cast(in->get()); XBT_INFO("Forward '%s'.", msg->c_str()); out->put(msg, msg->size()); @@ -65,7 +65,7 @@ public: std::string mbox = "mb42"; std::string msg = "GaBuZoMeu"; explicit Sender() = default; /* Sending the default message */ - explicit Sender(std::string arg) : msg(arg) { /* Sending the specified message */} + explicit Sender(const std::string& arg) : msg(arg) { /* Sending the specified message */} explicit Sender(std::vector args) { /* This constructor is used when we start the actor from the deployment file */ @@ -79,7 +79,7 @@ public: void operator()() /* This is the main code of the actor */ { XBT_INFO("Hello s4u, I have something to send"); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(mbox); + simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(mbox); mailbox->put(new std::string(msg), msg.size()); XBT_INFO("I'm done. See you.");