diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-05-29 12:12:22 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-05-29 12:12:22 +0000 |
| commit | 8b6da1ee367af8e65278fd1c5ada253f07b57bd9 (patch) | |
| tree | 6e0d44a59e112a17c71a9396c77725cadd6549a2 | |
| parent | 30f362319e25d7c2182f6f46d1297385c39787b8 (diff) | |
2009-05-29 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Implemented getter methods in header files to give them more
chance of optimization.
Return const reference for SharadHandle if possible.
* src/AbstractAuthResolver.cc
* src/AbstractAuthResolver.h
* src/AbstractBtMessage.cc
* src/AbstractBtMessage.h
* src/AbstractSingleDiskAdaptor.cc
* src/AbstractSingleDiskAdaptor.h
* src/AsyncNameResolver.cc
* src/AsyncNameResolver.h
* src/BNode.cc
* src/BNode.h
* src/BitfieldMan.cc
* src/BitfieldMan.h
* src/BtAbortOutstandingRequestEvent.h
* src/BtExtendedMessage.cc
* src/BtExtendedMessage.h
* src/BtSeederStateChoke.cc
* src/BtSeederStateChoke.h
* src/Cookie.cc
* src/Cookie.h
* src/DHTBucket.cc
* src/DHTBucket.h
* src/DHTConnectionImpl.cc
* src/DHTConnectionImpl.h
* src/DHTFindNodeReplyMessage.cc
* src/DHTFindNodeReplyMessage.h
* src/DHTGetPeersReplyMessage.cc
* src/DHTGetPeersReplyMessage.h
* src/DHTInteractionCommand.cc
* src/DHTMessage.cc
* src/DHTMessage.h
* src/DHTMessageDispatcherImpl.cc
* src/DHTMessageEntry.cc
* src/DHTMessageReceiver.cc
* src/DHTMessageReceiver.h
* src/DHTMessageTrackerEntry.cc
* src/DHTMessageTrackerEntry.h
* src/DHTPeerAnnounceEntry.cc
* src/DHTPeerAnnounceEntry.h
* src/DHTPeerLookupTask.cc
* src/DHTPeerLookupTask.h
* src/DHTRoutingTableDeserializer.cc
* src/DHTRoutingTableDeserializer.h
* src/DefaultBtAnnounce.cc
* src/DefaultBtAnnounce.h
* src/DefaultBtMessageDispatcher.cc
* src/DefaultBtMessageDispatcher.h
* src/DefaultBtRequestFactory.cc
* src/DefaultBtRequestFactory.h
* src/DiskAdaptor.cc
* src/DiskAdaptor.h
* src/DownloadContext.cc
* src/DownloadContext.h
* src/DownloadEngine.cc
* src/DownloadEngine.h
* src/EpollEventPoll.cc
* src/EpollEventPoll.h
* src/FtpConnection.cc
* src/FtpConnection.h
* src/HttpConnection.cc
* src/HttpConnection.h
* src/HttpHeader.cc
* src/HttpHeader.h
* src/HttpRequest.cc
* src/HttpRequest.h
* src/HttpResponse.cc
* src/HttpResponse.h
* src/LibsslTLSContext.cc
* src/LibsslTLSContext.h
* src/MSEHandshake.cc
* src/MSEHandshake.h
* src/MetalinkEntry.cc
* src/MetalinkEntry.h
* src/MetalinkParserController.cc
* src/MetalinkParserController.h
* src/MetalinkParserStateMachine.cc
* src/MetalinkParserStateMachine.h
* src/MultiDiskAdaptor.cc
* src/MultiDiskAdaptor.h
* src/NetrcAuthResolver.cc
* src/NetrcAuthResolver.h
* src/Peer.cc
* src/Peer.h
* src/PeerSessionResource.cc
* src/PeerSessionResource.h
* src/Piece.cc
* src/Piece.h
* src/PieceStatMan.cc
* src/PieceStatMan.h
* src/Request.cc
* src/Request.h
* src/RequestGroup.cc
* src/RequestGroup.h
* src/RequestGroupMan.cc
* src/RequestGroupMan.h
* src/RequestSlot.cc
* src/RequestSlot.h
* src/SegmentMan.cc
* src/SegmentMan.h
* src/SelectEventPoll.cc
* src/SelectEventPoll.h
* src/ServerStat.cc
* src/ServerStat.h
* src/Signature.cc
* src/Signature.h
* src/URIResult.cc
* src/URIResult.h
* src/UTPexExtensionMessage.cc
* src/UTPexExtensionMessage.h
109 files changed, 995 insertions, 1277 deletions
@@ -1,3 +1,117 @@ +2009-05-29 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> + + Implemented getter methods in header files to give them more + chance of optimization. + Return const reference for SharadHandle if possible. + * src/AbstractAuthResolver.cc + * src/AbstractAuthResolver.h + * src/AbstractBtMessage.cc + * src/AbstractBtMessage.h + * src/AbstractSingleDiskAdaptor.cc + * src/AbstractSingleDiskAdaptor.h + * src/AsyncNameResolver.cc + * src/AsyncNameResolver.h + * src/BNode.cc + * src/BNode.h + * src/BitfieldMan.cc + * src/BitfieldMan.h + * src/BtAbortOutstandingRequestEvent.h + * src/BtExtendedMessage.cc + * src/BtExtendedMessage.h + * src/BtSeederStateChoke.cc + * src/BtSeederStateChoke.h + * src/Cookie.cc + * src/Cookie.h + * src/DHTBucket.cc + * src/DHTBucket.h + * src/DHTConnectionImpl.cc + * src/DHTConnectionImpl.h + * src/DHTFindNodeReplyMessage.cc + * src/DHTFindNodeReplyMessage.h + * src/DHTGetPeersReplyMessage.cc + * src/DHTGetPeersReplyMessage.h + * src/DHTInteractionCommand.cc + * src/DHTMessage.cc + * src/DHTMessage.h + * src/DHTMessageDispatcherImpl.cc + * src/DHTMessageEntry.cc + * src/DHTMessageReceiver.cc + * src/DHTMessageReceiver.h + * src/DHTMessageTrackerEntry.cc + * src/DHTMessageTrackerEntry.h + * src/DHTPeerAnnounceEntry.cc + * src/DHTPeerAnnounceEntry.h + * src/DHTPeerLookupTask.cc + * src/DHTPeerLookupTask.h + * src/DHTRoutingTableDeserializer.cc + * src/DHTRoutingTableDeserializer.h + * src/DefaultBtAnnounce.cc + * src/DefaultBtAnnounce.h + * src/DefaultBtMessageDispatcher.cc + * src/DefaultBtMessageDispatcher.h + * src/DefaultBtRequestFactory.cc + * src/DefaultBtRequestFactory.h + * src/DiskAdaptor.cc + * src/DiskAdaptor.h + * src/DownloadContext.cc + * src/DownloadContext.h + * src/DownloadEngine.cc + * src/DownloadEngine.h + * src/EpollEventPoll.cc + * src/EpollEventPoll.h + * src/FtpConnection.cc + * src/FtpConnection.h + * src/HttpConnection.cc + * src/HttpConnection.h + * src/HttpHeader.cc + * src/HttpHeader.h + * src/HttpRequest.cc + * src/HttpRequest.h + * src/HttpResponse.cc + * src/HttpResponse.h + * src/LibsslTLSContext.cc + * src/LibsslTLSContext.h + * src/MSEHandshake.cc + * src/MSEHandshake.h + * src/MetalinkEntry.cc + * src/MetalinkEntry.h + * src/MetalinkParserController.cc + * src/MetalinkParserController.h + * src/MetalinkParserStateMachine.cc + * src/MetalinkParserStateMachine.h + * src/MultiDiskAdaptor.cc + * src/MultiDiskAdaptor.h + * src/NetrcAuthResolver.cc + * src/NetrcAuthResolver.h + * src/Peer.cc + * src/Peer.h + * src/PeerSessionResource.cc + * src/PeerSessionResource.h + * src/Piece.cc + * src/Piece.h + * src/PieceStatMan.cc + * src/PieceStatMan.h + * src/Request.cc + * src/Request.h + * src/RequestGroup.cc + * src/RequestGroup.h + * src/RequestGroupMan.cc + * src/RequestGroupMan.h + * src/RequestSlot.cc + * src/RequestSlot.h + * src/SegmentMan.cc + * src/SegmentMan.h + * src/SelectEventPoll.cc + * src/SelectEventPoll.h + * src/ServerStat.cc + * src/ServerStat.h + * src/Signature.cc + * src/Signature.h + * src/URIResult.cc + * src/URIResult.h + * src/UTPexExtensionMessage.cc + * src/UTPexExtensionMessage.h + 2009-05-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> Fixed compile error without BitTorrent and Metalink support. diff --git a/src/AbstractAuthResolver.cc b/src/AbstractAuthResolver.cc index f44c75fb..4767685d 100644 --- a/src/AbstractAuthResolver.cc +++ b/src/AbstractAuthResolver.cc @@ -46,19 +46,9 @@ void AbstractAuthResolver::setUserDefinedAuthConfig(const AuthConfigHandle& auth _userDefinedAuthConfig = authConfig; } -AuthConfigHandle AbstractAuthResolver::getUserDefinedAuthConfig() const -{ - return _userDefinedAuthConfig; -} - void AbstractAuthResolver::setDefaultAuthConfig(const AuthConfigHandle& authConfig) { _defaultAuthConfig = authConfig; } -AuthConfigHandle AbstractAuthResolver::getDefaultAuthConfig() const -{ - return _defaultAuthConfig; -} - } // namespace aria2 diff --git a/src/AbstractAuthResolver.h b/src/AbstractAuthResolver.h index bdf1370e..0d50197e 100644 --- a/src/AbstractAuthResolver.h +++ b/src/AbstractAuthResolver.h @@ -53,11 +53,18 @@ public: void setUserDefinedAuthConfig(const SharedHandle<AuthConfig>& authConfig); - SharedHandle<AuthConfig> getUserDefinedAuthConfig() const; + const SharedHandle<AuthConfig>& getUserDefinedAuthConfig() const + { + return _userDefinedAuthConfig; + } void setDefaultAuthConfig(const SharedHandle<AuthConfig>& authConfig); - SharedHandle<AuthConfig> getDefaultAuthConfig() const; + const SharedHandle<AuthConfig>& getDefaultAuthConfig() const + { + return _defaultAuthConfig; + } + }; typedef SharedHandle<AbstractAuthResolver> AbstractAuthResolverHandle; diff --git a/src/AbstractBtMessage.cc b/src/AbstractBtMessage.cc index cc43ec48..f2aa432b 100644 --- a/src/AbstractBtMessage.cc +++ b/src/AbstractBtMessage.cc @@ -54,11 +54,6 @@ AbstractBtMessage::AbstractBtMessage(uint8_t id, const std::string& name): AbstractBtMessage::~AbstractBtMessage() {} -SharedHandle<Peer> AbstractBtMessage::getPeer() const -{ - return peer; -} - void AbstractBtMessage::setPeer(const SharedHandle<Peer>& peer) { this->peer = peer; @@ -78,21 +73,11 @@ AbstractBtMessage::setBtMessageValidator(const SharedHandle<BtMessageValidator>& this->validator = validator; } -SharedHandle<BtMessageValidator> AbstractBtMessage::getBtMessageValidator() const -{ - return validator; -} - void AbstractBtMessage::setBtContext(const SharedHandle<BtContext>& btContext) { this->btContext = btContext; } -SharedHandle<BtContext> AbstractBtMessage::getBtContext() const -{ - return btContext; -} - void AbstractBtMessage::setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage) { this->pieceStorage = pieceStorage; @@ -118,9 +103,4 @@ void AbstractBtMessage::setBtRequestFactory(const WeakHandle<BtRequestFactory>& this->requestFactory = factory; } -const std::string& AbstractBtMessage::getName() const -{ - return _name; -} - } // namespace aria2 diff --git a/src/AbstractBtMessage.h b/src/AbstractBtMessage.h index b3d00d6c..16fa4013 100644 --- a/src/AbstractBtMessage.h +++ b/src/AbstractBtMessage.h @@ -36,6 +36,7 @@ #define _D_ABSTRACT_BT_MESSAGE_H_ #include "BtMessage.h" + #include <deque> namespace aria2 { @@ -113,7 +114,10 @@ public: this->cuid = cuid; } - SharedHandle<Peer> getPeer() const; + const SharedHandle<Peer>& getPeer() const + { + return peer; + } void setPeer(const SharedHandle<Peer>& peer); @@ -133,11 +137,12 @@ public: void setBtMessageValidator(const SharedHandle<BtMessageValidator>& validator); - SharedHandle<BtMessageValidator> getBtMessageValidator() const; - void setBtContext(const SharedHandle<BtContext>& btContext); - SharedHandle<BtContext> getBtContext() const; + const SharedHandle<BtContext>& getBtContext() const + { + return btContext; + } void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage); @@ -149,7 +154,10 @@ public: void setBtRequestFactory(const WeakHandle<BtRequestFactory>& factory); - const std::string& getName() const; + const std::string& getName() const + { + return _name; + } }; typedef SharedHandle<AbstractBtMessage> AbstractBtMessageHandle; diff --git a/src/AbstractSingleDiskAdaptor.cc b/src/AbstractSingleDiskAdaptor.cc index 698f9e3a..df61c928 100644 --- a/src/AbstractSingleDiskAdaptor.cc +++ b/src/AbstractSingleDiskAdaptor.cc @@ -143,19 +143,9 @@ void AbstractSingleDiskAdaptor::setDiskWriter(const DiskWriterHandle& diskWriter this->diskWriter = diskWriter; } -DiskWriterHandle AbstractSingleDiskAdaptor::getDiskWriter() const -{ - return diskWriter; -} - void AbstractSingleDiskAdaptor::setTotalLength(const uint64_t& totalLength) { this->totalLength = totalLength; } -uint64_t AbstractSingleDiskAdaptor::getTotalLength() const -{ - return totalLength; -} - } // namespace aria2 diff --git a/src/AbstractSingleDiskAdaptor.h b/src/AbstractSingleDiskAdaptor.h index 9ccb2734..559c863b 100644 --- a/src/AbstractSingleDiskAdaptor.h +++ b/src/AbstractSingleDiskAdaptor.h @@ -91,11 +91,17 @@ public: void setDiskWriter(const SharedHandle<DiskWriter>& diskWriter); - SharedHandle<DiskWriter> getDiskWriter() const; + const SharedHandle<DiskWriter>& getDiskWriter() const + { + return diskWriter; + } void setTotalLength(const uint64_t& totalLength); - uint64_t getTotalLength() const; + uint64_t getTotalLength() const + { + return totalLength; + } }; } // namespace aria2 diff --git a/src/AsyncNameResolver.cc b/src/AsyncNameResolver.cc index 0d7e0447..9546b6c8 100644 --- a/src/AsyncNameResolver.cc +++ b/src/AsyncNameResolver.cc @@ -81,21 +81,6 @@ void AsyncNameResolver::resolve(const std::string& name) ares_gethostbyname(channel, name.c_str(), AF_INET, callback, this); } -const std::deque<std::string>& AsyncNameResolver::getResolvedAddresses() const -{ - return _resolvedAddresses; -} - -const std::string& AsyncNameResolver::getError() const -{ - return error; -} - -AsyncNameResolver::STATUS AsyncNameResolver::getStatus() const -{ - return status; -} - int AsyncNameResolver::getFds(fd_set* rfdsPtr, fd_set* wfdsPtr) const { return ares_fds(channel, rfdsPtr, wfdsPtr); @@ -135,9 +120,4 @@ void AsyncNameResolver::reset() ares_init(&channel); } -const std::string& AsyncNameResolver::getHostname() const -{ - return _hostname; -} - } // namespace aria2 diff --git a/src/AsyncNameResolver.h b/src/AsyncNameResolver.h index acbe178c..37cedf15 100644 --- a/src/AsyncNameResolver.h +++ b/src/AsyncNameResolver.h @@ -79,11 +79,20 @@ public: void resolve(const std::string& name); - const std::deque<std::string>& getResolvedAddresses() const; + const std::deque<std::string>& getResolvedAddresses() const + { + return _resolvedAddresses; + } - const std::string& getError() const; + const std::string& getError() const + { + return error; + } - STATUS getStatus() const; + STATUS getStatus() const + { + return status; + } int getFds(fd_set* rfdsPtr, fd_set* wfdsPtr) const; @@ -103,7 +112,11 @@ public: void reset(); - const std::string& getHostname() const; + const std::string& getHostname() const + { + return _hostname; + } + }; } // namespace aria2 diff --git a/src/BNode.cc b/src/BNode.cc index d0489935..6ce9d3b9 100644 --- a/src/BNode.cc +++ b/src/BNode.cc @@ -52,26 +52,6 @@ BNode::~BNode() delete _right; } -SharedHandle<DHTBucket> BNode::getBucket() const -{ - return _bucket; -} - -BNode* BNode::getLeft() const -{ - return _left; -} - -BNode* BNode::getRight() const -{ - return _right; -} - -BNode* BNode::getUp() const -{ - return _up; -} - void BNode::setLeft(BNode* left) { _left = left; diff --git a/src/BNode.h b/src/BNode.h index c8b692df..27c95d4d 100644 --- a/src/BNode.h +++ b/src/BNode.h @@ -59,19 +59,31 @@ public: ~BNode(); - SharedHandle<DHTBucket> getBucket() const; + const SharedHandle<DHTBucket>& getBucket() const + { + return _bucket; + } void setBucket(const SharedHandle<DHTBucket>& bucket); - BNode* getLeft() const; + BNode* getLeft() const + { + return _left; + } void setLeft(BNode* left); - BNode* getRight() const; + BNode* getRight() const + { + return _right; + } void setRight(BNode* right); - BNode* getUp() const; + BNode* getUp() const + { + return _up; + } void setUp(BNode* up); diff --git a/src/BitfieldMan.cc b/src/BitfieldMan.cc index b733e044..1fbfcb8b 100644 --- a/src/BitfieldMan.cc +++ b/src/BitfieldMan.cc @@ -142,16 +142,6 @@ BitfieldMan::~BitfieldMan() { delete [] filterBitfield; } -size_t BitfieldMan::getBlockLength() const -{ - return blockLength; -} - -size_t BitfieldMan::getLastBlockLength() const -{ - return totalLength-blockLength*(blocks-1); -} - size_t BitfieldMan::getBlockLength(size_t index) const { if(index == blocks-1) { @@ -452,14 +442,6 @@ size_t BitfieldMan::countMissingBlockNow() const { } } -size_t BitfieldMan::countFilteredBlock() const { - return cachedNumFilteredBlock; -} - -size_t BitfieldMan::countBlock() const { - return blocks; -} - size_t BitfieldMan::countFilteredBlockNow() const { if(filterEnabled) { return bitfield::countSetBit(filterBitfield, blocks); @@ -468,11 +450,6 @@ size_t BitfieldMan::countFilteredBlockNow() const { } } -size_t BitfieldMan::getMaxIndex() const -{ - return blocks-1; -} - bool BitfieldMan::setBitInternal(unsigned char* bitfield, size_t index, bool on) { if(blocks <= index) { return false; } unsigned char mask = 128 >> index%8; @@ -552,16 +529,6 @@ void BitfieldMan::setBitfield(const unsigned char* bitfield, size_t bitfieldLeng updateCache(); } -const unsigned char* BitfieldMan::getBitfield() const -{ - return bitfield; -} - -size_t BitfieldMan::getBitfieldLength() const -{ - return bitfieldLength; -} - void BitfieldMan::clearAllBit() { memset(this->bitfield, 0, this->bitfieldLength); updateCache(); @@ -627,14 +594,6 @@ void BitfieldMan::clearFilter() { updateCache(); } -bool BitfieldMan::isFilterEnabled() const { - return filterEnabled; -} - -uint64_t BitfieldMan::getFilteredTotalLength() const { - return cachedFilteredTotalLength; -} - uint64_t BitfieldMan::getFilteredTotalLengthNow() const { if(!filterBitfield) { return 0; @@ -677,18 +636,10 @@ uint64_t BitfieldMan::getCompletedLength(bool useFilter) const { return completedLength; } -uint64_t BitfieldMan::getCompletedLength() const { - return cachedCompletedLength; -} - uint64_t BitfieldMan::getCompletedLengthNow() const { return getCompletedLength(false); } -uint64_t BitfieldMan::getFilteredCompletedLength() const { - return cachedFilteredComletedLength; -} - uint64_t BitfieldMan::getFilteredCompletedLengthNow() const { return getCompletedLength(true); } @@ -769,9 +720,4 @@ void BitfieldMan::setRandomizer(const SharedHandle<Randomizer>& randomizer) this->randomizer = randomizer; } -SharedHandle<Randomizer> BitfieldMan::getRandomizer() const -{ - return randomizer; -} - } // namespace aria2 diff --git a/src/BitfieldMan.h b/src/BitfieldMan.h index 8d51df76..3287e2c0 100644 --- a/src/BitfieldMan.h +++ b/src/BitfieldMan.h @@ -111,9 +111,15 @@ public: BitfieldMan& operator=(const BitfieldMan& bitfieldMan); - size_t getBlockLength() const; + size_t getBlockLength() const + { + return blockLength; + } - size_t getLastBlockLength() const; + size_t getLastBlockLength() const + { + return totalLength-blockLength*(blocks-1); + } size_t getBlockLength(size_t index) const; @@ -195,22 +201,38 @@ public: bool isAllBitSet() const; - const unsigned char* getBitfield() const; + const unsigned char* getBitfield() const + { + return bitfield; + } - size_t getBitfieldLength() const; + size_t getBitfieldLength() const + { + return bitfieldLength; + } /** * affected by filter */ - size_t countFilteredBlock() const; + size_t countFilteredBlock() const + { + return cachedNumFilteredBlock; + } + + size_t countBlock() const + { + return blocks; + } - size_t countBlock() const; /** * affected by filter */ size_t countFilteredBlockNow() const; - size_t getMaxIndex() const; + size_t getMaxIndex() const + { + return blocks-1; + } void setBitfield(const unsigned char* bitfield, size_t bitfieldLength); @@ -228,24 +250,38 @@ public: void enableFilter(); void disableFilter(); - bool isFilterEnabled() const; + bool isFilterEnabled() const + { + return filterEnabled; + } + /** * affected by filter */ - uint64_t getFilteredTotalLength() const; + uint64_t getFilteredTotalLength() const + { + return cachedFilteredTotalLength; + } + /** * affected by filter */ uint64_t getFilteredTotalLengthNow() const; - uint64_t getCompletedLength() const; + uint64_t getCompletedLength() const + { + return cachedCompletedLength; + } uint64_t getCompletedLengthNow() const; /** * affected by filter */ - uint64_t getFilteredCompletedLength() const; + uint64_t getFilteredCompletedLength() const + { + return cachedFilteredComletedLength; + } /** * affected by filter */ @@ -253,7 +289,10 @@ public: void setRandomizer(const SharedHandle<Randomizer>& randomizer); - SharedHandle<Randomizer> getRandomizer() const; + const SharedHandle<Randomizer>& getRandomizer() const + { + return randomizer; + } void updateCache(); diff --git a/src/BtAbortOutstandingRequestEvent.h b/src/BtAbortOutstandingRequestEvent.h index a8b6fdb3..257d41f6 100644 --- a/src/BtAbortOutstandingRequestEvent.h +++ b/src/BtAbortOutstandingRequestEvent.h @@ -48,7 +48,7 @@ public: BtAbortOutstandingRequestEvent(const SharedHandle<Piece>& piece): piece(piece) {} - SharedHandle<Piece> getPiece() const { return piece; } + const SharedHandle<Piece>& getPiece() const { return piece; } }; } // namespace aria2 diff --git a/src/BtExtendedMessage.cc b/src/BtExtendedMessage.cc index 0256d9f3..2141cac1 100644 --- a/src/BtExtendedMessage.cc +++ b/src/BtExtendedMessage.cc @@ -116,9 +116,4 @@ void BtExtendedMessage::doReceivedAction() } } -ExtensionMessageHandle BtExtendedMessage::getExtensionMessage() const -{ - return _extensionMessage; -} - } // namespace aria2 diff --git a/src/BtExtendedMessage.h b/src/BtExtendedMessage.h index 63912f92..fdec5f43 100644 --- a/src/BtExtendedMessage.h +++ b/src/BtExtendedMessage.h @@ -78,7 +78,11 @@ public: virtual std::string toString() const; - SharedHandle<ExtensionMessage> getExtensionMessage() const; + const SharedHandle<ExtensionMessage>& getExtensionMessage() const + { + return _extensionMessage; + } + }; } // namespace aria2 diff --git a/src/BtSeederStateChoke.cc b/src/BtSeederStateChoke.cc index 361d0db4..afda7f34 100644 --- a/src/BtSeederStateChoke.cc +++ b/src/BtSeederStateChoke.cc @@ -77,16 +77,6 @@ BtSeederStateChoke::PeerEntry::operator<(const PeerEntry& rhs) const } } -SharedHandle<Peer> BtSeederStateChoke::PeerEntry::getPeer() const -{ - return _peer; -} - -unsigned int BtSeederStateChoke::PeerEntry::getUploadSpeed() const -{ - return _uploadSpeed; -} - void BtSeederStateChoke::PeerEntry::disableOptUnchoking() { _peer->optUnchoking(false); @@ -173,9 +163,4 @@ BtSeederStateChoke::executeChoke(const std::deque<SharedHandle<Peer> >& peerSet) } } -const Time& BtSeederStateChoke::getLastRound() const -{ - return _lastRound; -} - } // namespace aria2 diff --git a/src/BtSeederStateChoke.h b/src/BtSeederStateChoke.h index c0ff7f5e..2a777cad 100644 --- a/src/BtSeederStateChoke.h +++ b/src/BtSeederStateChoke.h @@ -69,9 +69,9 @@ private: bool operator<(const PeerEntry& rhs) const; - SharedHandle<Peer> getPeer() const; + const SharedHandle<Peer>& getPeer() const { return _peer; } - unsigned int getUploadSpeed() const; + unsigned int getUploadSpeed() const { return _uploadSpeed; } void disableOptUnchoking(); }; @@ -87,7 +87,7 @@ public: void executeChoke(const std::deque<SharedHandle<Peer> >& peerSet); - const Time& getLastRound() const; + const Time& getLastRound() const { return _lastRound; } }; } // namespace aria2 diff --git a/src/Cookie.cc b/src/Cookie.cc index 284d6aa1..635bd2e6 100644 --- a/src/Cookie.cc +++ b/src/Cookie.cc @@ -206,41 +206,6 @@ bool Cookie::isExpired() const return !_expiry == 0 && Time().getTime() >= _expiry; } -const std::string& Cookie::getName() const -{ - return _name; -} - -const std::string& Cookie::getValue() const -{ - return _value; -} - -const std::string& Cookie::getPath() const -{ - return _path; -} - -const std::string& Cookie::getDomain() const -{ - return _domain; -} - -time_t Cookie::getExpiry() const -{ - return _expiry; -} - -bool Cookie::isSecureCookie() const -{ - return _secure; -} - -bool Cookie::isSessionCookie() const -{ - return _expiry == 0; -} - std::string Cookie::toNsCookieFormat() const { std::stringstream ss; diff --git a/src/Cookie.h b/src/Cookie.h index 83150dbd..c355bfba 100644 --- a/src/Cookie.h +++ b/src/Cookie.h @@ -91,19 +91,40 @@ public: bool isExpired() const; - const std::string& getName() const; - - const std::string& getValue() const; - - const std::string& getPath() const; - - const std::string& getDomain() const; - - time_t getExpiry() const; - - bool isSecureCookie() const; - - bool isSessionCookie() const; + const std::string& getName() const + { + return _name; + } + + const std::string& getValue() const + { + return _value; + } + + const std::string& getPath() const + { + return _path; + } + + const std::string& getDomain() const + { + return _domain; + } + + time_t getExpiry() const + { + return _expiry; + } + + bool isSecureCookie() const + { + return _secure; + } + + bool isSessionCookie() const + { + return _expiry == 0; + } std::string toNsCookieFormat() const; }; diff --git a/src/DHTBucket.cc b/src/DHTBucket.cc index 3cca03b5..775fba82 100644 --- a/src/DHTBucket.cc +++ b/src/DHTBucket.cc @@ -212,16 +212,6 @@ SharedHandle<DHTBucket> DHTBucket::split() return rBucket; } -size_t DHTBucket::countNode() const -{ - return _nodes.size(); -} - -const std::deque<SharedHandle<DHTNode> >& DHTBucket::getNodes() const -{ - return _nodes; -} - void DHTBucket::getGoodNodes(std::deque<SharedHandle<DHTNode> >& goodNodes) const { goodNodes = _nodes; @@ -283,9 +273,4 @@ SharedHandle<DHTNode> DHTBucket::getLRUQuestionableNode() const } } -const std::deque<SharedHandle<DHTNode> >& DHTBucket::getCachedNodes() const -{ - return _cachedNodes; -} - } // namespace aria2 diff --git a/src/DHTBucket.h b/src/DHTBucket.h index 1c4856e3..57378b80 100644 --- a/src/DHTBucket.h +++ b/src/DHTBucket.h @@ -113,9 +113,15 @@ public: return _min; } - size_t countNode() const; + size_t countNode() const + { + return _nodes.size(); + } - const std::deque<SharedHandle<DHTNode> >& getNodes() const; + const std::deque<SharedHandle<DHTNode> >& getNodes() const + { + return _nodes; + } void getGoodNodes(std::deque<SharedHandle<DHTNode> >& nodes) const; @@ -139,7 +145,11 @@ public: SharedHandle<DHTNode> getLRUQuestionableNode() const; - const std::deque<SharedHandle<DHTNode> >& getCachedNodes() const; + const std::deque<SharedHandle<DHTNode> >& getCachedNodes() const + { + return _cachedNodes; + } + }; } // namespace aria2 diff --git a/src/DHTConnectionImpl.cc b/src/DHTConnectionImpl.cc index 35ff0f37..e84b7c5d 100644 --- a/src/DHTConnectionImpl.cc +++ b/src/DHTConnectionImpl.cc @@ -107,9 +107,4 @@ ssize_t DHTConnectionImpl::sendMessage(const unsigned char* data, size_t len, return _socket->writeData(data, len, host, port); } -SharedHandle<SocketCore> DHTConnectionImpl::getSocket() const -{ - return _socket; -} - } // namespace aria2 diff --git a/src/DHTConnectionImpl.h b/src/DHTConnectionImpl.h index d34c17b7..a46af47a 100644 --- a/src/DHTConnectionImpl.h +++ b/src/DHTConnectionImpl.h @@ -77,7 +77,10 @@ public: virtual ssize_t sendMessage(const unsigned char* data, size_t len, const std::string& host, uint16_t port); - SharedHandle<SocketCore> getSocket() const; + const SharedHandle<SocketCore>& getSocket() const + { + return _socket; + } }; } // namespace aria2 diff --git a/src/DHTFindNodeReplyMessage.cc b/src/DHTFindNodeReplyMessage.cc index 360b43e3..99831796 100644 --- a/src/DHTFindNodeReplyMessage.cc +++ b/src/DHTFindNodeReplyMessage.cc @@ -96,11 +96,6 @@ std::string DHTFindNodeReplyMessage::getMessageType() const void DHTFindNodeReplyMessage::validate() const {} -const std::deque<SharedHandle<DHTNode> >& DHTFindNodeReplyMessage::getClosestKNodes() const -{ - return _closestKNodes; -} - void DHTFindNodeReplyMessage::setClosestKNodes(const std::deque<SharedHandle<DHTNode> >& closestKNodes) { _closestKNodes = closestKNodes; diff --git a/src/DHTFindNodeReplyMessage.h b/src/DHTFindNodeReplyMessage.h index f188c0f3..0749d0e7 100644 --- a/src/DHTFindNodeReplyMessage.h +++ b/src/DHTFindNodeReplyMessage.h @@ -60,7 +60,10 @@ public: virtual void validate() const; - const std::deque<SharedHandle<DHTNode> >& getClosestKNodes() const; + const std::deque<SharedHandle<DHTNode> >& getClosestKNodes() const + { + return _closestKNodes; + } void setClosestKNodes(const std::deque<SharedHandle<DHTNode> >& closestKNodes); diff --git a/src/DHTGetPeersReplyMessage.cc b/src/DHTGetPeersReplyMessage.cc index 0e46cf4a..b914e83c 100644 --- a/src/DHTGetPeersReplyMessage.cc +++ b/src/DHTGetPeersReplyMessage.cc @@ -112,21 +112,11 @@ std::string DHTGetPeersReplyMessage::getMessageType() const void DHTGetPeersReplyMessage::validate() const {} -const std::deque<SharedHandle<DHTNode> >& DHTGetPeersReplyMessage::getClosestKNodes() const -{ - return _closestKNodes; -} - void DHTGetPeersReplyMessage::setClosestKNodes(const std::deque<SharedHandle<DHTNode> >& closestKNodes) { _closestKNodes = closestKNodes; } -const std::deque<SharedHandle<Peer> >& DHTGetPeersReplyMessage::getValues() const -{ - return _values; -} - void DHTGetPeersReplyMessage::setValues(const std::deque<SharedHandle<Peer> >& peers) { _values = peers; diff --git a/src/DHTGetPeersReplyMessage.h b/src/DHTGetPeersReplyMessage.h index 62908154..14c78391 100644 --- a/src/DHTGetPeersReplyMessage.h +++ b/src/DHTGetPeersReplyMessage.h @@ -70,9 +70,15 @@ public: virtual void validate() const; - const std::deque<SharedHandle<DHTNode> >& getClosestKNodes() const; + const std::deque<SharedHandle<DHTNode> >& getClosestKNodes() const + { + return _closestKNodes; + } - const std::deque<SharedHandle<Peer> >& getValues() const; + const std::deque<SharedHandle<Peer> >& getValues() const + { + return _values; + } void setClosestKNodes(const std::deque<SharedHandle<DHTNode> >& closestKNodes); diff --git a/src/DHTInteractionCommand.cc b/src/DHTInteractionCommand.cc index 7422d2bf..ec86d7ae 100644 --- a/src/DHTInteractionCommand.cc +++ b/src/DHTInteractionCommand.cc @@ -44,6 +44,7 @@ #include "RequestGroupMan.h" #include "Logger.h" #include "DHTMessageCallback.h" +#include "DHTNode.h" namespace aria2 { diff --git a/src/DHTMessage.cc b/src/DHTMessage.cc index 0ecc2fe2..09dcccba 100644 --- a/src/DHTMessage.cc +++ b/src/DHTMessage.cc @@ -63,14 +63,4 @@ void DHTMessage::generateTransactionID() _transactionID = std::string(&tid[0], &tid[DHT_TRANSACTION_ID_LENGTH]); } -SharedHandle<DHTNode> DHTMessage::getLocalNode() const -{ - return _localNode; -} - -SharedHandle<DHTNode> DHTMessage::getRemoteNode() const -{ - return _remoteNode; -} - } // namespace aria2 diff --git a/src/DHTMessage.h b/src/DHTMessage.h index ae7bfd28..a009562d 100644 --- a/src/DHTMessage.h +++ b/src/DHTMessage.h @@ -67,9 +67,15 @@ public: return _transactionID; } - SharedHandle<DHTNode> getLocalNode() const; + const SharedHandle<DHTNode>& getLocalNode() const + { + return _localNode; + } - SharedHandle<DHTNode> getRemoteNode() const; + const SharedHandle<DHTNode>& getRemoteNode() const + { + return _remoteNode; + } virtual void doReceivedAction() = 0; diff --git a/src/DHTMessageDispatcherImpl.cc b/src/DHTMessageDispatcherImpl.cc index e06456a1..d847595c 100644 --- a/src/DHTMessageDispatcherImpl.cc +++ b/src/DHTMessageDispatcherImpl.cc @@ -42,6 +42,7 @@ #include "Logger.h" #include "DHTConstants.h" #include "StringFormat.h" +#include "DHTNode.h" namespace aria2 { diff --git a/src/DHTMessageEntry.cc b/src/DHTMessageEntry.cc index 5667ed4b..73efbd55 100644 --- a/src/DHTMessageEntry.cc +++ b/src/DHTMessageEntry.cc @@ -35,6 +35,7 @@ #include "DHTMessageEntry.h" #include "DHTMessage.h" #include "DHTMessageCallback.h" +#include "DHTNode.h" namespace aria2 { diff --git a/src/DHTMessageReceiver.cc b/src/DHTMessageReceiver.cc index 3f1e1123..4a7b1180 100644 --- a/src/DHTMessageReceiver.cc +++ b/src/DHTMessageReceiver.cc @@ -143,16 +143,6 @@ DHTMessageReceiver::handleUnknownMessage(const unsigned char* data, return m; } -SharedHandle<DHTConnection> DHTMessageReceiver::getConnection() const -{ - return _connection; -} - -SharedHandle<DHTMessageTracker> DHTMessageReceiver::getMessageTracker() const -{ - return _tracker; -} - void DHTMessageReceiver::setConnection(const SharedHandle<DHTConnection>& connection) { _connection = connection; diff --git a/src/DHTMessageReceiver.h b/src/DHTMessageReceiver.h index 20b2143e..85924c81 100644 --- a/src/DHTMessageReceiver.h +++ b/src/DHTMessageReceiver.h @@ -72,9 +72,15 @@ public: void handleTimeout(); - SharedHandle<DHTConnection> getConnection() const; - - SharedHandle<DHTMessageTracker> getMessageTracker() const; + const SharedHandle<DHTConnection>& getConnection() const + { + return _connection; + } + + const SharedHandle<DHTMessageTracker>& getMessageTracker() const + { + return _tracker; + } void setConnection(const SharedHandle<DHTConnection>& connection); diff --git a/src/DHTMessageTrackerEntry.cc b/src/DHTMessageTrackerEntry.cc index 25204e17..95e5ca25 100644 --- a/src/DHTMessageTrackerEntry.cc +++ b/src/DHTMessageTrackerEntry.cc @@ -75,14 +75,4 @@ bool DHTMessageTrackerEntry::match(const std::string& transactionID, const std:: return false; } -SharedHandle<DHTMessageCallback> DHTMessageTrackerEntry::getCallback() const -{ - return _callback; -} - -SharedHandle<DHTNode> DHTMessageTrackerEntry::getTargetNode() const -{ - return _targetNode; -} - } // namespace aria2 diff --git a/src/DHTMessageTrackerEntry.h b/src/DHTMessageTrackerEntry.h index 25d63ebe..dc46203e 100644 --- a/src/DHTMessageTrackerEntry.h +++ b/src/DHTMessageTrackerEntry.h @@ -72,14 +72,20 @@ public: bool match(const std::string& transactionID, const std::string& ipaddr, uint16_t port) const; - SharedHandle<DHTNode> getTargetNode() const; + const SharedHandle<DHTNode>& getTargetNode() const + { + return _targetNode; + } const std::string& getMessageType() const { return _messageType; } - SharedHandle<DHTMessageCallback> getCallback() const; + const SharedHandle<DHTMessageCallback>& getCallback() const + { + return _callback; + } int64_t getElapsedMillis() const { diff --git a/src/DHTPeerAnnounceEntry.cc b/src/DHTPeerAnnounceEntry.cc index 4a092f4c..e05806ba 100644 --- a/src/DHTPeerAnnounceEntry.cc +++ b/src/DHTPeerAnnounceEntry.cc @@ -76,11 +76,6 @@ size_t DHTPeerAnnounceEntry::countPeerAddrEntry() const return _peerAddrEntries.size(); } -const std::deque<PeerAddrEntry>& DHTPeerAnnounceEntry::getPeerAddrEntries() const -{ - return _peerAddrEntries; -} - class FindStaleEntry { private: time_t _timeout; diff --git a/src/DHTPeerAnnounceEntry.h b/src/DHTPeerAnnounceEntry.h index f40f1555..d9f66239 100644 --- a/src/DHTPeerAnnounceEntry.h +++ b/src/DHTPeerAnnounceEntry.h @@ -73,7 +73,10 @@ public: size_t countPeerAddrEntry() const; - const std::deque<PeerAddrEntry>& getPeerAddrEntries() const; + const std::deque<PeerAddrEntry>& getPeerAddrEntries() const + { + return _peerAddrEntries; + } void removeStalePeerAddrEntry(time_t timeout); diff --git a/src/DHTPeerLookupTask.cc b/src/DHTPeerLookupTask.cc index 392d4a1d..6869498a 100644 --- a/src/DHTPeerLookupTask.cc +++ b/src/DHTPeerLookupTask.cc @@ -102,11 +102,6 @@ void DHTPeerLookupTask::onFinish() } } -const std::deque<SharedHandle<Peer> >& DHTPeerLookupTask::getPeers() const -{ - return _peers; -} - void DHTPeerLookupTask::setBtRuntime(const SharedHandle<BtRuntime>& btRuntime) { _btRuntime = btRuntime; diff --git a/src/DHTPeerLookupTask.h b/src/DHTPeerLookupTask.h index b01df29c..261e61c3 100644 --- a/src/DHTPeerLookupTask.h +++ b/src/DHTPeerLookupTask.h @@ -68,7 +68,10 @@ public: virtual void onFinish(); - const std::deque<SharedHandle<Peer> >& getPeers() const; + const std::deque<SharedHandle<Peer> >& getPeers() const + { + return _peers; + } void setBtRuntime(const SharedHandle<BtRuntime>& btRuntime); diff --git a/src/DHTRoutingTableDeserializer.cc b/src/DHTRoutingTableDeserializer.cc index e2c2ae15..c60172d4 100644 --- a/src/DHTRoutingTableDeserializer.cc +++ b/src/DHTRoutingTableDeserializer.cc @@ -56,16 +56,6 @@ DHTRoutingTableDeserializer::DHTRoutingTableDeserializer() {} DHTRoutingTableDeserializer::~DHTRoutingTableDeserializer() {} -SharedHandle<DHTNode> DHTRoutingTableDeserializer::getLocalNode() const -{ - return _localNode; -} - -const std::deque<SharedHandle<DHTNode> >& DHTRoutingTableDeserializer::getNodes() const -{ - return _nodes; -} - static std::istream& readBytes(unsigned char* buf, size_t buflen, std::istream& in, size_t readlen) { diff --git a/src/DHTRoutingTableDeserializer.h b/src/DHTRoutingTableDeserializer.h index 8998dba6..712d8b36 100644 --- a/src/DHTRoutingTableDeserializer.h +++ b/src/DHTRoutingTableDeserializer.h @@ -57,9 +57,15 @@ public: ~DHTRoutingTableDeserializer(); - SharedHandle<DHTNode> getLocalNode() const; + const SharedHandle<DHTNode>& getLocalNode() const + { + return _localNode; + } - const std::deque<SharedHandle<DHTNode> >& getNodes() const; + const std::deque<SharedHandle<DHTNode> >& getNodes() const + { + return _nodes; + } Time getSerializedTime() const { diff --git a/src/DefaultBtAnnounce.cc b/src/DefaultBtAnnounce.cc index 8eaecb20..e68ffb13 100644 --- a/src/DefaultBtAnnounce.cc +++ b/src/DefaultBtAnnounce.cc @@ -281,31 +281,16 @@ void DefaultBtAnnounce::setBtRuntime(const BtRuntimeHandle& btRuntime) this->btRuntime = btRuntime; } -BtRuntimeHandle DefaultBtAnnounce::getBtRuntime() const -{ - return btRuntime; -} - void DefaultBtAnnounce::setPieceStorage(const PieceStorageHandle& pieceStorage) { this->pieceStorage = pieceStorage; } -PieceStorageHandle DefaultBtAnnounce::getPieceStorage() const -{ - return pieceStorage; -} - void DefaultBtAnnounce::setPeerStorage(const PeerStorageHandle& peerStorage) { this->peerStorage = peerStorage; } -PeerStorageHandle DefaultBtAnnounce::getPeerStorage() const -{ - return peerStorage; -} - void DefaultBtAnnounce::overrideMinInterval(time_t interval) { minInterval = interval; diff --git a/src/DefaultBtAnnounce.h b/src/DefaultBtAnnounce.h index 053bb23a..a561bbec 100644 --- a/src/DefaultBtAnnounce.h +++ b/src/DefaultBtAnnounce.h @@ -76,15 +76,24 @@ public: void setBtRuntime(const SharedHandle<BtRuntime>& btRuntime); - SharedHandle<BtRuntime> getBtRuntime() const; + const SharedHandle<BtRuntime>& getBtRuntime() const + { + return btRuntime; + } void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage); - SharedHandle<PieceStorage> getPieceStorage() const; + const SharedHandle<PieceStorage>& getPieceStorage() const + { + return pieceStorage; + } void setPeerStorage(const SharedHandle<PeerStorage>& peerStorage); - SharedHandle<PeerStorage> getPeerStorage() const; + const SharedHandle<PeerStorage>& getPeerStorage() const + { + return peerStorage; + } bool isDefaultAnnounceReady(); diff --git a/src/DefaultBtMessageDispatcher.cc b/src/DefaultBtMessageDispatcher.cc index 236d1c87..1adc3565 100644 --- a/src/DefaultBtMessageDispatcher.cc +++ b/src/DefaultBtMessageDispatcher.cc @@ -407,17 +407,6 @@ size_t DefaultBtMessageDispatcher::countOutstandingUpload() mem_fun_sh(&BtMessage::isUploading)); } -const std::deque<SharedHandle<BtMessage> >& -DefaultBtMessageDispatcher::getMessageQueue() -{ - return messageQueue; -} - -const std::deque<RequestSlot>& DefaultBtMessageDispatcher::getRequestSlots() -{ - return requestSlots; -} - void DefaultBtMessageDispatcher::setPeer(const SharedHandle<Peer>& peer) { this->peer = peer; diff --git a/src/DefaultBtMessageDispatcher.h b/src/DefaultBtMessageDispatcher.h index b9721541..2b3cc2a3 100644 --- a/src/DefaultBtMessageDispatcher.h +++ b/src/DefaultBtMessageDispatcher.h @@ -104,9 +104,15 @@ public: virtual size_t countOutstandingUpload(); - const std::deque<SharedHandle<BtMessage> >& getMessageQueue(); + const std::deque<SharedHandle<BtMessage> >& getMessageQueue() const + { + return messageQueue; + } - const RequestSlots& getRequestSlots(); + const RequestSlots& getRequestSlots() const + { + return requestSlots; + } void setPeer(const SharedHandle<Peer>& peer); diff --git a/src/DefaultBtRequestFactory.cc b/src/DefaultBtRequestFactory.cc index 8330efeb..f14462f1 100644 --- a/src/DefaultBtRequestFactory.cc +++ b/src/DefaultBtRequestFactory.cc @@ -235,11 +235,6 @@ void DefaultBtRequestFactory::getTargetPieceIndexes mem_fun_sh(&Piece::getIndex)); } -std::deque<SharedHandle<Piece> >& DefaultBtRequestFactory::getTargetPieces() -{ - return pieces; -} - void DefaultBtRequestFactory::setBtContext(const SharedHandle<BtContext>& btContext) { this->btContext = btContext; diff --git a/src/DefaultBtRequestFactory.h b/src/DefaultBtRequestFactory.h index 89e1096c..a4000368 100644 --- a/src/DefaultBtRequestFactory.h +++ b/src/DefaultBtRequestFactory.h @@ -86,7 +86,10 @@ public: virtual void getTargetPieceIndexes(std::deque<size_t>& indexes) const; - std::deque<SharedHandle<Piece> >& getTargetPieces(); + std::deque<SharedHandle<Piece> >& getTargetPieces() + { + return pieces; + } void setCuid(int32_t cuid) { diff --git a/src/DiskAdaptor.cc b/src/DiskAdaptor.cc index 3eee6b58..38e0b3ea 100644 --- a/src/DiskAdaptor.cc +++ b/src/DiskAdaptor.cc @@ -51,9 +51,4 @@ void DiskAdaptor::setFileEntries(const FileEntries& fileEntries) { this->fileEntries = fileEntries; } -const FileEntries& DiskAdaptor::getFileEntries() const -{ - return fileEntries; -} - } // namespace aria2 diff --git a/src/DiskAdaptor.h b/src/DiskAdaptor.h index 0d41c596..6e59826a 100644 --- a/src/DiskAdaptor.h +++ b/src/DiskAdaptor.h @@ -75,7 +75,10 @@ public: void setFileEntries(const std::deque<SharedHandle<FileEntry> >& fileEntries); - const std::deque<SharedHandle<FileEntry> >& getFileEntries() const; + const std::deque<SharedHandle<FileEntry> >& getFileEntries() const + { + return fileEntries; + } virtual SharedHandle<FileAllocationIterator> fileAllocationIterator() = 0; diff --git a/src/DownloadContext.cc b/src/DownloadContext.cc index 1426b001..98811952 100644 --- a/src/DownloadContext.cc +++ b/src/DownloadContext.cc @@ -43,11 +43,6 @@ DownloadContext::DownloadContext(): DownloadContext::~DownloadContext() {} -const std::string& DownloadContext::getDir() const -{ - return _dir; -} - void DownloadContext::setDir(const std::string& dir) { _dir = dir; diff --git a/src/DownloadContext.h b/src/DownloadContext.h index a07a42c7..a73aa236 100644 --- a/src/DownloadContext.h +++ b/src/DownloadContext.h @@ -97,7 +97,10 @@ public: */ virtual std::string getActualBasePath() const = 0; - const std::string& getDir() const; + const std::string& getDir() const + { + return _dir; + } void setDir(const std::string& dir); diff --git a/src/DownloadEngine.cc b/src/DownloadEngine.cc index b65a37bb..13767dc4 100644 --- a/src/DownloadEngine.cc +++ b/src/DownloadEngine.cc @@ -267,11 +267,6 @@ void DownloadEngine::addRoutineCommand(Command* command) _routineCommands.push_back(command); } -SharedHandle<CookieStorage> DownloadEngine::getCookieStorage() const -{ - return _cookieStorage; -} - void DownloadEngine::poolSocket(const std::string& ipaddr, uint16_t port, const SocketPoolEntry& entry) @@ -428,11 +423,6 @@ DownloadEngine::popPooledSocket return s; } -SharedHandle<BtRegistry> DownloadEngine::getBtRegistry() const -{ - return _btRegistry; -} - DownloadEngine::SocketPoolEntry::SocketPoolEntry (const SharedHandle<SocketCore>& socket, const std::map<std::string, std::string>& options, @@ -448,17 +438,6 @@ bool DownloadEngine::SocketPoolEntry::isTimeout() const return _registeredTime.elapsed(_timeout); } -SharedHandle<SocketCore> DownloadEngine::SocketPoolEntry::getSocket() const -{ - return _socket; -} - -const std::map<std::string, std::string>& -DownloadEngine::SocketPoolEntry::getOptions() const -{ - return _options; -} - cuid_t DownloadEngine::newCUID() { return _cuidCounter.newID(); @@ -482,11 +461,6 @@ void DownloadEngine::setAuthConfigFactory _authConfigFactory = factory; } -SharedHandle<AuthConfigFactory> DownloadEngine::getAuthConfigFactory() const -{ - return _authConfigFactory; -} - void DownloadEngine::setRefreshInterval(time_t interval) { _refreshInterval = interval; diff --git a/src/DownloadEngine.h b/src/DownloadEngine.h index ac16be10..31489e2e 100644 --- a/src/DownloadEngine.h +++ b/src/DownloadEngine.h @@ -97,9 +97,15 @@ private: bool isTimeout() const; - SharedHandle<SocketCore> getSocket() const; - - const std::map<std::string, std::string>& getOptions() const; + const SharedHandle<SocketCore>& getSocket() const + { + return _socket; + } + + const std::map<std::string, std::string>& getOptions() const + { + return _options; + } }; // key = IP address:port, value = SocketPoolEntry @@ -226,9 +232,15 @@ public: const std::deque<std::string>& ipaddrs, uint16_t port); - SharedHandle<CookieStorage> getCookieStorage() const; + const SharedHandle<CookieStorage>& getCookieStorage() const + { + return _cookieStorage; + } - SharedHandle<BtRegistry> getBtRegistry() const; + const SharedHandle<BtRegistry>& getBtRegistry() const + { + return _btRegistry; + } cuid_t newCUID(); @@ -238,7 +250,10 @@ public: void setAuthConfigFactory(const SharedHandle<AuthConfigFactory>& factory); - SharedHandle<AuthConfigFactory> getAuthConfigFactory() const; + const SharedHandle<AuthConfigFactory>& getAuthConfigFactory() const + { + return _authConfigFactory; + } void setRefreshInterval(time_t interval); }; diff --git a/src/EpollEventPoll.cc b/src/EpollEventPoll.cc index b7681d3c..f8db3705 100644 --- a/src/EpollEventPoll.cc +++ b/src/EpollEventPoll.cc @@ -47,37 +47,11 @@ namespace aria2 { EpollEventPoll::CommandEvent::CommandEvent(Command* command, int events): _command(command), _events(events) {} -bool EpollEventPoll::CommandEvent::operator== -(const CommandEvent& commandEvent) const -{ - return _command == commandEvent._command; -} - -Command* EpollEventPoll::CommandEvent::getCommand() const -{ - return _command; -} - int EpollEventPoll::CommandEvent::getEvents() const { return _events; } -void EpollEventPoll::CommandEvent::addEvents(int events) -{ - _events |= events; -} - -void EpollEventPoll::CommandEvent::removeEvents(int events) -{ - _events &= (~events); -} - -bool EpollEventPoll::CommandEvent::eventsEmpty() const -{ - return _events == 0; -} - void EpollEventPoll::CommandEvent::processEvents(int events) { if((_events&events) || @@ -118,11 +92,6 @@ EpollEventPoll::ADNSEvent::ADNSEvent sock_t socket, int events): _resolver(resolver), _command(command), _socket(socket), _events(events) {} -bool EpollEventPoll::ADNSEvent::operator==(const ADNSEvent& event) const -{ - return _resolver == event._resolver; -} - int EpollEventPoll::ADNSEvent::getEvents() const { return _events; @@ -167,16 +136,6 @@ EpollEventPoll::SocketEntry::SocketEntry(sock_t socket):_socket(socket) memset(&_epEvent, 0, sizeof(struct epoll_event)); } -bool EpollEventPoll::SocketEntry::operator==(const SocketEntry& entry) const -{ - return _socket == entry._socket; -} - -bool EpollEventPoll::SocketEntry::operator<(const SocketEntry& entry) const -{ - return _socket < entry._socket; -} - void EpollEventPoll::SocketEntry::addCommandEvent(const CommandEvent& cev) { std::deque<CommandEvent>::iterator i = std::find(_commandEvents.begin(), @@ -247,11 +206,6 @@ void EpollEventPoll::SocketEntry::processEvents(int events) } -sock_t EpollEventPoll::SocketEntry::getSocket() const -{ - return _socket; -} - bool EpollEventPoll::SocketEntry::eventEmpty() const { @@ -303,13 +257,6 @@ EpollEventPoll::AsyncNameResolverEntry::AsyncNameResolverEntry {} -bool EpollEventPoll::AsyncNameResolverEntry::operator== -(const AsyncNameResolverEntry& entry) -{ - return _nameResolver == entry._nameResolver && - _command == entry._command; -} - void EpollEventPoll::AsyncNameResolverEntry::addSocketEvents (EpollEventPoll* e) { diff --git a/src/EpollEventPoll.h b/src/EpollEventPoll.h index 58e178b8..5658ba21 100644 --- a/src/EpollEventPoll.h +++ b/src/EpollEventPoll.h @@ -78,15 +78,30 @@ private: public: CommandEvent(Command* command, int events); - Command* getCommand() const; + Command* getCommand() const + { + return _command; + } - void addEvents(int events); - - void removeEvents(int events); - - bool eventsEmpty() const; + void addEvents(int events) + { + _events |= events; + } + + void removeEvents(int events) + { + _events &= (~events); + } + + bool eventsEmpty() const + { + return _events == 0; + } - bool operator==(const CommandEvent& event) const; + bool operator==(const CommandEvent& commandEvent) const + { + return _command == commandEvent._command; + } virtual int getEvents() const; @@ -107,7 +122,10 @@ private: ADNSEvent(const SharedHandle<AsyncNameResolver>& resolver, Command* command, sock_t socket, int events); - bool operator==(const ADNSEvent& event) const; + bool operator==(const ADNSEvent& event) const + { + return _resolver == event._resolver; + } virtual int getEvents() const; @@ -136,9 +154,15 @@ private: public: SocketEntry(sock_t socket); - bool operator==(const SocketEntry& entry) const; + bool operator==(const SocketEntry& entry) const + { + return _socket == entry._socket; + } - bool operator<(const SocketEntry& entry) const; + bool operator<(const SocketEntry& entry) const + { + return _socket < entry._socket; + } void addCommandEvent(const CommandEvent& cev); @@ -154,8 +178,11 @@ private: struct epoll_event& getEpEvent(); - sock_t getSocket() const; - + sock_t getSocket() const + { + return _socket; + } + bool eventEmpty() const; void processEvents(int events); @@ -177,7 +204,11 @@ private: AsyncNameResolverEntry(const SharedHandle<AsyncNameResolver>& nameResolver, Command* command); - bool operator==(const AsyncNameResolverEntry& entry); + bool operator==(const AsyncNameResolverEntry& entry) + { + return _nameResolver == entry._nameResolver && + _command == entry._command; + } void addSocketEvents(EpollEventPoll* socketPoll); diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc index 55c945c0..295ea709 100644 --- a/src/FtpConnection.cc +++ b/src/FtpConnection.cc @@ -446,9 +446,4 @@ void FtpConnection::setBaseWorkingDir(const std::string& baseWorkingDir) _baseWorkingDir = baseWorkingDir; } -const std::string& FtpConnection::getBaseWorkingDir() const -{ - return _baseWorkingDir; -} - } // namespace aria2 diff --git a/src/FtpConnection.h b/src/FtpConnection.h index 604f2447..8845b0b1 100644 --- a/src/FtpConnection.h +++ b/src/FtpConnection.h @@ -114,7 +114,10 @@ public: void setBaseWorkingDir(const std::string& baseWorkingDir); - const std::string& getBaseWorkingDir() const; + const std::string& getBaseWorkingDir() const + { + return _baseWorkingDir; + } }; } // namespace aria2 diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc index f0c7baba..cbbd8697 100644 --- a/src/HttpConnection.cc +++ b/src/HttpConnection.cc @@ -63,16 +63,6 @@ HttpRequestEntry::HttpRequestEntry(const HttpRequestHandle& httpRequest): HttpRequestEntry::~HttpRequestEntry() {} -HttpRequestHandle HttpRequestEntry::getHttpRequest() const -{ - return _httpRequest; -} - -HttpHeaderProcessorHandle HttpRequestEntry::getHttpHeaderProcessor() const -{ - return _proc; -} - HttpConnection::HttpConnection(int32_t cuid, const SocketHandle& socket, const Option* op): diff --git a/src/HttpConnection.h b/src/HttpConnection.h index 87577fea..276d479e 100644 --- a/src/HttpConnection.h +++ b/src/HttpConnection.h @@ -62,9 +62,15 @@ public: ~HttpRequestEntry(); - SharedHandle<HttpRequest> getHttpRequest() const; - - SharedHandle<HttpHeaderProcessor> getHttpHeaderProcessor() const; + const SharedHandle<HttpRequest>& getHttpRequest() const + { + return _httpRequest; + } + + const SharedHandle<HttpHeaderProcessor>& getHttpHeaderProcessor() const + { + return _proc; + } }; typedef SharedHandle<HttpRequestEntry> HttpRequestEntryHandle; diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc index 23ab0b27..4ab6234e 100644 --- a/src/HttpHeader.cc +++ b/src/HttpHeader.cc @@ -173,41 +173,21 @@ RangeHandle HttpHeader::getRange() const return SharedHandle<Range>(new Range(startByte, endByte, entityLength)); } -const std::string& HttpHeader::getResponseStatus() const -{ - return _responseStatus; -} - void HttpHeader::setResponseStatus(const std::string& responseStatus) { _responseStatus = responseStatus; } -const std::string& HttpHeader::getVersion() const -{ - return _version; -} - void HttpHeader::setVersion(const std::string& version) { _version = version; } -const std::string& HttpHeader::getMethod() const -{ - return _method; -} - void HttpHeader::setMethod(const std::string& method) { _method = method; } -const std::string& HttpHeader::getRequestPath() const -{ - return _requestPath; -} - void HttpHeader::setRequestPath(const std::string& requestPath) { _requestPath = requestPath; diff --git a/src/HttpHeader.h b/src/HttpHeader.h index 96bb14d5..6611a794 100644 --- a/src/HttpHeader.h +++ b/src/HttpHeader.h @@ -77,19 +77,31 @@ public: SharedHandle<Range> getRange() const; - const std::string& getResponseStatus() const; + const std::string& getResponseStatus() const + { + return _responseStatus; + } void setResponseStatus(const std::string& responseStatus); - const std::string& getVersion() const; + const std::string& getVersion() const + { + return _version; + } void setVersion(const std::string& version); - const std::string& getMethod() const; + const std::string& getMethod() const + { + return _method; + } void setMethod(const std::string& method); - const std::string& getRequestPath() const; + const std::string& getRequestPath() const + { + return _requestPath; + } void setRequestPath(const std::string& requestPath); diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index bce4fd40..95630abd 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -37,7 +37,6 @@ #include <cassert> #include <numeric> -#include "Request.h" #include "Segment.h" #include "Range.h" #include "CookieStorage.h" @@ -59,11 +58,6 @@ HttpRequest::HttpRequest():entityLength(0), userAgent(USER_AGENT) {} -SharedHandle<Segment> HttpRequest::getSegment() const -{ - return segment; -} - void HttpRequest::setSegment(const SharedHandle<Segment>& segment) { this->segment = segment; @@ -74,11 +68,6 @@ void HttpRequest::setRequest(const SharedHandle<Request>& request) this->request = request; } -SharedHandle<Request> HttpRequest::getRequest() const -{ - return request; -} - off_t HttpRequest::getStartByte() const { if(segment.isNull()) { @@ -287,62 +276,12 @@ void HttpRequest::addAcceptType(const std::string& type) _acceptTypes.push_back(type); } -const std::string& HttpRequest::getPreviousURI() const -{ - return request->getPreviousUrl(); -} - -const std::string& HttpRequest::getHost() const -{ - return request->getHost(); -} - -uint16_t HttpRequest::getPort() const -{ - return request->getPort(); -} - -const std::string& HttpRequest::getMethod() const -{ - return request->getMethod(); -} - -const std::string& HttpRequest::getProtocol() const -{ - return request->getProtocol(); -} - -const std::string& HttpRequest::getCurrentURI() const -{ - return request->getCurrentUrl(); -} - -const std::string& HttpRequest::getDir() const -{ - return request->getDir(); -} - -const std::string& HttpRequest::getFile() const -{ - return request->getFile(); -} - -const std::string& HttpRequest::getQuery() const -{ - return request->getQuery(); -} - void HttpRequest::setCookieStorage (const SharedHandle<CookieStorage>& cookieStorage) { _cookieStorage = cookieStorage; } -SharedHandle<CookieStorage> HttpRequest::getCookieStorage() const -{ - return _cookieStorage; -} - void HttpRequest::setAuthConfigFactory (const SharedHandle<AuthConfigFactory>& factory) { diff --git a/src/HttpRequest.h b/src/HttpRequest.h index d1eb9fdc..f84596a5 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -41,10 +41,10 @@ #include <deque> #include "SharedHandle.h" +#include "Request.h" namespace aria2 { -class Request; class Segment; class Range; class Option; @@ -85,7 +85,10 @@ private: public: HttpRequest(); - SharedHandle<Segment> getSegment() const; + const SharedHandle<Segment>& getSegment() const + { + return segment; + } void setSegment(const SharedHandle<Segment>& segment); @@ -104,23 +107,50 @@ public: return entityLength; } - const std::string& getHost() const; + const std::string& getHost() const + { + return request->getHost(); + } - uint16_t getPort() const; + uint16_t getPort() const + { + return request->getPort(); + } - const std::string& getMethod() const; + const std::string& getMethod() const + { + return request->getMethod(); + } - const std::string& getProtocol() const; + const std::string& getProtocol() const + { + return request->getProtocol(); + } - const std::string& getCurrentURI() const; + const std::string& getCurrentURI() const + { + return request->getCurrentUrl(); + } - const std::string& getDir() const; + const std::string& getDir() const + { + return request->getDir(); + } - const std::string& getFile() const; + const std::string& getFile() const + { + return request->getFile(); + } - const std::string& getQuery() const; + const std::string& getQuery() const + { + return request->getQuery(); + } - const std::string& getPreviousURI() const; + const std::string& getPreviousURI() const + { + return request->getPreviousUrl(); + } SharedHandle<Range> getRange() const; @@ -130,7 +160,10 @@ public: */ bool isRangeSatisfied(const SharedHandle<Range>& range) const; - SharedHandle<Request> getRequest() const; + const SharedHandle<Request>& getRequest() const + { + return request; + } off_t getStartByte() const; @@ -173,7 +206,10 @@ public: void setCookieStorage(const SharedHandle<CookieStorage>& cookieStorage); - SharedHandle<CookieStorage> getCookieStorage() const; + const SharedHandle<CookieStorage>& getCookieStorage() const + { + return _cookieStorage; + } void setAuthConfigFactory(const SharedHandle<AuthConfigFactory>& factory); diff --git a/src/HttpResponse.cc b/src/HttpResponse.cc index 0290207d..6d08c4b0 100644 --- a/src/HttpResponse.cc +++ b/src/HttpResponse.cc @@ -228,21 +228,11 @@ void HttpResponse::setHttpHeader(const SharedHandle<HttpHeader>& httpHeader) this->httpHeader = httpHeader; } -SharedHandle<HttpHeader> HttpResponse::getHttpHeader() const -{ - return httpHeader; -} - void HttpResponse::setHttpRequest(const SharedHandle<HttpRequest>& httpRequest) { this->httpRequest = httpRequest; } -SharedHandle<HttpRequest> HttpResponse::getHttpRequest() const -{ - return httpRequest; -} - // TODO return std::string const std::string& HttpResponse::getResponseStatus() const { diff --git a/src/HttpResponse.h b/src/HttpResponse.h index 78272bbb..d89a380f 100644 --- a/src/HttpResponse.h +++ b/src/HttpResponse.h @@ -102,13 +102,19 @@ public: void setHttpHeader(const SharedHandle<HttpHeader>& httpHeader); - SharedHandle<HttpHeader> getHttpHeader() const; + const SharedHandle<HttpHeader>& getHttpHeader() const + { + return httpHeader; + } const std::string& getResponseStatus() const; void setHttpRequest(const SharedHandle<HttpRequest>& httpRequest); - SharedHandle<HttpRequest> getHttpRequest() const; + const SharedHandle<HttpRequest>& getHttpRequest() const + { + return httpRequest; + } void setCuid(int32_t cuid) { diff --git a/src/LibsslTLSContext.cc b/src/LibsslTLSContext.cc index 58fc745b..ddcca08d 100644 --- a/src/LibsslTLSContext.cc +++ b/src/LibsslTLSContext.cc @@ -103,11 +103,6 @@ void TLSContext::addTrustedCACertFile(const std::string& certfile) } } -SSL_CTX* TLSContext::getSSLCtx() const -{ - return _sslCtx; -} - void TLSContext::enablePeerVerification() { _peerVerificationEnabled = true; @@ -118,9 +113,4 @@ void TLSContext::disablePeerVerification() _peerVerificationEnabled = false; } -bool TLSContext::peerVerificationEnabled() const -{ - return _peerVerificationEnabled; -} - } // namespace aria2 diff --git a/src/LibsslTLSContext.h b/src/LibsslTLSContext.h index 9f7aff39..6412f2fe 100644 --- a/src/LibsslTLSContext.h +++ b/src/LibsslTLSContext.h @@ -72,13 +72,20 @@ public: bool bad() const; - SSL_CTX* getSSLCtx() const; + SSL_CTX* getSSLCtx() const + { + return _sslCtx; + } void enablePeerVerification(); void disablePeerVerification(); - bool peerVerificationEnabled() const; + bool peerVerificationEnabled() const + { + return _peerVerificationEnabled; + } + }; } // namespace aria2 diff --git a/src/MSEHandshake.cc b/src/MSEHandshake.cc index 2b62cb9a..8653de09 100644 --- a/src/MSEHandshake.cc +++ b/src/MSEHandshake.cc @@ -590,44 +590,4 @@ size_t MSEHandshake::receiveNBytes(size_t bytes) return r; } -const unsigned char* MSEHandshake::getIA() const -{ - return _ia; -} - -size_t MSEHandshake::getIALength() const -{ - return _iaLength; -} - -const unsigned char* MSEHandshake::getInfoHash() const -{ - return _infoHash; -} - -MSEHandshake::CRYPTO_TYPE MSEHandshake::getNegotiatedCryptoType() const -{ - return _negotiatedCryptoType; -} - -SharedHandle<ARC4Encryptor> MSEHandshake::getEncryptor() const -{ - return _encryptor; -} - -SharedHandle<ARC4Decryptor> MSEHandshake::getDecryptor() const -{ - return _decryptor; -} - -const unsigned char* MSEHandshake::getBuffer() const -{ - return _rbuf; -} - -size_t MSEHandshake::getBufferLength() const -{ - return _rbufLength; -} - } // namespace aria2 diff --git a/src/MSEHandshake.h b/src/MSEHandshake.h index 6d4817f8..f2ceb3a7 100644 --- a/src/MSEHandshake.h +++ b/src/MSEHandshake.h @@ -167,21 +167,46 @@ public: bool sendReceiverStep2(); // returns plain text IA - const unsigned char* getIA() const; + const unsigned char* getIA() const + { + return _ia; + } - size_t getIALength() const; + size_t getIALength() const + { + return _iaLength; + } - const unsigned char* getInfoHash() const; + const unsigned char* getInfoHash() const + { + return _infoHash; + } - CRYPTO_TYPE getNegotiatedCryptoType() const; + CRYPTO_TYPE getNegotiatedCryptoType() const + { + return _negotiatedCryptoType; + } - SharedHandle<ARC4Encryptor> getEncryptor() const; + const SharedHandle<ARC4Encryptor>& getEncryptor() const + { + return _encryptor; + } + + const SharedHandle<ARC4Decryptor>& getDecryptor() const + { + return _decryptor; + } - SharedHandle<ARC4Decryptor> getDecryptor() const; + const unsigned char* getBuffer() const + { + return _rbuf; + } - const unsigned char* getBuffer() const; + size_t getBufferLength() const + { + return _rbufLength; + } - size_t getBufferLength() const; }; } // namespace aria2 diff --git a/src/MetalinkEntry.cc b/src/MetalinkEntry.cc index 60bebcb9..056e3bbc 100644 --- a/src/MetalinkEntry.cc +++ b/src/MetalinkEntry.cc @@ -181,19 +181,9 @@ void MetalinkEntry::toFileEntry mem_fun_sh(&MetalinkEntry::getFile)); } -SharedHandle<FileEntry> MetalinkEntry::getFile() const -{ - return file; -} - void MetalinkEntry::setSignature(const SharedHandle<Signature>& signature) { _signature = signature; } -SharedHandle<Signature> MetalinkEntry::getSignature() const -{ - return _signature; -} - } // namespace aria2 diff --git a/src/MetalinkEntry.h b/src/MetalinkEntry.h index 11ead2d8..042747ff 100644 --- a/src/MetalinkEntry.h +++ b/src/MetalinkEntry.h @@ -36,10 +36,12 @@ #define _D_METALINK_ENTRY_H_ #include "common.h" -#include "SharedHandle.h" + #include <string> #include <deque> +#include "SharedHandle.h" + namespace aria2 { class MetalinkResource; @@ -75,7 +77,10 @@ public: uint64_t getLength() const; - SharedHandle<FileEntry> getFile() const; + const SharedHandle<FileEntry>& getFile() const + { + return file; + } void dropUnsupportedResource(); @@ -90,7 +95,11 @@ public: void setSignature(const SharedHandle<Signature>& signature); - SharedHandle<Signature> getSignature() const; + const SharedHandle<Signature>& getSignature() const + { + return _signature; + } + }; } // namespace aria2 diff --git a/src/MetalinkParserController.cc b/src/MetalinkParserController.cc index 4dd3eb6d..94a78d09 100644 --- a/src/MetalinkParserController.cc +++ b/src/MetalinkParserController.cc @@ -60,11 +60,6 @@ MetalinkParserController::MetalinkParserController(): MetalinkParserController::~MetalinkParserController() {} -SharedHandle<Metalinker> MetalinkParserController::getResult() const -{ - return _metalinker; -} - void MetalinkParserController::newEntryTransaction() { _tEntry.reset(new MetalinkEntry()); diff --git a/src/MetalinkParserController.h b/src/MetalinkParserController.h index 216d6901..7811be23 100644 --- a/src/MetalinkParserController.h +++ b/src/MetalinkParserController.h @@ -79,7 +79,10 @@ public: ~MetalinkParserController(); - SharedHandle<Metalinker> getResult() const; + const SharedHandle<Metalinker>& getResult() const + { + return _metalinker; + } void newEntryTransaction(); diff --git a/src/MetalinkParserStateMachine.cc b/src/MetalinkParserStateMachine.cc index 4a29ae9b..40595723 100644 --- a/src/MetalinkParserStateMachine.cc +++ b/src/MetalinkParserStateMachine.cc @@ -33,7 +33,6 @@ */ /* copyright --> */ #include "MetalinkParserStateMachine.h" -#include "MetalinkParserController.h" #include "InitialMetalinkParserState.h" #include "MetalinkMetalinkParserState.h" #include "FilesMetalinkParserState.h" @@ -368,9 +367,4 @@ bool MetalinkParserStateMachine::needsCharactersBuffering() const return _state->needsCharactersBuffering(); } -SharedHandle<Metalinker> MetalinkParserStateMachine::getResult() const -{ - return _ctrl->getResult(); -} - } // namespace aria2 diff --git a/src/MetalinkParserStateMachine.h b/src/MetalinkParserStateMachine.h index bd022f53..06161a80 100644 --- a/src/MetalinkParserStateMachine.h +++ b/src/MetalinkParserStateMachine.h @@ -36,13 +36,14 @@ #define _D_METALINK_PARSER_STATE_MACHINE_H_ #include "common.h" -#include "SharedHandle.h" #include <string> #include <map> +#include "SharedHandle.h" +#include "MetalinkParserController.h" + namespace aria2 { -class MetalinkParserController; class MetalinkParserState; class SkipTagMetalinkParserState; class Metalinker; @@ -191,7 +192,10 @@ public: bool needsCharactersBuffering() const; - SharedHandle<Metalinker> getResult() const; + const SharedHandle<Metalinker>& getResult() const + { + return _ctrl->getResult(); + } }; } // namespace aria2 diff --git a/src/MultiDiskAdaptor.cc b/src/MultiDiskAdaptor.cc index ea8e6461..7083de7f 100644 --- a/src/MultiDiskAdaptor.cc +++ b/src/MultiDiskAdaptor.cc @@ -96,11 +96,6 @@ void DiskWriterEntry::openExistingFile() } } -bool DiskWriterEntry::isOpen() const -{ - return _open; -} - void DiskWriterEntry::closeFile() { if(_open) { @@ -119,21 +114,11 @@ uint64_t DiskWriterEntry::size() const return File(getFilePath()).size(); } -SharedHandle<FileEntry> DiskWriterEntry::getFileEntry() const -{ - return fileEntry; -} - void DiskWriterEntry::setDiskWriter(const SharedHandle<DiskWriter>& diskWriter) { this->diskWriter = diskWriter; } -SharedHandle<DiskWriter> DiskWriterEntry::getDiskWriter() const -{ - return diskWriter; -} - bool DiskWriterEntry::operator<(const DiskWriterEntry& entry) const { return fileEntry < entry.fileEntry; @@ -155,16 +140,6 @@ void DiskWriterEntry::disableDirectIO() _directIO = false; } -bool DiskWriterEntry::needsFileAllocation() const -{ - return _needsFileAllocation; -} - -void DiskWriterEntry::needsFileAllocation(bool f) -{ - _needsFileAllocation = f; -} - MultiDiskAdaptor::MultiDiskAdaptor(): pieceLength(0), _maxOpenFiles(DEFAULT_MAX_OPEN_FILES), @@ -552,10 +527,4 @@ size_t MultiDiskAdaptor::utime(const Time& actime, const Time& modtime) return numOK; } -const std::deque<SharedHandle<DiskWriterEntry> >& -MultiDiskAdaptor::getDiskWriterEntries() const -{ - return diskWriterEntries; -} - } // namespace aria2 diff --git a/src/MultiDiskAdaptor.h b/src/MultiDiskAdaptor.h index a9e0f09f..21018259 100644 --- a/src/MultiDiskAdaptor.h +++ b/src/MultiDiskAdaptor.h @@ -65,17 +65,26 @@ public: void closeFile(); - bool isOpen() const; + bool isOpen() const + { + return _open; + } bool fileExists(); uint64_t size() const; - SharedHandle<FileEntry> getFileEntry() const; + const SharedHandle<FileEntry>& getFileEntry() const + { + return fileEntry; + } void setDiskWriter(const SharedHandle<DiskWriter>& diskWriter); - SharedHandle<DiskWriter> getDiskWriter() const; + const SharedHandle<DiskWriter>& getDiskWriter() const + { + return diskWriter; + } bool operator<(const DiskWriterEntry& entry) const; @@ -89,9 +98,16 @@ public: // called. void disableDirectIO(); - bool needsFileAllocation() const; + bool needsFileAllocation() const + { + return _needsFileAllocation; + } + + void needsFileAllocation(bool f) + { + _needsFileAllocation = f; + } - void needsFileAllocation(bool f); }; typedef SharedHandle<DiskWriterEntry> DiskWriterEntryHandle; @@ -177,7 +193,11 @@ public: virtual size_t utime(const Time& actime, const Time& modtime); const std::deque<SharedHandle<DiskWriterEntry> >& - getDiskWriterEntries() const; + getDiskWriterEntries() const + { + return diskWriterEntries; + } + }; typedef SharedHandle<MultiDiskAdaptor> MultiDiskAdaptorHandle; diff --git a/src/NetrcAuthResolver.cc b/src/NetrcAuthResolver.cc index 6a77d16d..6ebcf2fe 100644 --- a/src/NetrcAuthResolver.cc +++ b/src/NetrcAuthResolver.cc @@ -73,11 +73,6 @@ void NetrcAuthResolver::setNetrc(const NetrcHandle& netrc) _netrc = netrc; } -NetrcHandle NetrcAuthResolver::getNetrc() const -{ - return _netrc; -} - void NetrcAuthResolver::ignoreDefault() { _ignoreDefault = true; diff --git a/src/NetrcAuthResolver.h b/src/NetrcAuthResolver.h index 290dcbe7..812f6795 100644 --- a/src/NetrcAuthResolver.h +++ b/src/NetrcAuthResolver.h @@ -57,7 +57,10 @@ public: void setNetrc(const SharedHandle<Netrc>& netrc); - SharedHandle<Netrc> getNetrc() const; + const SharedHandle<Netrc>& getNetrc() const + { + return _netrc; + } // Ignores default token of netrc void ignoreDefault(); diff --git a/src/Peer.cc b/src/Peer.cc index 41920266..63919ba1 100644 --- a/src/Peer.cc +++ b/src/Peer.cc @@ -71,36 +71,11 @@ Peer::~Peer() releaseSessionResource(); } -bool Peer::operator==(const Peer& p) -{ - return id == p.id; -} - -bool Peer::operator!=(const Peer& p) -{ - return !(*this == p); -} - -const std::string& Peer::getID() const -{ - return id; -} - void Peer::usedBy(int32_t cuid) { _cuid = cuid; } -int32_t Peer::usedBy() const -{ - return _cuid; -} - -bool Peer::unused() const -{ - return _cuid == 0; -} - void Peer::allocateSessionResource(size_t pieceLength, uint64_t totalLength) { delete _res; @@ -114,21 +89,11 @@ void Peer::releaseSessionResource() _res = 0; } -bool Peer::isActive() const -{ - return _res != 0; -} - void Peer::setPeerId(const unsigned char* peerId) { memcpy(_peerId, peerId, PEER_ID_LENGTH); } -const unsigned char* Peer::getPeerId() const -{ - return _peerId; -} - void Peer::resetStatus() { _cuid = 0; } @@ -432,21 +397,6 @@ bool Peer::isDHTEnabled() const return _res->dhtEnabled(); } -bool Peer::isSeeder() const -{ - return _seeder; -} - -const Time& Peer::getFirstContactTime() const -{ - return _firstContactTime; -} - -const Time& Peer::getBadConditionStartTime() const -{ - return _badConditionStartTime; -} - const Time& Peer::getLastDownloadUpdate() const { assert(_res); @@ -465,11 +415,6 @@ uint64_t Peer::getCompletedLength() const return _res->getCompletedLength(); } -bool Peer::isIncomingPeer() const -{ - return _incoming; -} - void Peer::setIncomingPeer(bool incoming) { _incoming = incoming; @@ -36,12 +36,15 @@ #define _D_PEER_H_ #include "common.h" + +#include <cassert> +#include <string> +#include <deque> + #include "SharedHandle.h" #include "TimeA2.h" #include "BtConstants.h" #include "PeerStat.h" -#include <string> -#include <deque> namespace aria2 { @@ -82,28 +85,52 @@ public: ~Peer(); - bool operator==(const Peer& p); + bool operator==(const Peer& p) + { + return id == p.id; + } - bool operator!=(const Peer& p); + bool operator!=(const Peer& p) + { + return !(*this == p); + } void resetStatus(); void usedBy(int32_t cuid); - int32_t usedBy() const; + int32_t usedBy() const + { + return _cuid; + } - bool unused() const; + bool unused() const + { + return _cuid == 0; + } // Returns true iff _res != 0. - bool isActive() const; + bool isActive() const + { + return _res != 0; + } void setPeerId(const unsigned char* peerId); - const unsigned char* getPeerId() const; + const unsigned char* getPeerId() const + { + return _peerId; + } - bool isSeeder() const; + bool isSeeder() const + { + return _seeder; + } - const std::string& getID() const; + const std::string& getID() const + { + return id; + } void startBadCondition(); @@ -113,11 +140,17 @@ public: void releaseSessionResource(); - const Time& getFirstContactTime() const; + const Time& getFirstContactTime() const + { + return _firstContactTime; + } void setFirstContactTime(const Time& time); - const Time& getBadConditionStartTime() const; + const Time& getBadConditionStartTime() const + { + return _badConditionStartTime; + } // Before calling following member functions, make sure that // allocateSessionResource() is called and _res is created. @@ -244,7 +277,10 @@ public: uint64_t getCompletedLength() const; - bool isIncomingPeer() const; + bool isIncomingPeer() const + { + return _incoming; + } void setIncomingPeer(bool incoming); diff --git a/src/PeerSessionResource.cc b/src/PeerSessionResource.cc index a35ceadb..8c8849e8 100644 --- a/src/PeerSessionResource.cc +++ b/src/PeerSessionResource.cc @@ -66,11 +66,6 @@ PeerSessionResource::~PeerSessionResource() delete _bitfieldMan; } -bool PeerSessionResource::amChoking() const -{ - return _amChoking; -} - void PeerSessionResource::amChoking(bool b) { _amChoking = b; @@ -79,51 +74,26 @@ void PeerSessionResource::amChoking(bool b) } } -bool PeerSessionResource::amInterested() const -{ - return _amInterested; -} - void PeerSessionResource::amInterested(bool b) { _amInterested = b; } -bool PeerSessionResource::peerChoking() const -{ - return _peerChoking; -} - void PeerSessionResource::peerChoking(bool b) { _peerChoking = b; } -bool PeerSessionResource::peerInterested() const -{ - return _peerInterested; -} - void PeerSessionResource::peerInterested(bool b) { _peerInterested = b; } -bool PeerSessionResource::chokingRequired() const -{ - return _chokingRequired; -} - void PeerSessionResource::chokingRequired(bool b) { _chokingRequired = b; } -bool PeerSessionResource::optUnchoking() const -{ - return _optUnchoking; -} - void PeerSessionResource::optUnchoking(bool b) { _optUnchoking = b; @@ -137,11 +107,6 @@ bool PeerSessionResource::shouldBeChoking() const return _chokingRequired; } -bool PeerSessionResource::snubbing() const -{ - return _snubbing; -} - void PeerSessionResource::snubbing(bool b) { _snubbing = b; @@ -190,11 +155,6 @@ void PeerSessionResource::markSeeder() _bitfieldMan->setAllBit(); } -bool PeerSessionResource::fastExtensionEnabled() const -{ - return _fastExtensionEnabled; -} - void PeerSessionResource::fastExtensionEnabled(bool b) { _fastExtensionEnabled = b; @@ -225,11 +185,6 @@ bool PeerSessionResource::peerAllowedIndexSetContains(size_t index) const index); } -const std::deque<size_t>& PeerSessionResource::amAllowedIndexSet() const -{ - return _amAllowedIndexSet; -} - void PeerSessionResource::addAmAllowedIndex(size_t index) { updateIndexSet(_amAllowedIndexSet, index); @@ -242,11 +197,6 @@ bool PeerSessionResource::amAllowedIndexSetContains(size_t index) const index); } -bool PeerSessionResource::extendedMessagingEnabled() const -{ - return _extendedMessagingEnabled; -} - void PeerSessionResource::extendedMessagingEnabled(bool b) { _extendedMessagingEnabled = b; @@ -280,26 +230,11 @@ void PeerSessionResource::addExtension(const std::string& name, uint8_t id) _extensions[name] = id; } -bool PeerSessionResource::dhtEnabled() const -{ - return _dhtEnabled; -} - void PeerSessionResource::dhtEnabled(bool b) { _dhtEnabled = b; } -PeerStat& PeerSessionResource::getPeerStat() -{ - return _peerStat; -} - -unsigned int PeerSessionResource::latency() const -{ - return _latency; -} - void PeerSessionResource::updateLatency(unsigned int latency) { _latency = _latency*0.2+latency*0.8; @@ -327,16 +262,6 @@ void PeerSessionResource::updateDownloadLength(size_t bytes) _lastDownloadUpdate.reset(); } -const Time& PeerSessionResource::getLastDownloadUpdate() const -{ - return _lastDownloadUpdate; -} - -const Time& PeerSessionResource::getLastAmUnchoking() const -{ - return _lastAmUnchoking; -} - uint64_t PeerSessionResource::getCompletedLength() const { return _bitfieldMan->getCompletedLength(); diff --git a/src/PeerSessionResource.h b/src/PeerSessionResource.h index f0828c0e..cfe148af 100644 --- a/src/PeerSessionResource.h +++ b/src/PeerSessionResource.h @@ -87,39 +87,60 @@ public: ~PeerSessionResource(); // localhost is choking this peer - bool amChoking() const; + bool amChoking() const + { + return _amChoking; + } void amChoking(bool b); // localhost is interested in this peer - bool amInterested() const; + bool amInterested() const + { + return _amInterested; + } void amInterested(bool b); // this peer is choking localhost - bool peerChoking() const; + bool peerChoking() const + { + return _peerChoking; + } void peerChoking(bool b); // this peer is interested in localhost - bool peerInterested() const; + bool peerInterested() const + { + return _peerInterested; + } void peerInterested(bool b); // this peer should be choked - bool chokingRequired() const; + bool chokingRequired() const + { + return _chokingRequired; + } void chokingRequired(bool b); // this peer is eligible for unchoking optionally. - bool optUnchoking() const; + bool optUnchoking() const + { + return _optUnchoking; + } void optUnchoking(bool b); bool shouldBeChoking() const; // this peer is snubbing. - bool snubbing() const; + bool snubbing() const + { + return _snubbing; + } void snubbing(bool b); @@ -137,7 +158,10 @@ public: void markSeeder(); - bool fastExtensionEnabled() const; + bool fastExtensionEnabled() const + { + return _fastExtensionEnabled; + } void fastExtensionEnabled(bool b); @@ -149,13 +173,19 @@ public: bool peerAllowedIndexSetContains(size_t index) const; // fast index set which localhost has sent to a peer. - const std::deque<size_t>& amAllowedIndexSet() const; + const std::deque<size_t>& amAllowedIndexSet() const + { + return _amAllowedIndexSet; + } void addAmAllowedIndex(size_t index); bool amAllowedIndexSetContains(size_t index) const; - bool extendedMessagingEnabled() const; + bool extendedMessagingEnabled() const + { + return _extendedMessagingEnabled; + } void extendedMessagingEnabled(bool b); @@ -165,13 +195,22 @@ public: void addExtension(const std::string& name, uint8_t id); - bool dhtEnabled() const; + bool dhtEnabled() const + { + return _dhtEnabled; + } void dhtEnabled(bool b); - PeerStat& getPeerStat(); + PeerStat& getPeerStat() + { + return _peerStat; + } - unsigned int latency() const; + unsigned int latency() const + { + return _latency; + } void updateLatency(unsigned int latency); @@ -183,9 +222,15 @@ public: void updateDownloadLength(size_t bytes); - const Time& getLastDownloadUpdate() const; + const Time& getLastDownloadUpdate() const + { + return _lastDownloadUpdate; + } - const Time& getLastAmUnchoking() const; + const Time& getLastAmUnchoking() const + { + return _lastAmUnchoking; + } uint64_t getCompletedLength() const; diff --git a/src/Piece.cc b/src/Piece.cc index 3339410c..4f2bfcc2 100644 --- a/src/Piece.cc +++ b/src/Piece.cc @@ -95,16 +95,6 @@ Piece& Piece::operator=(const Piece& piece) return *this; } -bool Piece::operator==(const Piece& piece) const -{ - return index == piece.index; -} - -bool Piece::operator<(const Piece& piece) const -{ - return index < piece.index; -} - void Piece::completeBlock(size_t blockIndex) { bitfield->setBit(blockIndex); bitfield->unsetUseBit(blockIndex); diff --git a/src/Piece.h b/src/Piece.h index caa5b1d4..b220be5a 100644 --- a/src/Piece.h +++ b/src/Piece.h @@ -82,9 +82,15 @@ public: Piece& operator=(const Piece& piece); - bool operator==(const Piece& piece) const; - - bool operator<(const Piece& piece) const; + bool operator==(const Piece& piece) const + { + return index == piece.index; + } + + bool operator<(const Piece& piece) const + { + return index < piece.index; + } bool getMissingUnusedBlockIndex(size_t& index) const; bool getMissingBlockIndex(size_t& index) const; diff --git a/src/PieceStatMan.cc b/src/PieceStatMan.cc index 1afdf929..9da7302e 100644 --- a/src/PieceStatMan.cc +++ b/src/PieceStatMan.cc @@ -42,15 +42,6 @@ namespace aria2 { PieceStat::PieceStat(size_t index):_order(0), _index(index), _count(0) {} -bool PieceStat::operator<(const PieceStat& pieceStat) const -{ - if(_count == pieceStat._count) { - return _order < pieceStat._order; - } else { - return _count < pieceStat._count; - } -} - void PieceStat::addCount() { if(_count < SIZE_MAX) { @@ -65,26 +56,6 @@ void PieceStat::subCount() } } -size_t PieceStat::getIndex() const -{ - return _index; -} - -size_t PieceStat::getCount() const -{ - return _count; -} - -void PieceStat::setOrder(size_t order) -{ - _order = order; -} - -size_t PieceStat::getOrder() const -{ - return _order; -} - class GenPieceStat { private: size_t _index; @@ -204,15 +175,4 @@ void PieceStatMan::addPieceStats(size_t index) std::rotate(cur, cur+1, to); } -const std::vector<size_t>& PieceStatMan::getRarerPieceIndexes() const -{ - return _sortedPieceStatIndexes; -} - -const std::vector<SharedHandle<PieceStat> >& -PieceStatMan::getPieceStats() const -{ - return _pieceStats; -} - } // namespace aria2 diff --git a/src/PieceStatMan.h b/src/PieceStatMan.h index 45c26ffe..b5f038be 100644 --- a/src/PieceStatMan.h +++ b/src/PieceStatMan.h @@ -51,15 +51,38 @@ private: public: PieceStat(size_t index); - bool operator<(const PieceStat& pieceStat) const; + bool operator<(const PieceStat& pieceStat) const + { + if(_count == pieceStat._count) { + return _order < pieceStat._order; + } else { + return _count < pieceStat._count; + } + } void addCount(); void subCount(); - size_t getOrder() const; - void setOrder(size_t order); - size_t getIndex() const; - size_t getCount() const; + size_t getOrder() const + { + return _order; + } + + void setOrder(size_t order) + { + _order = order; + } + + size_t getIndex() const + { + return _index; + } + + size_t getCount() const + { + return _count; + } + }; class PieceStatMan { @@ -83,9 +106,16 @@ public: const unsigned char* oldBitfield); // Returns piece index in rarest first order. - const std::vector<size_t>& getRarerPieceIndexes() const; + const std::vector<size_t>& getRarerPieceIndexes() const + { + return _sortedPieceStatIndexes; + } + + const std::vector<SharedHandle<PieceStat> >& getPieceStats() const + { + return _pieceStats; + } - const std::vector<SharedHandle<PieceStat> >& getPieceStats() const; }; } // namespace aria2 diff --git a/src/Request.cc b/src/Request.cc index 2e6439a0..82b8b56b 100644 --- a/src/Request.cc +++ b/src/Request.cc @@ -238,24 +238,9 @@ void Request::resetRedirectCount() _redirectCount = 0; } -unsigned int Request::getRedirectCount() const -{ - return _redirectCount; -} - -bool Request::isPipeliningHint() const -{ - return _pipeliningHint; -} - void Request::setMaxPipelinedRequest(unsigned int num) { _maxPipelinedRequest = num; } -unsigned int Request::getMaxPipelinedRequest() const -{ - return _maxPipelinedRequest; -} - } // namespace aria2 diff --git a/src/Request.h b/src/Request.h index f637ca19..227d9e22 100644 --- a/src/Request.h +++ b/src/Request.h @@ -100,7 +100,10 @@ public: void resetRedirectCount(); - unsigned int getRedirectCount() const; + unsigned int getRedirectCount() const + { + return _redirectCount; + } // Returns URI passed by setUrl() const std::string& getUrl() const { return url; } @@ -145,11 +148,17 @@ public: _pipeliningHint = pipeliningHint; } - bool isPipeliningHint() const; + bool isPipeliningHint() const + { + return _pipeliningHint; + } void setMaxPipelinedRequest(unsigned int num); - unsigned int getMaxPipelinedRequest() const; + unsigned int getMaxPipelinedRequest() const + { + return _maxPipelinedRequest; + } void setMethod(const std::string& method) { this->method = method; diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc index 291b13c2..3244129b 100644 --- a/src/RequestGroup.cc +++ b/src/RequestGroup.cc @@ -149,7 +149,7 @@ RequestGroup::RequestGroup(const SharedHandle<Option>& option, RequestGroup::~RequestGroup() {} -SegmentManHandle RequestGroup::initSegmentMan() +const SegmentManHandle& RequestGroup::initSegmentMan() { _segmentMan = _segmentManFactory->createNewInstance(_downloadContext, _pieceStorage); @@ -937,11 +937,6 @@ void RequestGroup::setDiskWriterFactory(const DiskWriterFactoryHandle& diskWrite _diskWriterFactory = diskWriterFactory; } -DiskWriterFactoryHandle RequestGroup::getDiskWriterFactory() const -{ - return _diskWriterFactory; -} - void RequestGroup::addPostDownloadHandler(const PostDownloadHandlerHandle& handler) { _postDownloadHandlers.push_back(handler); @@ -962,36 +957,16 @@ void RequestGroup::clearPreDowloadHandler() _preDownloadHandlers.clear(); } -SegmentManHandle RequestGroup::getSegmentMan() const -{ - return _segmentMan; -} - -DownloadContextHandle RequestGroup::getDownloadContext() const -{ - return _downloadContext; -} - void RequestGroup::setDownloadContext(const DownloadContextHandle& downloadContext) { _downloadContext = downloadContext; } -PieceStorageHandle RequestGroup::getPieceStorage() const -{ - return _pieceStorage; -} - void RequestGroup::setPieceStorage(const PieceStorageHandle& pieceStorage) { _pieceStorage = pieceStorage; } -BtProgressInfoFileHandle RequestGroup::getProgressInfoFile() const -{ - return _progressInfoFile; -} - void RequestGroup::setProgressInfoFile(const BtProgressInfoFileHandle& progressInfoFile) { _progressInfoFile = progressInfoFile; @@ -1131,11 +1106,6 @@ void RequestGroup::reportDownloadFinished() #endif // ENABLE_BITTORRENT } -const std::deque<std::string>& RequestGroup::getAcceptFeatures() const -{ - return _acceptFeatures; -} - void RequestGroup::addAcceptFeatureHeader(const std::string& feature) { if(std::find(_acceptFeatures.begin(), _acceptFeatures.end(), feature) == _acceptFeatures.end()) { @@ -1151,11 +1121,6 @@ void RequestGroup::removeAcceptFeatureHeader(const std::string& feature) } } -const std::deque<std::string>& RequestGroup::getAcceptTypes() const -{ - return _acceptTypes; -} - void RequestGroup::addAcceptType(const std::string& type) { if(std::find(_acceptTypes.begin(), _acceptTypes.end(), type) == _acceptTypes.end()) { @@ -1206,21 +1171,11 @@ void RequestGroup::increaseAndValidateFileNotFoundCount() } } -unsigned int RequestGroup::getNumConcurrentCommand() const -{ - return _numConcurrentCommand; -} - void RequestGroup::markInMemoryDownload() { _inMemoryDownload = true; } -bool RequestGroup::inMemoryDownload() const -{ - return _inMemoryDownload; -} - void RequestGroup::tuneDownloadCommand(DownloadCommand* command) { _uriSelector->tuneDownloadCommand(_uris, command); @@ -1231,11 +1186,6 @@ void RequestGroup::addURIResult(std::string uri, DownloadResult::RESULT result) _uriResults.push_back(URIResult(uri, result)); } -const std::deque<URIResult>& RequestGroup::getURIResults() const -{ - return _uriResults; -} - class FindURIResultByResult { private: DownloadResult::RESULT _r; @@ -1263,21 +1213,11 @@ void RequestGroup::setTimeout(time_t timeout) _timeout = timeout; } -time_t RequestGroup::getTimeout() const -{ - return _timeout; -} - void RequestGroup::setMaxTries(unsigned int maxTries) { _maxTries = maxTries; } -unsigned int RequestGroup::getMaxTries() const -{ - return _maxTries; -} - bool RequestGroup::doesDownloadSpeedExceed() { return _maxDownloadSpeedLimit > 0 && diff --git a/src/RequestGroup.h b/src/RequestGroup.h index 6deed1ab..c3659713 100644 --- a/src/RequestGroup.h +++ b/src/RequestGroup.h @@ -193,9 +193,12 @@ public: * Reinitializes SegmentMan based on current property values and * returns new one. */ - SharedHandle<SegmentMan> initSegmentMan(); + const SharedHandle<SegmentMan>& initSegmentMan(); - SharedHandle<SegmentMan> getSegmentMan() const; + const SharedHandle<SegmentMan>& getSegmentMan() const + { + return _segmentMan; + } // Returns first bootstrap commands to initiate a download. // If this is HTTP/FTP download and file size is unknown, only 1 command @@ -260,7 +263,10 @@ public: _numConcurrentCommand = num; } - unsigned int getNumConcurrentCommand() const; + unsigned int getNumConcurrentCommand() const + { + return _numConcurrentCommand; + } int32_t getGID() const { @@ -269,15 +275,24 @@ public: TransferStat calculateStat(); - SharedHandle<DownloadContext> getDownloadContext() const; + const SharedHandle<DownloadContext>& getDownloadContext() const + { + return _downloadContext; + } void setDownloadContext(const SharedHandle<DownloadContext>& downloadContext); - SharedHandle<PieceStorage> getPieceStorage() const; + const SharedHandle<PieceStorage>& getPieceStorage() const + { + return _pieceStorage; + } void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage); - SharedHandle<BtProgressInfoFile> getProgressInfoFile() const; + const SharedHandle<BtProgressInfoFile>& getProgressInfoFile() const + { + return _progressInfoFile; + } void setProgressInfoFile(const SharedHandle<BtProgressInfoFile>& progressInfoFile); @@ -299,7 +314,10 @@ public: // TODO is it better to move the following 2 methods to SingleFileDownloadContext? void setDiskWriterFactory(const SharedHandle<DiskWriterFactory>& diskWriterFactory); - SharedHandle<DiskWriterFactory> getDiskWriterFactory() const; + const SharedHandle<DiskWriterFactory>& getDiskWriterFactory() const + { + return _diskWriterFactory; + } void setFileAllocationEnabled(bool f) { @@ -344,7 +362,10 @@ public: void addURIResult(std::string uri, DownloadResult::RESULT result); - const std::deque<URIResult>& getURIResults() const; + const std::deque<URIResult>& getURIResults() const + { + return _uriResults; + } // Extracts URIResult whose _result is r and stores them into res. // The extracted URIResults are removed from _uriResults. @@ -420,13 +441,19 @@ public: void reportDownloadFinished(); - const std::deque<std::string>& getAcceptFeatures() const; + const std::deque<std::string>& getAcceptFeatures() const + { + return _acceptFeatures; + } void addAcceptFeatureHeader(const std::string& feature); void removeAcceptFeatureHeader(const std::string& feature); - const std::deque<std::string>& getAcceptTypes() const; + const std::deque<std::string>& getAcceptTypes() const + { + return _acceptTypes; + } void addAcceptType(const std::string& type); @@ -446,17 +473,26 @@ public: void markInMemoryDownload(); // Returns inMemoryDownload flag. - bool inMemoryDownload() const; + bool inMemoryDownload() const + { + return _inMemoryDownload; + } void tuneDownloadCommand(DownloadCommand* command); void setTimeout(time_t timeout); - time_t getTimeout() const; + time_t getTimeout() const + { + return _timeout; + } void setMaxTries(unsigned int maxTries); - unsigned int getMaxTries() const; + unsigned int getMaxTries() const + { + return _maxTries; + } // Returns true if current download speed exceeds // _maxDownloadSpeedLimit. Always returns false if diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc index 428ba627..e5fcec5a 100644 --- a/src/RequestGroupMan.cc +++ b/src/RequestGroupMan.cc @@ -131,12 +131,6 @@ RequestGroupHandle RequestGroupMan::getRequestGroup(size_t index) const } } -const std::deque<SharedHandle<RequestGroup> >& -RequestGroupMan::getRequestGroups() const -{ - return _requestGroups; -} - template<typename Iterator> static Iterator findByGID(Iterator first, Iterator last, int32_t gid) { @@ -160,12 +154,6 @@ RequestGroupMan::findRequestGroup(int32_t gid) const } } -const std::deque<SharedHandle<RequestGroup> >& -RequestGroupMan::getReservedGroups() const -{ - return _reservedGroups; -} - SharedHandle<RequestGroup> RequestGroupMan::findReservedGroup(int32_t gid) const { @@ -723,12 +711,6 @@ TransferStat RequestGroupMan::calculateStat() return s; } -const std::deque<SharedHandle<DownloadResult> >& -RequestGroupMan::getDownloadResults() const -{ - return _downloadResults; -} - SharedHandle<DownloadResult> RequestGroupMan::findDownloadResult(int32_t gid) const { diff --git a/src/RequestGroupMan.h b/src/RequestGroupMan.h index d181fb5d..67f9578f 100644 --- a/src/RequestGroupMan.h +++ b/src/RequestGroupMan.h @@ -110,11 +110,17 @@ public: SharedHandle<RequestGroup> getRequestGroup(size_t index) const; - const std::deque<SharedHandle<RequestGroup> >& getRequestGroups() const; + const std::deque<SharedHandle<RequestGroup> >& getRequestGroups() const + { + return _requestGroups; + } SharedHandle<RequestGroup> findRequestGroup(int32_t gid) const; - const std::deque<SharedHandle<RequestGroup> >& getReservedGroups() const; + const std::deque<SharedHandle<RequestGroup> >& getReservedGroups() const + { + return _reservedGroups; + } SharedHandle<RequestGroup> findReservedGroup(int32_t gid) const; @@ -164,8 +170,10 @@ public: DownloadStat getDownloadStat() const; - const std::deque<SharedHandle<DownloadResult> >& - getDownloadResults() const; + const std::deque<SharedHandle<DownloadResult> >& getDownloadResults() const + { + return _downloadResults; + } SharedHandle<DownloadResult> findDownloadResult(int32_t gid) const; diff --git a/src/RequestSlot.cc b/src/RequestSlot.cc index 60c7e643..01f83d70 100644 --- a/src/RequestSlot.cc +++ b/src/RequestSlot.cc @@ -107,9 +107,4 @@ bool RequestSlot::isNull(const RequestSlot& requestSlot) { requestSlot.length == 0; } -SharedHandle<Piece> RequestSlot::getPiece() const -{ - return _piece; -} - } // namespace aria2 diff --git a/src/RequestSlot.h b/src/RequestSlot.h index 8155b899..1c9c6fed 100644 --- a/src/RequestSlot.h +++ b/src/RequestSlot.h @@ -36,9 +36,11 @@ #define _D_REQUEST_SLOT_H_ #include "common.h" + +#include <deque> + #include "TimeA2.h" #include "Piece.h" -#include <deque> namespace aria2 { @@ -94,7 +96,10 @@ public: size_t getBlockIndex() const { return blockIndex; } void setBlockIndex(size_t blockIndex) { this->blockIndex = blockIndex; } - SharedHandle<Piece> getPiece() const; + const SharedHandle<Piece>& getPiece() const + { + return _piece; + } static RequestSlot nullSlot; diff --git a/src/SegmentMan.cc b/src/SegmentMan.cc index 139d886f..bb82fe98 100644 --- a/src/SegmentMan.cc +++ b/src/SegmentMan.cc @@ -295,11 +295,6 @@ PeerStatHandle SegmentMan::getPeerStat(cuid_t cuid) const } } -const std::deque<SharedHandle<PeerStat> >& SegmentMan::getPeerStats() const -{ - return peerStats; -} - unsigned int SegmentMan::calculateDownloadSpeed() { unsigned int speed = 0; diff --git a/src/SegmentMan.h b/src/SegmentMan.h index 450136bf..db9f68e9 100644 --- a/src/SegmentMan.h +++ b/src/SegmentMan.h @@ -183,8 +183,10 @@ public: */ SharedHandle<PeerStat> getPeerStat(cuid_t cuid) const; - - const std::deque<SharedHandle<PeerStat> >& getPeerStats() const; + const std::deque<SharedHandle<PeerStat> >& getPeerStats() const + { + return peerStats; + } /** * Returns current download speed in bytes per sec. diff --git a/src/SelectEventPoll.cc b/src/SelectEventPoll.cc index 14c2b5db..3021ca57 100644 --- a/src/SelectEventPoll.cc +++ b/src/SelectEventPoll.cc @@ -48,36 +48,6 @@ namespace aria2 { SelectEventPoll::CommandEvent::CommandEvent(Command* command, int events): _command(command), _events(events) {} -bool SelectEventPoll::CommandEvent::operator==(const CommandEvent& commandEvent) const -{ - return _command == commandEvent._command; -} - -Command* SelectEventPoll::CommandEvent::getCommand() const -{ - return _command; -} - -int SelectEventPoll::CommandEvent::getEvents() const -{ - return _events; -} - -void SelectEventPoll::CommandEvent::addEvents(int events) -{ - _events |= events; -} - -void SelectEventPoll::CommandEvent::removeEvents(int events) -{ - _events &= (~events); -} - -bool SelectEventPoll::CommandEvent::eventsEmpty() const -{ - return _events == 0; -} - void SelectEventPoll::CommandEvent::processEvents(int events) { if((_events&events) || @@ -100,16 +70,6 @@ void SelectEventPoll::CommandEvent::processEvents(int events) SelectEventPoll::SocketEntry::SocketEntry(sock_t socket):_socket(socket) {} -bool SelectEventPoll::SocketEntry::operator==(const SocketEntry& entry) const -{ - return _socket == entry._socket; -} - -bool SelectEventPoll::SocketEntry::operator<(const SocketEntry& entry) const -{ - return _socket < entry._socket; -} - void SelectEventPoll::SocketEntry::addCommandEvent (Command* command, int events) { @@ -146,16 +106,6 @@ void SelectEventPoll::SocketEntry::processEvents(int events) events)); } -sock_t SelectEventPoll::SocketEntry::getSocket() const -{ - return _socket; -} - -bool SelectEventPoll::SocketEntry::eventEmpty() const -{ - return _commandEvents.empty(); -} - int accumulateEvent(int events, const SelectEventPoll::CommandEvent& event) { return events|event.getEvents(); @@ -174,12 +124,6 @@ SelectEventPoll::AsyncNameResolverEntry::AsyncNameResolverEntry (const SharedHandle<AsyncNameResolver>& nameResolver, Command* command): _nameResolver(nameResolver), _command(command) {} -bool SelectEventPoll::AsyncNameResolverEntry::operator== -(const AsyncNameResolverEntry& entry) -{ - return _nameResolver == entry._nameResolver && - _command == entry._command; -} int SelectEventPoll::AsyncNameResolverEntry::getFds (fd_set* rfdsPtr, fd_set* wfdsPtr) { diff --git a/src/SelectEventPoll.h b/src/SelectEventPoll.h index c8326d7e..5eaef4cb 100644 --- a/src/SelectEventPoll.h +++ b/src/SelectEventPoll.h @@ -56,17 +56,35 @@ private: public: CommandEvent(Command* command, int events); - Command* getCommand() const; + Command* getCommand() const + { + return _command; + } - void addEvents(int events); + void addEvents(int events) + { + _events |= events; + } + + void removeEvents(int events) + { + _events &= (~events); + } - void removeEvents(int events); - - bool eventsEmpty() const; + bool eventsEmpty() const + { + return _events == 0; + } - bool operator==(const CommandEvent& event) const; - - int getEvents() const; + bool operator==(const CommandEvent& commandEvent) const + { + return _command == commandEvent._command; + } + + int getEvents() const + { + return _events; + } void processEvents(int events); }; @@ -82,9 +100,15 @@ private: public: SocketEntry(sock_t socket); - bool operator==(const SocketEntry& entry) const; + bool operator==(const SocketEntry& entry) const + { + return _socket == entry._socket; + } - bool operator<(const SocketEntry& entry) const; + bool operator<(const SocketEntry& entry) const + { + return _socket < entry._socket; + } void addCommandEvent(Command* command, int events); @@ -92,9 +116,15 @@ private: int getEvents(); - sock_t getSocket() const; + sock_t getSocket() const + { + return _socket; + } - bool eventEmpty() const; + bool eventEmpty() const + { + return _commandEvents.empty(); + } void processEvents(int events); }; @@ -111,7 +141,11 @@ private: AsyncNameResolverEntry(const SharedHandle<AsyncNameResolver>& nameResolver, Command* command); - bool operator==(const AsyncNameResolverEntry& entry); + bool operator==(const AsyncNameResolverEntry& entry) + { + return _nameResolver == entry._nameResolver && + _command == entry._command; + } int getFds(fd_set* rfdsPtr, fd_set* wfdsPtr); diff --git a/src/ServerStat.cc b/src/ServerStat.cc index 84f95585..f889d53d 100644 --- a/src/ServerStat.cc +++ b/src/ServerStat.cc @@ -61,31 +61,11 @@ ServerStat::ServerStat(const std::string& hostname, const std::string& protocol) ServerStat::~ServerStat() {} -const std::string& ServerStat::getHostname() const -{ - return _hostname; -} - -const std::string& ServerStat::getProtocol() const -{ - return _protocol; -} - -const Time& ServerStat::getLastUpdated() const -{ - return _lastUpdated; -} - void ServerStat::setLastUpdated(const Time& time) { _lastUpdated = time; } -unsigned int ServerStat::getDownloadSpeed() const -{ - return _downloadSpeed; -} - void ServerStat::setDownloadSpeed(unsigned int downloadSpeed) { _downloadSpeed = downloadSpeed; @@ -100,11 +80,6 @@ void ServerStat::updateDownloadSpeed(unsigned int downloadSpeed) _lastUpdated.reset(); } -unsigned int ServerStat::getSingleConnectionAvgSpeed() const -{ - return _singleConnectionAvgSpeed; -} - void ServerStat::setSingleConnectionAvgSpeed (unsigned int singleConnectionAvgSpeed) { @@ -139,11 +114,6 @@ void ServerStat::updateSingleConnectionAvgSpeed(unsigned int downloadSpeed) _singleConnectionAvgSpeed = (int)avgDownloadSpeed; } -unsigned int ServerStat::getMultiConnectionAvgSpeed() const -{ - return _multiConnectionAvgSpeed; -} - void ServerStat::setMultiConnectionAvgSpeed (unsigned int multiConnectionAvgSpeed) { @@ -173,11 +143,6 @@ void ServerStat::updateMultiConnectionAvgSpeed(unsigned int downloadSpeed) _multiConnectionAvgSpeed = (int)avgDownloadSpeed; } -unsigned int ServerStat::getCounter() const -{ - return _counter; -} - void ServerStat::increaseCounter() { _counter++; @@ -214,26 +179,11 @@ void ServerStat::setStatusInternal(STATUS status) _lastUpdated.reset(); } -ServerStat::STATUS ServerStat::getStatus() const -{ - return _status; -} - -bool ServerStat::isOK() const -{ - return _status == OK; -} - void ServerStat::setOK() { setStatusInternal(OK); } -bool ServerStat::isError() const -{ - return _status == ERROR; -} - void ServerStat::setError() { setStatusInternal(ERROR); diff --git a/src/ServerStat.h b/src/ServerStat.h index c0895c42..28150573 100644 --- a/src/ServerStat.h +++ b/src/ServerStat.h @@ -62,16 +62,28 @@ public: ~ServerStat(); - const std::string& getHostname() const; + const std::string& getHostname() const + { + return _hostname; + } - const std::string& getProtocol() const; + const std::string& getProtocol() const + { + return _protocol; + } - const Time& getLastUpdated() const; + const Time& getLastUpdated() const + { + return _lastUpdated; + } // This method doesn't update _lastUpdate. void setLastUpdated(const Time& time); - unsigned int getDownloadSpeed() const; + unsigned int getDownloadSpeed() const + { + return _downloadSpeed; + } // update download speed and update _lastUpdated void updateDownloadSpeed(unsigned int downloadSpeed); @@ -79,15 +91,27 @@ public: // set download speed. This method doesn't update _lastUpdate. void setDownloadSpeed(unsigned int downloadSpeed); - unsigned int getSingleConnectionAvgSpeed() const; + unsigned int getSingleConnectionAvgSpeed() const + { + return _singleConnectionAvgSpeed; + } + void updateSingleConnectionAvgSpeed(unsigned int downloadSpeed); void setSingleConnectionAvgSpeed(unsigned int singleConnectionAvgSpeed); - unsigned int getMultiConnectionAvgSpeed() const; + unsigned int getMultiConnectionAvgSpeed() const + { + return _multiConnectionAvgSpeed; + } + void updateMultiConnectionAvgSpeed(unsigned int downloadSpeed); void setMultiConnectionAvgSpeed(unsigned int singleConnectionAvgSpeed); - unsigned int getCounter() const; + unsigned int getCounter() const + { + return _counter; + } + void increaseCounter(); void setCounter(unsigned int value); @@ -99,14 +123,23 @@ public: // This method doesn't update _lastUpdate. void setStatus(const std::string& status); - STATUS getStatus() const; + STATUS getStatus() const + { + return _status; + } - bool isOK() const; + bool isOK() const + { + return _status == OK; + } // set status OK and update _lastUpdated void setOK(); - bool isError() const; + bool isError() const + { + return _status == ERROR; + } // set status ERROR and update _lastUpdated void setError(); diff --git a/src/Signature.cc b/src/Signature.cc index 0062035e..12d538f9 100644 --- a/src/Signature.cc +++ b/src/Signature.cc @@ -33,9 +33,11 @@ */ /* copyright --> */ #include "Signature.h" -#include "File.h" + #include <fstream> +#include "File.h" + namespace aria2 { Signature::Signature() {} @@ -47,31 +49,16 @@ void Signature::setType(const std::string& type) _type = type; } -const std::string& Signature::getType() const -{ - return _type; -} - void Signature::setFile(const std::string& file) { _file = file; } -const std::string& Signature::getFile() const -{ - return _file; -} - void Signature::setBody(const std::string& body) { _body = body; } -const std::string& Signature::getBody() const -{ - return _body; -} - bool Signature::save(const std::string& filepath) const { if(File(filepath).exists()) { diff --git a/src/Signature.h b/src/Signature.h index bb19710f..893641ea 100644 --- a/src/Signature.h +++ b/src/Signature.h @@ -36,9 +36,11 @@ #define _D_SIGNATURE_H_ #include "common.h" -#include "SharedHandle.h" + #include <string> +#include "SharedHandle.h" + namespace aria2 { class Signature { @@ -55,15 +57,24 @@ public: void setType(const std::string& type); - const std::string& getType() const; + const std::string& getType() const + { + return _type; + } void setFile(const std::string& file); - const std::string& getFile() const; + const std::string& getFile() const + { + return _file; + } void setBody(const std::string& body); - const std::string& getBody() const; + const std::string& getBody() const + { + return _body; + } bool save(const std::string& filepath) const; }; diff --git a/src/URIResult.cc b/src/URIResult.cc index 94992dfd..e848d70f 100644 --- a/src/URIResult.cc +++ b/src/URIResult.cc @@ -39,14 +39,4 @@ namespace aria2 { URIResult::URIResult(const std::string& uri, DownloadResult::RESULT result): _uri(uri), _result(result) {} -const std::string& URIResult::getURI() const -{ - return _uri; -} - -DownloadResult::RESULT URIResult::getResult() const -{ - return _result; -} - } // namespace aria2 diff --git a/src/URIResult.h b/src/URIResult.h index 7a91e303..45380690 100644 --- a/src/URIResult.h +++ b/src/URIResult.h @@ -52,9 +52,16 @@ private: public: URIResult(const std::string& uri, DownloadResult::RESULT result); - const std::string& getURI() const; + const std::string& getURI() const + { + return _uri; + } + + DownloadResult::RESULT getResult() const + { + return _result; + } - DownloadResult::RESULT getResult() const; }; } // namespace aria2 diff --git a/src/UTPexExtensionMessage.cc b/src/UTPexExtensionMessage.cc index ced4510c..c30c609f 100644 --- a/src/UTPexExtensionMessage.cc +++ b/src/UTPexExtensionMessage.cc @@ -106,11 +106,6 @@ bool UTPexExtensionMessage::addFreshPeer(const PeerHandle& peer) } } -const Peers& UTPexExtensionMessage::getFreshPeers() const -{ - return _freshPeers; -} - bool UTPexExtensionMessage::freshPeersAreFull() const { return _freshPeers.size() >= _maxFreshPeer; @@ -127,11 +122,6 @@ bool UTPexExtensionMessage::addDroppedPeer(const PeerHandle& peer) } } -const Peers& UTPexExtensionMessage::getDroppedPeers() const -{ - return _droppedPeers; -} - bool UTPexExtensionMessage::droppedPeersAreFull() const { return _droppedPeers.size() >= _maxDroppedPeer; @@ -142,21 +132,11 @@ void UTPexExtensionMessage::setMaxFreshPeer(size_t maxFreshPeer) _maxFreshPeer = maxFreshPeer; } -size_t UTPexExtensionMessage::getMaxFreshPeer() const -{ - return _maxFreshPeer; -} - void UTPexExtensionMessage::setMaxDroppedPeer(size_t maxDroppedPeer) { _maxDroppedPeer = maxDroppedPeer; } -size_t UTPexExtensionMessage::getMaxDroppedPeer() const -{ - return _maxDroppedPeer; -} - void UTPexExtensionMessage::setPeerStorage (const SharedHandle<PeerStorage>& peerStorage) { diff --git a/src/UTPexExtensionMessage.h b/src/UTPexExtensionMessage.h index 7bf19073..054f309d 100644 --- a/src/UTPexExtensionMessage.h +++ b/src/UTPexExtensionMessage.h @@ -93,13 +93,19 @@ public: bool addFreshPeer(const SharedHandle<Peer>& peer); - const std::deque<SharedHandle<Peer> >& getFreshPeers() const; + const std::deque<SharedHandle<Peer> >& getFreshPeers() const + { + return _freshPeers; + } bool freshPeersAreFull() const; bool addDroppedPeer(const SharedHandle<Peer>& peer); - const std::deque<SharedHandle<Peer> >& getDroppedPeers() const; + const std::deque<SharedHandle<Peer> >& getDroppedPeers() const + { + return _droppedPeers; + } bool droppedPeersAreFull() const; @@ -110,11 +116,17 @@ public: void setMaxFreshPeer(size_t maxFreshPeer); - size_t getMaxFreshPeer() const; + size_t getMaxFreshPeer() const + { + return _maxFreshPeer; + } void setMaxDroppedPeer(size_t maxDroppedPeer); - size_t getMaxDroppedPeer() const; + size_t getMaxDroppedPeer() const + { + return _maxDroppedPeer; + } static const time_t DEFAULT_INTERVAL = 60; |