From 4f7746a89c0392d1457baaa517cc0d699210dd82 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 12 Jun 2010 08:50:50 +0000 Subject: [PATCH] 2010-06-12 Tatsuhiro Tsujikawa Renamed member variables. Removed unused member variable. * src/DefaultPeerStorage.cc * src/DefaultPeerStorage.h * src/RequestGroup.cc * test/DefaultPeerStorageTest.cc --- ChangeLog | 8 ++++ src/DefaultPeerStorage.cc | 71 +++++++++++++++++----------------- src/DefaultPeerStorage.h | 12 +++--- src/RequestGroup.cc | 3 +- test/DefaultPeerStorageTest.cc | 14 +++---- 5 files changed, 56 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62fa7fb4..ae2b5c71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-06-12 Tatsuhiro Tsujikawa + + Renamed member variables. Removed unused member variable. + * src/DefaultPeerStorage.cc + * src/DefaultPeerStorage.h + * src/RequestGroup.cc + * test/DefaultPeerStorageTest.cc + 2010-06-12 Tatsuhiro Tsujikawa Renamed member variables. Removed unused member variable. diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc index 59e92abd..669abe56 100644 --- a/src/DefaultPeerStorage.cc +++ b/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) { - 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) @@ -96,17 +95,17 @@ static size_t calculateMaxPeerListSize(const SharedHandle& btRuntime) bool DefaultPeerStorage::addPeer(const SharedHandle& 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 >& peers) eoi = peers.end(); itr != eoi; ++itr) { const SharedHandle& 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 >& peers) const std::deque >& DefaultPeerStorage::getPeers() { - return peers; + return _peers; } class FindFinePeer { @@ -137,8 +136,8 @@ public: SharedHandle DefaultPeerStorage::getUnusedPeer() { std::deque >::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(); } else { return *itr; @@ -161,8 +160,8 @@ public: SharedHandle DefaultPeerStorage::getPeer(const std::string& ipaddr, uint16_t port) const { std::deque >::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(); } else { return *itr; @@ -170,7 +169,7 @@ SharedHandle 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 >& 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) @@ -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) { - 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::iterator itr = _peerTransferStatMap.find(peer->getID()); @@ -264,7 +263,7 @@ TransferStat DefaultPeerStorage::getTransferStatFor void DefaultPeerStorage::deleteUnusedPeer(size_t delSize) { std::deque > temp; for(std::deque >::const_reverse_iterator itr = - peers.rbegin(), eoi = peers.rend(); itr != eoi; ++itr) { + _peers.rbegin(), eoi = _peers.rend(); itr != eoi; ++itr) { const SharedHandle& 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) {} @@ -282,8 +281,8 @@ void DefaultPeerStorage::onReturningPeer(const SharedHandle& 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) void DefaultPeerStorage::returnPeer(const SharedHandle& peer) { std::deque >::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); diff --git a/src/DefaultPeerStorage.h b/src/DefaultPeerStorage.h index afb1c0fe..d4082a1b 100644 --- a/src/DefaultPeerStorage.h +++ b/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; SharedHandle _pieceStorage; - const Option* option; - std::deque > peers; - Logger* logger; - uint64_t removedPeerSessionDownloadLength; - uint64_t removedPeerSessionUploadLength; + std::deque > _peers; + Logger* _logger; + uint64_t _removedPeerSessionDownloadLength; + uint64_t _removedPeerSessionUploadLength; BtSeederStateChoke* _seederStateChoke; BtLeecherStateChoke* _leecherStateChoke; @@ -71,7 +69,7 @@ private: bool isPeerAlreadyAdded(const SharedHandle& peer); public: - DefaultPeerStorage(const Option* option); + DefaultPeerStorage(); virtual ~DefaultPeerStorage(); diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc index 4c0f7bb7..3cfbca5a 100644 --- a/src/RequestGroup.cc +++ b/src/RequestGroup.cc @@ -247,8 +247,7 @@ void RequestGroup::createInitialCommand progressInfoFile->setBtRuntime(btRuntime); } - SharedHandle peerStorage - (new DefaultPeerStorage(_option.get())); + SharedHandle peerStorage(new DefaultPeerStorage()); peerStorage->setBtRuntime(btRuntime); peerStorage->setPieceStorage(_pieceStorage); _peerStorage = peerStorage; diff --git a/test/DefaultPeerStorageTest.cc b/test/DefaultPeerStorageTest.cc index 6d9afcc6..65278b01 100644 --- a/test/DefaultPeerStorageTest.cc +++ b/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 peer1(new Peer("192.168.0.1", 6889)); SharedHandle 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(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 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 > peers; @@ -209,7 +209,7 @@ void DefaultPeerStorageTest::testCalculateStat() { void DefaultPeerStorageTest::testReturnPeer() { - DefaultPeerStorage ps(option); + DefaultPeerStorage ps; SharedHandle peer1(new Peer("192.168.0.1", 0)); peer1->allocateSessionResource(1024*1024, 1024*1024*10);