-/* Copyright (c) 2012-2018. The SimGrid Team.
+/* Copyright (c) 2012-2020. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "s4u-tracker.hpp"
#include <algorithm>
-#include <xbt/RngStream.h>
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_bt_tracker, "Messages specific for the tracker");
// Retrieving end time
try {
deadline = std::stod(args[1]);
- } catch (std::invalid_argument& ia) {
- throw std::invalid_argument(std::string("Invalid deadline:") + args[1].c_str());
+ } catch (const std::invalid_argument&) {
+ throw std::invalid_argument("Invalid deadline:" + args[1]);
}
xbt_assert(deadline > 0, "Wrong deadline supplied");
- stream = simgrid::s4u::this_actor::getHost()->extension<HostBittorrent>()->getStream();
-
- mailbox = simgrid::s4u::Mailbox::byName(TRACKER_MAILBOX);
+ mailbox = simgrid::s4u::Mailbox::by_name(TRACKER_MAILBOX);
XBT_INFO("Tracker launched.");
}
{
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()) {
while (tried < max_tries) {
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());
+ std::advance(next_peer, simgrid::xbt::random::uniform_int(0, nb_known_peers - 1));
+ } while (ta->getPeers().find(*next_peer) != ta->getPeers().end());
ta->addPeer(*next_peer);
tried++;
}