A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Endgame mode is always enabled, remove option.
[simgrid.git]
/
examples
/
s4u
/
app-bittorrent
/
s4u-peer.cpp
diff --git
a/examples/s4u/app-bittorrent/s4u-peer.cpp
b/examples/s4u/app-bittorrent/s4u-peer.cpp
index
53317ba
..
d3415ad
100644
(file)
--- a/
examples/s4u/app-bittorrent/s4u-peer.cpp
+++ b/
examples/s4u/app-bittorrent/s4u-peer.cpp
@@
-22,7
+22,6
@@
constexpr int BLOCK_SIZE = 16384;
/** Number of blocks asked by each request */
constexpr unsigned long BLOCKS_REQUESTED = 2UL;
/** Number of blocks asked by each request */
constexpr unsigned long BLOCKS_REQUESTED = 2UL;
-constexpr bool ENABLE_END_GAME_MODE = true;
constexpr double SLEEP_DURATION = 1.0;
#define BITS_TO_BYTES(x) (((x) / 8 + (x) % 8) ? 1 : 0)
constexpr double SLEEP_DURATION = 1.0;
#define BITS_TO_BYTES(x) (((x) / 8 + (x) % 8) ? 1 : 0)
@@
-34,18
+33,16
@@
Peer::Peer(std::vector<std::string> args)
id = std::stoi(args[1]);
mailbox_ = simgrid::s4u::Mailbox::by_name(std::to_string(id));
} catch (const std::invalid_argument&) {
id = std::stoi(args[1]);
mailbox_ = simgrid::s4u::Mailbox::by_name(std::to_string(id));
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Invalid ID:") + args[1].c_str()
);
+ throw std::invalid_argument(
"Invalid ID:" + args[1]
);
}
try {
deadline = std::stod(args[2]);
} catch (const std::invalid_argument&) {
}
try {
deadline = std::stod(args[2]);
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(
std::string("Invalid deadline:") + args[2].c_str()
);
+ throw std::invalid_argument(
"Invalid deadline:" + args[2]
);
}
xbt_assert(deadline > 0, "Wrong deadline supplied");
}
xbt_assert(deadline > 0, "Wrong deadline supplied");
- stream = simgrid::s4u::this_actor::get_host()->extension<HostBittorrent>()->getStream();
-
if (args.size() == 4 && args[3] == "1") {
bitfield_ = (1U << FILE_PIECES) - 1U;
bitfield_blocks = (1ULL << (FILE_PIECES * PIECES_BLOCKS)) - 1ULL;
if (args.size() == 4 && args[3] == "1") {
bitfield_ = (1U << FILE_PIECES) - 1U;
bitfield_blocks = (1ULL << (FILE_PIECES * PIECES_BLOCKS)) - 1ULL;
@@
-84,7
+81,7
@@
bool Peer::getPeersFromTracker()
try {
XBT_DEBUG("Sending a peer request to the tracker.");
tracker_mailbox->put(peer_request, TRACKER_COMM_SIZE, GET_PEERS_TIMEOUT);
try {
XBT_DEBUG("Sending a peer request to the tracker.");
tracker_mailbox->put(peer_request, TRACKER_COMM_SIZE, GET_PEERS_TIMEOUT);
- } catch (const simgrid::TimeoutE
rror
&) {
+ } catch (const simgrid::TimeoutE
xception
&) {
XBT_DEBUG("Timeout expired when requesting peers to tracker");
delete peer_request;
return false;
XBT_DEBUG("Timeout expired when requesting peers to tracker");
delete peer_request;
return false;
@@
-97,7
+94,7
@@
bool Peer::getPeersFromTracker()
if (id != peer_id)
connected_peers.emplace(peer_id, Connection(peer_id));
delete answer;
if (id != peer_id)
connected_peers.emplace(peer_id, Connection(peer_id));
delete answer;
- } catch (const simgrid::TimeoutE
rror
&) {
+ } catch (const simgrid::TimeoutE
xception
&) {
XBT_DEBUG("Timeout expired when requesting peers to tracker");
return false;
}
XBT_DEBUG("Timeout expired when requesting peers to tracker");
return false;
}
@@
-371,10
+368,6
@@
void Peer::handleMessage()
XBT_DEBUG(" \t for piece %d (%d,%d)", message->piece, message->block_index,
message->block_index + message->block_length);
xbt_assert(not remote_peer->choked_download);
XBT_DEBUG(" \t for piece %d (%d,%d)", message->piece, message->block_index,
message->block_index + message->block_length);
xbt_assert(not remote_peer->choked_download);
- xbt_assert(remote_peer->am_interested || ENABLE_END_GAME_MODE,
- "Can't received a piece if I'm not interested without end-game mode!"
- "piece (%d) bitfield (%u) remote bitfield (%u)",
- message->piece, bitfield_, remote_peer->bitfield);
xbt_assert(not remote_peer->choked_download, "Can't received a piece if I'm choked !");
xbt_assert((message->piece >= 0 && static_cast<unsigned int>(message->piece) < FILE_PIECES),
"Wrong piece received");
xbt_assert(not remote_peer->choked_download, "Can't received a piece if I'm choked !");
xbt_assert((message->piece >= 0 && static_cast<unsigned int>(message->piece) < FILE_PIECES),
"Wrong piece received");
@@
-396,7
+389,6
@@
void Peer::handleMessage()
}
} else {
XBT_DEBUG("However, we already have it");
}
} else {
XBT_DEBUG("However, we already have it");
- xbt_assert(ENABLE_END_GAME_MODE, "Should not happen because we don't use end game mode !");
requestNewPieceTo(remote_peer);
}
break;
requestNewPieceTo(remote_peer);
}
break;
@@
-446,8
+438,6
@@
int Peer::selectPieceToDownload(Connection* remote_peer)
// end game mode
if (countPieces(current_pieces) >= (FILE_PIECES - countPieces(bitfield_)) && isInterestedBy(remote_peer)) {
// end game mode
if (countPieces(current_pieces) >= (FILE_PIECES - countPieces(bitfield_)) && isInterestedBy(remote_peer)) {
- if (not ENABLE_END_GAME_MODE)
- return -1;
int nb_interesting_pieces = 0;
// compute the number of interesting pieces
for (unsigned int i = 0; i < FILE_PIECES; i++)
int nb_interesting_pieces = 0;
// compute the number of interesting pieces
for (unsigned int i = 0; i < FILE_PIECES; i++)
@@
-456,7
+446,8
@@
int Peer::selectPieceToDownload(Connection* remote_peer)
xbt_assert(nb_interesting_pieces != 0);
// get a random interesting piece
xbt_assert(nb_interesting_pieces != 0);
// get a random interesting piece
- int random_piece_index = RngStream_RandInt(stream, 0, nb_interesting_pieces - 1);
+ std::uniform_int_distribution<int> dist(0, nb_interesting_pieces - 1);
+ int random_piece_index = dist(generator);
int current_index = 0;
for (unsigned int i = 0; i < FILE_PIECES; i++) {
if (hasNotPiece(i) && remote_peer->hasPiece(i)) {
int current_index = 0;
for (unsigned int i = 0; i < FILE_PIECES; i++) {
if (hasNotPiece(i) && remote_peer->hasPiece(i)) {
@@
-479,7
+470,8
@@
int Peer::selectPieceToDownload(Connection* remote_peer)
nb_interesting_pieces++;
xbt_assert(nb_interesting_pieces != 0);
// get a random interesting piece
nb_interesting_pieces++;
xbt_assert(nb_interesting_pieces != 0);
// get a random interesting piece
- int random_piece_index = RngStream_RandInt(stream, 0, nb_interesting_pieces - 1);
+ std::uniform_int_distribution<int> dist(0, nb_interesting_pieces - 1);
+ int random_piece_index = dist(generator);
int current_index = 0;
for (unsigned int i = 0; i < FILE_PIECES; i++) {
if (hasNotPiece(i) && remote_peer->hasPiece(i) && isNotDownloadingPiece(i)) {
int current_index = 0;
for (unsigned int i = 0; i < FILE_PIECES; i++) {
if (hasNotPiece(i) && remote_peer->hasPiece(i) && isNotDownloadingPiece(i)) {
@@
-510,7
+502,11
@@
int Peer::selectPieceToDownload(Connection* remote_peer)
xbt_assert(nb_min_pieces != 0 || not isInterestedByFree(remote_peer));
// get a random rarest piece
xbt_assert(nb_min_pieces != 0 || not isInterestedByFree(remote_peer));
// get a random rarest piece
- int random_rarest_index = RngStream_RandInt(stream, 0, nb_min_pieces - 1);
+ int random_rarest_index = 0;
+ if (nb_min_pieces > 0) {
+ std::uniform_int_distribution<int> dist(0, nb_min_pieces - 1);
+ random_rarest_index = dist(generator);
+ }
for (unsigned int i = 0; i < FILE_PIECES; i++)
if (pieces_count[i] == min && hasNotPiece(i) && remote_peer->hasPiece(i) && isNotDownloadingPiece(i)) {
if (random_rarest_index == current_index) {
for (unsigned int i = 0; i < FILE_PIECES; i++)
if (pieces_count[i] == min && hasNotPiece(i) && remote_peer->hasPiece(i) && isNotDownloadingPiece(i)) {
if (random_rarest_index == current_index) {
@@
-559,7
+555,8
@@
void Peer::updateChokedPeers()
do {
// We choose a random peer to unchoke.
std::unordered_map<int, Connection>::iterator chosen_peer_it = connected_peers.begin();
do {
// We choose a random peer to unchoke.
std::unordered_map<int, Connection>::iterator chosen_peer_it = connected_peers.begin();
- std::advance(chosen_peer_it, RngStream_RandInt(stream, 0, connected_peers.size() - 1));
+ std::uniform_int_distribution<int> dist(0, connected_peers.size() - 1);
+ std::advance(chosen_peer_it, dist(generator));
chosen_peer = &chosen_peer_it->second;
if (not chosen_peer->interested || not chosen_peer->choked_upload)
chosen_peer = nullptr;
chosen_peer = &chosen_peer_it->second;
if (not chosen_peer->interested || not chosen_peer->choked_upload)
chosen_peer = nullptr;