X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d37695654af494c87f28017306376b8c229aaec0..5997f75835d50b618ea8f7030ff2f554b32350d9:/examples/s4u/app-bittorrent/s4u-peer.hpp diff --git a/examples/s4u/app-bittorrent/s4u-peer.hpp b/examples/s4u/app-bittorrent/s4u-peer.hpp index 2737649d71..ecc5994743 100644 --- a/examples/s4u/app-bittorrent/s4u-peer.hpp +++ b/examples/s4u/app-bittorrent/s4u-peer.hpp @@ -24,7 +24,6 @@ public: bool choked_download = true; // Indicates if the peer has choked the current peer explicit Connection(int id) : id(id), mailbox_(simgrid::s4u::Mailbox::by_name(std::to_string(id))){}; - ~Connection() = default; void addSpeedValue(double speed) { peer_speed = peer_speed * 0.6 + speed * 0.4; } bool hasPiece(unsigned int piece) { return bitfield & 1U << piece; } }; @@ -32,14 +31,13 @@ public: class Peer { int id; double deadline; - RngStream stream; simgrid::s4u::Mailbox* mailbox_; - std::unordered_map connected_peers; + std::unordered_map connected_peers; std::set active_peers; // active peers list unsigned int bitfield_ = 0; // list of pieces the peer has. unsigned long long bitfield_blocks = 0; // list of blocks the peer has. - short* pieces_count = nullptr; // number of peers that have each piece. + std::vector pieces_count; // number of peers that have each piece. unsigned int current_pieces = 0; // current pieces the peer is downloading double begin_receive_time = 0; // time when the receiving communication has begun, useful for calculating host speed. int round_ = 0; // current round for the chocking algorithm. @@ -50,7 +48,6 @@ public: explicit Peer(std::vector args); Peer(const Peer&) = delete; Peer& operator=(const Peer&) = delete; - ~Peer(); void operator()(); std::string getStatus();