From b95d7fbfec4a7ea26a81db33d056ccafc8b809e5 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 4 Jun 2016 22:11:51 +0900
Subject: [PATCH] Remove PeerStorage:scheduleForcedChokeRound since it is not
 effective

---
 src/DefaultBtInteractive.cc |  1 -
 src/DefaultPeerStorage.cc   | 10 ++--------
 src/DefaultPeerStorage.h    |  4 ----
 src/PeerStorage.h           |  5 -----
 test/MockPeerStorage.h      |  2 --
 5 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/DefaultBtInteractive.cc b/src/DefaultBtInteractive.cc
index 4daae189..c74d8e7a 100644
--- a/src/DefaultBtInteractive.cc
+++ b/src/DefaultBtInteractive.cc
@@ -189,7 +189,6 @@ void DefaultBtInteractive::doPostHandshakeProcessing()
   if (!metadataGetMode_) {
     addAllowedFastMessageToQueue();
   }
-  peerStorage_->scheduleForcedChokeRound();
   sendPendingMessage();
 }
 
diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc
index 6047462a..dc5353f6 100644
--- a/src/DefaultPeerStorage.cc
+++ b/src/DefaultPeerStorage.cc
@@ -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()) {
diff --git a/src/DefaultPeerStorage.h b/src/DefaultPeerStorage.h
index f2714f82..3fd60a91 100644
--- a/src/DefaultPeerStorage.h
+++ b/src/DefaultPeerStorage.h
@@ -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);
diff --git a/src/PeerStorage.h b/src/PeerStorage.h
index da546c06..08132b06 100644
--- a/src/PeerStorage.h
+++ b/src/PeerStorage.h
@@ -113,11 +113,6 @@ public:
 
   virtual bool chokeRoundIntervalElapsed() = 0;
 
-  /**
-   * Schedules choke round forcibly.
-   */
-  virtual void scheduleForcedChokeRound() = 0;
-
   virtual void executeChoke() = 0;
 };
 
diff --git a/test/MockPeerStorage.h b/test/MockPeerStorage.h
index f20e896c..05781823 100644
--- a/test/MockPeerStorage.h
+++ b/test/MockPeerStorage.h
@@ -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_; }