Download-Tools/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-02-26 08:22:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove PeerStorage:scheduleForcedChokeRound since it is not effective

Browse Source
This commit is contained in:
Tatsuhiro Tsujikawa 2016-06-04 22:11:51 +09:00
parent 6b8611885b
commit b95d7fbfec
5 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/DefaultBtInteractive.cc
View File

@ -189,7 +189,6 @@ void DefaultBtInteractive::doPostHandshakeProcessing()
if (!metadataGetMode_) {
addAllowedFastMessageToQueue();
}
peerStorage_->scheduleForcedChokeRound();
sendPendingMessage();
}

10
src/DefaultPeerStorage.cc
View File

@ -62,8 +62,7 @@ DefaultPeerStorage::DefaultPeerStorage()
: maxPeerListSize_(MAX_PEER_LIST_SIZE),
seederStateChoke_(make_unique<BtSeederStateChoke>()),
leecherStateChoke_(make_unique<BtLeecherStateChoke>()),
lastTransferStatMapUpdated_(Timer::zero()),
forceChokeRound_(false)
lastTransferStatMapUpdated_(Timer::zero())
{
}
@ -285,21 +284,16 @@ void DefaultPeerStorage::returnPeer(const std::shared_ptr<Peer>& peer)
bool DefaultPeerStorage::chokeRoundIntervalElapsed()
{
constexpr auto CHOKE_ROUND_INTERVAL = 10_s;
auto forceChokeRound = forceChokeRound_;
forceChokeRound_ = false;
if (pieceStorage_->downloadFinished()) {
auto interval = forceChokeRound ? 1_s : CHOKE_ROUND_INTERVAL;
return seederStateChoke_->getLastRound().difference(global::wallclock()) >=
interval;
CHOKE_ROUND_INTERVAL;
}
return leecherStateChoke_->getLastRound().difference(global::wallclock()) >=
CHOKE_ROUND_INTERVAL;
}
void DefaultPeerStorage::scheduleForcedChokeRound() { forceChokeRound_ = true; }
void DefaultPeerStorage::executeChoke()
{
if (pieceStorage_->downloadFinished()) {

4
src/DefaultPeerStorage.h
View File

@ -74,8 +74,6 @@ private:
std::map<std::string, Timer> badPeers_;
Timer lastBadPeerCleaned_;
bool forceChokeRound_;
bool isPeerAlreadyAdded(const std::shared_ptr<Peer>& peer);
void addUniqPeer(const std::shared_ptr<Peer>& peer);
@ -115,8 +113,6 @@ public:
virtual bool chokeRoundIntervalElapsed() CXX11_OVERRIDE;
virtual void scheduleForcedChokeRound() CXX11_OVERRIDE;
virtual void executeChoke() CXX11_OVERRIDE;
void deleteUnusedPeer(size_t delSize);

5
src/PeerStorage.h
View File

@ -113,11 +113,6 @@ public:
virtual bool chokeRoundIntervalElapsed() = 0;
/**
* Schedules choke round forcibly.
*/
virtual void scheduleForcedChokeRound() = 0;
virtual void executeChoke() = 0;
};

2
test/MockPeerStorage.h
View File

@ -84,8 +84,6 @@ public:
virtual bool chokeRoundIntervalElapsed() CXX11_OVERRIDE { return false; }
virtual void scheduleForcedChokeRound() CXX11_OVERRIDE {}
virtual void executeChoke() CXX11_OVERRIDE { ++numChokeExecuted_; }
int getNumChokeExecuted() const { return numChokeExecuted_; }