X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6847a26d9973030337f6ef9f18464b1f04ce7452..b923f24fcb86571011626426f577fe6322094bb3:/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 9f0a73c08c..b7bd4cd05f 100644 --- a/examples/s4u/app-bittorrent/s4u-tracker.cpp +++ b/examples/s4u/app-bittorrent/s4u-tracker.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2018. 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 @@ -17,14 +17,14 @@ Tracker::Tracker(std::vector args) // Retrieving end time try { deadline = std::stod(args[1]); - } catch (std::invalid_argument& ia) { + } catch (const std::invalid_argument&) { throw std::invalid_argument(std::string("Invalid deadline:") + args[1].c_str()); } xbt_assert(deadline > 0, "Wrong deadline supplied"); 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."); } @@ -33,7 +33,7 @@ void Tracker::operator()() { simgrid::s4u::CommPtr comm = nullptr; void* received = nullptr; - while (simgrid::s4u::Engine::getClock() < deadline) { + while (simgrid::s4u::Engine::get_clock() < deadline) { if (comm == nullptr) comm = mailbox->get_async(&received); if (comm->test()) { @@ -56,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++; }