X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2807fde4fd1f59c230d69a934634c5dfb77905f2..61c32216a808376a5dbcf1fe166c14b6f7456af4:/examples/s4u/app-bittorrent/s4u-tracker.cpp diff --git a/examples/s4u/app-bittorrent/s4u-tracker.cpp b/examples/s4u/app-bittorrent/s4u-tracker.cpp index 129667980e..f51e55d415 100644 --- a/examples/s4u/app-bittorrent/s4u-tracker.cpp +++ b/examples/s4u/app-bittorrent/s4u-tracker.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017. The SimGrid Team. +/* Copyright (c) 2012-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -22,9 +22,9 @@ Tracker::Tracker(std::vector args) } xbt_assert(deadline > 0, "Wrong deadline supplied"); - stream = simgrid::s4u::this_actor::getHost()->extension()->getStream(); + stream = simgrid::s4u::this_actor::get_host()->extension()->getStream(); - mailbox = simgrid::s4u::Mailbox::byName(TRACKER_MAILBOX); + mailbox = simgrid::s4u::Mailbox::by_name(TRACKER_MAILBOX); XBT_INFO("Tracker launched."); } @@ -32,12 +32,13 @@ Tracker::Tracker(std::vector args) void Tracker::operator()() { simgrid::s4u::CommPtr comm = nullptr; - void* received; - while (simgrid::s4u::Engine::getClock() < deadline) { + void* received = nullptr; + while (simgrid::s4u::Engine::get_clock() < deadline) { if (comm == nullptr) comm = mailbox->get_async(&received); if (comm->test()) { // Retrieve the data sent by the peer. + xbt_assert(received != nullptr); TrackerQuery* tq = static_cast(received); // Add the peer to our peer list, if not already known. @@ -55,7 +56,7 @@ void Tracker::operator()() do { next_peer = known_peers.begin(); std::advance(next_peer, RngStream_RandInt(stream, 0, nb_known_peers - 1)); - } while (ta->getPeers()->find(*next_peer) != ta->getPeers()->end()); + } while (ta->getPeers().find(*next_peer) != ta->getPeers().end()); ta->addPeer(*next_peer); tried++; }