2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Renamed member variables. Removed unused member variable.
	* src/DefaultPeerStorage.cc
	* src/DefaultPeerStorage.h
	* src/RequestGroup.cc
	* test/DefaultPeerStorageTest.cc

ChangeLog

@@ -1,3 +1,11 @@
+2010-06-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Renamed member variables. Removed unused member variable.
+	* src/DefaultPeerStorage.cc
+	* src/DefaultPeerStorage.h
+	* src/RequestGroup.cc
+	* test/DefaultPeerStorageTest.cc
+
 2010-06-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Renamed member variables. Removed unused member variable.

src/DefaultPeerStorage.cc

@@ -50,11 +50,10 @@ namespace aria2 {
 
 static const int MAX_PEER_LIST_SIZE = 1024;
 
-DefaultPeerStorage::DefaultPeerStorage(const Option* option):
-  option(option),
-  logger(LogFactory::getInstance()),
-  removedPeerSessionDownloadLength(0),
-  removedPeerSessionUploadLength(0),
+DefaultPeerStorage::DefaultPeerStorage():
+  _logger(LogFactory::getInstance()),
+  _removedPeerSessionDownloadLength(0),
+  _removedPeerSessionUploadLength(0),
   _seederStateChoke(new BtSeederStateChoke()),
   _leecherStateChoke(new BtLeecherStateChoke()),
   _lastTransferStatMapUpdated(0)
@@ -80,8 +79,8 @@ public:
 
 bool DefaultPeerStorage::isPeerAlreadyAdded(const SharedHandle<Peer>& peer)
 {
-  return std::find_if(peers.begin(), peers.end(),
-                      FindIdenticalPeer(peer)) != peers.end();
+  return std::find_if(_peers.begin(), _peers.end(),
+                      FindIdenticalPeer(peer)) != _peers.end();
 }
 
 static size_t calculateMaxPeerListSize(const SharedHandle<BtRuntime>& btRuntime)
@@ -96,17 +95,17 @@ static size_t calculateMaxPeerListSize(const SharedHandle<BtRuntime>& btRuntime)
 
 bool DefaultPeerStorage::addPeer(const SharedHandle<Peer>& peer) {
   if(isPeerAlreadyAdded(peer)) {
-    if(logger->debug()) {
-      logger->debug("Adding %s:%u is rejected because it has been already"
+    if(_logger->debug()) {
+      _logger->debug("Adding %s:%u is rejected because it has been already"
                     " added.", peer->ipaddr.c_str(), peer->port);
     }
     return false;
   }
   size_t maxPeerListSize = calculateMaxPeerListSize(_btRuntime);
-  if(peers.size() >= maxPeerListSize) {
-    deleteUnusedPeer(peers.size()-maxPeerListSize+1);
+  if(_peers.size() >= maxPeerListSize) {
+    deleteUnusedPeer(_peers.size()-maxPeerListSize+1);
   }
-  peers.push_front(peer);
+  _peers.push_front(peer);
   return true;
 }
 
@@ -116,8 +115,8 @@ void DefaultPeerStorage::addPeer(const std::vector<SharedHandle<Peer> >& peers)
         eoi = peers.end(); itr != eoi; ++itr) {
     const SharedHandle<Peer>& peer = *itr;
     if(addPeer(peer)) {
-      if(logger->debug()) {
-        logger->debug(MSG_ADDING_PEER, peer->ipaddr.c_str(), peer->port);
+      if(_logger->debug()) {
+        _logger->debug(MSG_ADDING_PEER, peer->ipaddr.c_str(), peer->port);
       }
     }
   }  
@@ -125,7 +124,7 @@ void DefaultPeerStorage::addPeer(const std::vector<SharedHandle<Peer> >& peers)
 
 const std::deque<SharedHandle<Peer> >& DefaultPeerStorage::getPeers()
 {
-  return peers;
+  return _peers;
 }
 
 class FindFinePeer {
@@ -137,8 +136,8 @@ public:
 
 SharedHandle<Peer> DefaultPeerStorage::getUnusedPeer() {
   std::deque<SharedHandle<Peer> >::const_iterator itr =
-    std::find_if(peers.begin(), peers.end(), FindFinePeer());
-  if(itr == peers.end()) {
+    std::find_if(_peers.begin(), _peers.end(), FindFinePeer());
+  if(itr == _peers.end()) {
     return SharedHandle<Peer>();
   } else {
     return *itr;
@@ -161,8 +160,8 @@ public:
 SharedHandle<Peer> DefaultPeerStorage::getPeer(const std::string& ipaddr,
                                                uint16_t port) const {
   std::deque<SharedHandle<Peer> >::const_iterator itr =
-    std::find_if(peers.begin(), peers.end(), FindPeer(ipaddr, port));
-  if(itr == peers.end()) {
+    std::find_if(_peers.begin(), _peers.end(), FindPeer(ipaddr, port));
+  if(itr == _peers.end()) {
     return SharedHandle<Peer>();
   } else {
     return *itr;
@@ -170,7 +169,7 @@ SharedHandle<Peer> DefaultPeerStorage::getPeer(const std::string& ipaddr,
 }
 
 size_t DefaultPeerStorage::countPeer() const {
-  return peers.size();
+  return _peers.size();
 }
 
 bool DefaultPeerStorage::isPeerAvailable() {
@@ -195,7 +194,7 @@ public:
 void DefaultPeerStorage::getActivePeers
 (std::vector<SharedHandle<Peer> >& activePeers)
 {
-  std::for_each(peers.begin(), peers.end(), CollectActivePeer(activePeers));
+  std::for_each(_peers.begin(), _peers.end(), CollectActivePeer(activePeers));
 }
 
 static TransferStat calculateStatFor(const SharedHandle<Peer>& peer)
@@ -212,8 +211,8 @@ TransferStat DefaultPeerStorage::calculateStat()
 {
   TransferStat stat;
   if(_lastTransferStatMapUpdated.differenceInMillis(global::wallclock) >= 250) {
-    if(logger->debug()) {
-      logger->debug("Updating TransferStat of PeerStorage");
+    if(_logger->debug()) {
+      _logger->debug("Updating TransferStat of PeerStorage");
     }
     _lastTransferStatMapUpdated = global::wallclock;
     _peerTransferStatMap.clear();
@@ -234,8 +233,8 @@ TransferStat DefaultPeerStorage::calculateStat()
   } else {
     stat = _cachedTransferStat;
   }
-  stat.sessionDownloadLength += removedPeerSessionDownloadLength;
-  stat.sessionUploadLength += removedPeerSessionUploadLength;
+  stat.sessionDownloadLength += _removedPeerSessionDownloadLength;
+  stat.sessionUploadLength += _removedPeerSessionUploadLength;
   stat.setAllTimeUploadLength(_btRuntime->getUploadLengthAtStartup()+
                               stat.getSessionUploadLength());
   return stat;
@@ -243,8 +242,8 @@ TransferStat DefaultPeerStorage::calculateStat()
 
 void DefaultPeerStorage::updateTransferStatFor(const SharedHandle<Peer>& peer)
 {
-  if(logger->debug()) {
-    logger->debug("Updating TransferStat for peer %s", peer->getID().c_str());
+  if(_logger->debug()) {
+    _logger->debug("Updating TransferStat for peer %s", peer->getID().c_str());
   }
   std::map<std::string, TransferStat>::iterator itr =
     _peerTransferStatMap.find(peer->getID());
@@ -264,7 +263,7 @@ TransferStat DefaultPeerStorage::getTransferStatFor
 void DefaultPeerStorage::deleteUnusedPeer(size_t delSize) {
   std::deque<SharedHandle<Peer> > temp;
   for(std::deque<SharedHandle<Peer> >::const_reverse_iterator itr =
-        peers.rbegin(), eoi = peers.rend(); itr != eoi; ++itr) {
+        _peers.rbegin(), eoi = _peers.rend(); itr != eoi; ++itr) {
     const SharedHandle<Peer>& p = *itr;
     if(p->unused() && delSize > 0) {
       onErasingPeer(p);
@@ -273,7 +272,7 @@ void DefaultPeerStorage::deleteUnusedPeer(size_t delSize) {
       temp.push_front(p);
     }
   }
-  peers = temp;
+  _peers.swap(temp);
 }
 
 void DefaultPeerStorage::onErasingPeer(const SharedHandle<Peer>& peer) {}
@@ -282,8 +281,8 @@ void DefaultPeerStorage::onReturningPeer(const SharedHandle<Peer>& peer)
 {
   if(peer->isActive()) {
     TransferStat removedStat(calculateStatFor(peer));
-    removedPeerSessionDownloadLength += removedStat.getSessionDownloadLength();
-    removedPeerSessionUploadLength += removedStat.getSessionUploadLength();
+    _removedPeerSessionDownloadLength += removedStat.getSessionDownloadLength();
+    _removedPeerSessionUploadLength += removedStat.getSessionUploadLength();
     _cachedTransferStat -= removedStat;
 
     // Execute choking algorithm if unchoked and interested peer is
@@ -297,14 +296,14 @@ void DefaultPeerStorage::onReturningPeer(const SharedHandle<Peer>& peer)
 void DefaultPeerStorage::returnPeer(const SharedHandle<Peer>& peer)
 {
   std::deque<SharedHandle<Peer> >::iterator itr =
-    std::find(peers.begin(), peers.end(), peer);
-  if(itr == peers.end()) {
-    if(logger->debug()) {
-      logger->debug("Cannot find peer %s:%u in PeerStorage.",
+    std::find(_peers.begin(), _peers.end(), peer);
+  if(itr == _peers.end()) {
+    if(_logger->debug()) {
+      _logger->debug("Cannot find peer %s:%u in PeerStorage.",
                     peer->ipaddr.c_str(), peer->port);
     }
   } else {
-    peers.erase(itr);
+    _peers.erase(itr);
 
     onReturningPeer(peer);
     onErasingPeer(peer);

src/DefaultPeerStorage.h

@@ -43,7 +43,6 @@
 
 namespace aria2 {
 
-class Option;
 class Logger;
 class BtRuntime;
 class BtSeederStateChoke;
@@ -54,11 +53,10 @@ class DefaultPeerStorage : public PeerStorage {
 private:
   SharedHandle<BtRuntime> _btRuntime;
   SharedHandle<PieceStorage> _pieceStorage;
-  const Option* option;
-  std::deque<SharedHandle<Peer> > peers;
-  Logger* logger;
-  uint64_t removedPeerSessionDownloadLength;
-  uint64_t removedPeerSessionUploadLength;
+  std::deque<SharedHandle<Peer> > _peers;
+  Logger* _logger;
+  uint64_t _removedPeerSessionDownloadLength;
+  uint64_t _removedPeerSessionUploadLength;
 
   BtSeederStateChoke* _seederStateChoke;
   BtLeecherStateChoke* _leecherStateChoke;
@@ -71,7 +69,7 @@ private:
 
   bool isPeerAlreadyAdded(const SharedHandle<Peer>& peer);
 public:
-  DefaultPeerStorage(const Option* option);
+  DefaultPeerStorage();
 
   virtual ~DefaultPeerStorage();
 

src/RequestGroup.cc

@@ -247,8 +247,7 @@ void RequestGroup::createInitialCommand
         progressInfoFile->setBtRuntime(btRuntime);
       }
 
-      SharedHandle<DefaultPeerStorage> peerStorage
-        (new DefaultPeerStorage(_option.get()));
+      SharedHandle<DefaultPeerStorage> peerStorage(new DefaultPeerStorage());
       peerStorage->setBtRuntime(btRuntime);
       peerStorage->setPieceStorage(_pieceStorage);
       _peerStorage = peerStorage;

test/DefaultPeerStorageTest.cc

@@ -53,7 +53,7 @@ public:
 CPPUNIT_TEST_SUITE_REGISTRATION(DefaultPeerStorageTest);
 
 void DefaultPeerStorageTest::testCountPeer() {
-  DefaultPeerStorage ps(option);
+  DefaultPeerStorage ps;
 
   CPPUNIT_ASSERT_EQUAL((size_t)0, ps.countPeer());
 
@@ -64,7 +64,7 @@ void DefaultPeerStorageTest::testCountPeer() {
 }
 
 void DefaultPeerStorageTest::testDeleteUnusedPeer() {
-  DefaultPeerStorage ps(option);
+  DefaultPeerStorage ps;
 
   SharedHandle<Peer> peer1(new Peer("192.168.0.1", 6889));
   SharedHandle<Peer> peer2(new Peer("192.168.0.2", 6889));
@@ -95,7 +95,7 @@ void DefaultPeerStorageTest::testDeleteUnusedPeer() {
 }
 
 void DefaultPeerStorageTest::testAddPeer() {
-  DefaultPeerStorage ps(option);
+  DefaultPeerStorage ps;
   SharedHandle<BtRuntime> btRuntime(new BtRuntime());
   btRuntime->setMaxPeers(3);
   ps.setBtRuntime(btRuntime);
@@ -132,7 +132,7 @@ void DefaultPeerStorageTest::testAddPeer() {
 }
 
 void DefaultPeerStorageTest::testGetUnusedPeer() {
-  DefaultPeerStorage ps(option);
+  DefaultPeerStorage ps;
   ps.setBtRuntime(btRuntime);
 
   SharedHandle<Peer> peer1(new Peer("192.168.0.1", 6889));
@@ -153,7 +153,7 @@ void DefaultPeerStorageTest::testGetUnusedPeer() {
 }
 
 void DefaultPeerStorageTest::testIsPeerAvailable() {
-  DefaultPeerStorage ps(option);
+  DefaultPeerStorage ps;
   ps.setBtRuntime(btRuntime);
 
   CPPUNIT_ASSERT_EQUAL(false, ps.isPeerAvailable());
@@ -176,7 +176,7 @@ void DefaultPeerStorageTest::testIsPeerAvailable() {
 }
 
 void DefaultPeerStorageTest::testActivatePeer() {
-  DefaultPeerStorage ps(option);
+  DefaultPeerStorage ps;
 
   {
     std::vector<SharedHandle<Peer> > peers;
@@ -209,7 +209,7 @@ void DefaultPeerStorageTest::testCalculateStat() {
 
 void DefaultPeerStorageTest::testReturnPeer()
 {
-  DefaultPeerStorage ps(option);
+  DefaultPeerStorage ps;
 
   SharedHandle<Peer> peer1(new Peer("192.168.0.1", 0));
   peer1->allocateSessionResource(1024*1024, 1024*1024*10);