From 3258614033aaf8288dc4b14275c72a1bb3b65a7e Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 28 Sep 2012 23:27:46 +0900 Subject: [PATCH] Removed *Handle typedef --- src/AbstractAuthResolver.cc | 6 ++-- src/AbstractAuthResolver.h | 2 -- src/AbstractBtMessage.h | 4 +-- src/AbstractCommand.cc | 12 ++++--- src/AbstractProxyRequestCommand.cc | 4 +-- src/AbstractProxyResponseCommand.cc | 6 ++-- src/AbstractSingleDiskAdaptor.cc | 4 +-- src/AuthConfig.cc | 3 +- src/AuthConfig.h | 5 ++- src/AuthConfigFactory.cc | 24 ++++++------- src/AuthConfigFactory.h | 7 ++-- src/AuthResolver.h | 6 ++-- src/BinaryStream.h | 6 +--- src/BtAnnounce.h | 3 -- src/BtBitfieldMessageValidator.h | 2 -- src/BtCheckIntegrityEntry.h | 2 -- src/BtDependency.h | 3 +- src/BtExtendedMessage.cc | 2 +- src/BtFileAllocationEntry.h | 2 -- src/BtHandshakeMessageValidator.h | 2 -- src/BtInteractive.h | 2 -- src/BtKeepAliveMessage.h | 4 --- src/BtMessage.h | 3 -- src/BtMessageDispatcher.h | 2 -- src/BtMessageFactory.h | 6 ++-- src/BtMessageReceiver.h | 2 -- src/BtMessageValidator.h | 4 --- src/BtPieceMessage.cc | 6 ++-- src/BtPieceMessageValidator.h | 2 -- src/BtProgressInfoFile.h | 4 +-- src/BtRequestFactory.h | 2 -- src/BtRequestMessage.cc | 4 +-- src/BtRuntime.h | 3 -- src/ByteArrayDiskWriter.h | 2 -- src/ByteArrayDiskWriterFactory.h | 2 -- src/CheckIntegrityEntry.h | 4 ++- src/ConsoleStatCalc.h | 2 -- src/DHTConnectionImpl.cc | 2 +- src/DHTInteractionCommand.cc | 6 ++-- src/DefaultAuthResolver.cc | 2 +- src/DefaultBtAnnounce.cc | 10 +++--- src/DefaultBtInteractive.cc | 12 +++---- src/DefaultBtMessageDispatcher.cc | 4 +-- src/DefaultBtMessageFactory.cc | 6 ++-- src/DefaultBtMessageReceiver.cc | 4 +-- src/DefaultBtProgressInfoFile.cc | 2 +- src/DefaultBtProgressInfoFile.h | 3 +- src/DefaultExtensionMessageFactory.cc | 6 ++-- src/DefaultPieceStorage.cc | 16 ++++----- src/Dependency.h | 3 -- src/DirectDiskAdaptor.h | 2 -- src/DiskAdaptor.h | 3 +- src/DiskWriter.h | 4 +-- src/DiskWriterFactory.h | 2 -- src/DownloadCommand.cc | 4 +-- src/DownloadEngine.cc | 12 +++---- src/DownloadEngine.h | 2 -- src/DownloadEngineFactory.cc | 6 ++-- src/DownloadResult.h | 4 +-- src/ExtensionMessage.h | 4 --- src/ExtensionMessageFactory.h | 2 -- src/FileAllocationEntry.h | 4 ++- src/FtpConnection.cc | 4 +-- src/FtpDownloadCommand.cc | 6 ++-- src/FtpInitiateConnectionCommand.cc | 2 +- src/FtpNegotiationCommand.cc | 4 +-- src/FtpTunnelRequestCommand.cc | 4 +-- src/FtpTunnelResponseCommand.cc | 6 ++-- src/HandshakeExtensionMessage.cc | 4 +-- src/HandshakeExtensionMessage.h | 5 ++- src/HaveEraseCommand.cc | 2 +- src/HttpConnection.cc | 6 ++-- src/HttpConnection.h | 9 ++--- src/HttpDownloadCommand.cc | 6 ++-- src/HttpHeader.cc | 2 +- src/HttpHeader.h | 2 -- src/HttpInitiateConnectionCommand.cc | 2 +- src/HttpProxyRequestCommand.cc | 4 +-- src/HttpProxyResponseCommand.cc | 6 ++-- src/HttpRequest.cc | 4 +-- src/HttpRequestCommand.cc | 6 ++-- src/HttpResponse.cc | 2 +- src/HttpResponseCommand.cc | 6 ++-- src/InitiatorMSEHandshakeCommand.cc | 2 +- src/IteratableChecksumValidator.cc | 2 +- src/IteratableChecksumValidator.h | 3 +- src/IteratableChunkChecksumValidator.cc | 2 +- src/IteratableChunkChecksumValidator.h | 4 +-- src/IteratableValidator.h | 4 +-- src/MSEHandshake.cc | 4 +-- src/MultiDiskAdaptor.cc | 4 +-- src/MultiDiskAdaptor.h | 8 ++--- src/MultiUrlRequestInfo.cc | 2 +- src/MultiUrlRequestInfo.h | 4 +-- src/NetrcAuthResolver.h | 4 +-- src/NullProgressInfoFile.h | 2 -- src/PeerAbstractCommand.cc | 8 ++--- src/PeerConnection.cc | 4 +-- src/PeerConnection.h | 4 +-- src/PeerInitiateConnectionCommand.cc | 2 +- src/PeerInteractionCommand.cc | 13 +++---- src/PeerListenCommand.cc | 4 +-- src/PeerReceiveHandshakeCommand.cc | 4 +-- src/PeerStat.h | 2 -- src/PeerStorage.h | 4 +-- src/PieceHashCheckIntegrityEntry.cc | 2 +- src/PieceStorage.h | 2 -- src/ProgressAwareEntry.h | 4 --- src/Randomizer.h | 3 -- src/Range.h | 4 --- src/ReceiverMSEHandshakeCommand.cc | 2 +- src/RequestGroup.cc | 13 +++---- src/RequestGroupEntry.h | 5 +-- src/RequestGroupMan.cc | 6 ++-- src/RequestGroupMan.h | 6 ++-- src/SegmentMan.cc | 10 +++--- src/SegmentMan.h | 3 +- src/SimpleRandomizer.h | 6 ++-- src/Socket.h | 47 ------------------------- src/StatCalc.h | 2 -- src/StreamCheckIntegrityEntry.h | 2 -- src/UTMetadataDataExtensionMessage.h | 1 + src/UTMetadataRequestExtensionMessage.h | 1 + src/UTPexExtensionMessage.cc | 4 +-- src/UTPexExtensionMessage.h | 11 +++--- src/UnknownLengthPieceStorage.cc | 10 +++--- src/UnknownLengthPieceStorage.h | 2 -- src/message_digest_helper.cc | 2 +- src/util.cc | 2 +- test/MSEHandshakeTest.cc | 2 +- 130 files changed, 229 insertions(+), 389 deletions(-) delete mode 100644 src/Socket.h diff --git a/src/AbstractAuthResolver.cc b/src/AbstractAuthResolver.cc index 94d2e7d6..2b273cb9 100644 --- a/src/AbstractAuthResolver.cc +++ b/src/AbstractAuthResolver.cc @@ -41,12 +41,14 @@ AbstractAuthResolver::AbstractAuthResolver() {} AbstractAuthResolver::~AbstractAuthResolver() {} -void AbstractAuthResolver::setUserDefinedAuthConfig(const AuthConfigHandle& authConfig) +void AbstractAuthResolver::setUserDefinedAuthConfig +(const SharedHandle& authConfig) { userDefinedAuthConfig_ = authConfig; } -void AbstractAuthResolver::setDefaultAuthConfig(const AuthConfigHandle& authConfig) +void AbstractAuthResolver::setDefaultAuthConfig +(const SharedHandle& authConfig) { defaultAuthConfig_ = authConfig; } diff --git a/src/AbstractAuthResolver.h b/src/AbstractAuthResolver.h index 54f33e04..93e73b87 100644 --- a/src/AbstractAuthResolver.h +++ b/src/AbstractAuthResolver.h @@ -65,8 +65,6 @@ public: }; -typedef SharedHandle AbstractAuthResolverHandle; - } // namespace aria2 #endif // D_ABSTRACT_AUTH_RESOLVER_H diff --git a/src/AbstractBtMessage.h b/src/AbstractBtMessage.h index 5d149515..4f7bf288 100644 --- a/src/AbstractBtMessage.h +++ b/src/AbstractBtMessage.h @@ -149,7 +149,7 @@ public: virtual void doReceivedAction() {} virtual void validate(); - + virtual void onQueued() {} virtual void onAbortOutstandingRequestEvent @@ -183,8 +183,6 @@ public: } }; -typedef SharedHandle AbstractBtMessageHandle; - } // namespace aria2 #endif // D_ABSTRACT_BT_MESSAGE_H diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc index 2b31538a..8a61701c 100644 --- a/src/AbstractCommand.cc +++ b/src/AbstractCommand.cc @@ -51,7 +51,7 @@ #include "SleepCommand.h" #include "StreamCheckIntegrityEntry.h" #include "PieceStorage.h" -#include "Socket.h" +#include "SocketCore.h" #include "message.h" #include "prefs.h" #include "fmt.h" @@ -82,7 +82,7 @@ AbstractCommand::AbstractCommand const SharedHandle& fileEntry, RequestGroup* requestGroup, DownloadEngine* e, - const SocketHandle& s, + const SharedHandle& s, const SharedHandle& socketRecvBuffer, bool incNumConnection) : Command(cuid), checkPoint_(global::wallclock()), @@ -475,10 +475,11 @@ void AbstractCommand::disableReadCheckSocket() { e_->deleteSocketForReadCheck(readCheckTarget_, this); checkSocketIsReadable_ = false; readCheckTarget_.reset(); - } + } } -void AbstractCommand::setReadCheckSocket(const SocketHandle& socket) { +void AbstractCommand::setReadCheckSocket +(const SharedHandle& socket) { if(!socket->isOpen()) { disableReadCheckSocket(); } else { @@ -514,7 +515,8 @@ void AbstractCommand::disableWriteCheckSocket() { } } -void AbstractCommand::setWriteCheckSocket(const SocketHandle& socket) { +void AbstractCommand::setWriteCheckSocket +(const SharedHandle& socket) { if(!socket->isOpen()) { disableWriteCheckSocket(); } else { diff --git a/src/AbstractProxyRequestCommand.cc b/src/AbstractProxyRequestCommand.cc index 3ee6b74b..22bce921 100644 --- a/src/AbstractProxyRequestCommand.cc +++ b/src/AbstractProxyRequestCommand.cc @@ -41,7 +41,7 @@ #include "Segment.h" #include "Option.h" #include "prefs.h" -#include "Socket.h" +#include "SocketCore.h" #include "DownloadContext.h" #include "SocketRecvBuffer.h" @@ -54,7 +54,7 @@ AbstractProxyRequestCommand::AbstractProxyRequestCommand RequestGroup* requestGroup, DownloadEngine* e, const SharedHandle& proxyRequest, - const SocketHandle& s) + const SharedHandle& s) : AbstractCommand(cuid, req, fileEntry, requestGroup, e, s), proxyRequest_(proxyRequest), diff --git a/src/AbstractProxyResponseCommand.cc b/src/AbstractProxyResponseCommand.cc index 94224514..32c5bb0e 100644 --- a/src/AbstractProxyResponseCommand.cc +++ b/src/AbstractProxyResponseCommand.cc @@ -41,7 +41,7 @@ #include "HttpRequest.h" #include "HttpResponse.h" #include "HttpRequestCommand.h" -#include "Socket.h" +#include "SocketCore.h" #include "DlRetryEx.h" #include "message.h" #include "HttpHeader.h" @@ -55,9 +55,9 @@ AbstractProxyResponseCommand::AbstractProxyResponseCommand const SharedHandle& req, const SharedHandle& fileEntry, RequestGroup* requestGroup, - const HttpConnectionHandle& httpConnection, + const SharedHandle& httpConnection, DownloadEngine* e, - const SocketHandle& s) + const SharedHandle& s) :AbstractCommand(cuid, req, fileEntry, requestGroup, e, s), httpConnection_(httpConnection) {} diff --git a/src/AbstractSingleDiskAdaptor.cc b/src/AbstractSingleDiskAdaptor.cc index f87a6e86..4279090c 100644 --- a/src/AbstractSingleDiskAdaptor.cc +++ b/src/AbstractSingleDiskAdaptor.cc @@ -146,9 +146,9 @@ void AbstractSingleDiskAdaptor::cutTrailingGarbage() diskWriter_->truncate(totalLength_); } } - + void AbstractSingleDiskAdaptor::setDiskWriter -(const DiskWriterHandle& diskWriter) +(const SharedHandle& diskWriter) { diskWriter_ = diskWriter; } diff --git a/src/AuthConfig.cc b/src/AuthConfig.cc index 470aa0b9..78370749 100644 --- a/src/AuthConfig.cc +++ b/src/AuthConfig.cc @@ -57,7 +57,8 @@ std::string AuthConfig::getAuthText() const return s; } -std::ostream& operator<<(std::ostream& o, const AuthConfigHandle& authConfig) +std::ostream& operator<<(std::ostream& o, + const SharedHandle& authConfig) { o << authConfig->getAuthText(); return o; diff --git a/src/AuthConfig.h b/src/AuthConfig.h index bdf7c8ae..83d728eb 100644 --- a/src/AuthConfig.h +++ b/src/AuthConfig.h @@ -71,9 +71,8 @@ public: } }; -typedef SharedHandle AuthConfigHandle; - -std::ostream& operator<<(std::ostream& o, const AuthConfigHandle& authConfig); +std::ostream& operator<<(std::ostream& o, + const SharedHandle& authConfig); } // namespace aria2 diff --git a/src/AuthConfigFactory.cc b/src/AuthConfigFactory.cc index bd858e05..525b984a 100644 --- a/src/AuthConfigFactory.cc +++ b/src/AuthConfigFactory.cc @@ -56,7 +56,7 @@ AuthConfigFactory::AuthConfigFactory() {} AuthConfigFactory::~AuthConfigFactory() {} -AuthConfigHandle +SharedHandle AuthConfigFactory::createAuthConfig (const SharedHandle& request, const Option* op) { @@ -119,7 +119,7 @@ AuthConfigFactory::createAuthConfig } } -AuthConfigHandle +SharedHandle AuthConfigFactory::createAuthConfig(const std::string& user, const std::string& password) const { SharedHandle ac; @@ -129,31 +129,31 @@ AuthConfigFactory::createAuthConfig(const std::string& user, const std::string& return ac; } -AuthResolverHandle AuthConfigFactory::createHttpAuthResolver +SharedHandle AuthConfigFactory::createHttpAuthResolver (const Option* op) const { - AbstractAuthResolverHandle resolver; + AbstractAuthResolver* resolver; if(op->getAsBool(PREF_NO_NETRC)) { - resolver.reset(new DefaultAuthResolver()); + resolver = new DefaultAuthResolver(); } else { - NetrcAuthResolverHandle authResolver(new NetrcAuthResolver()); + NetrcAuthResolver* authResolver(new NetrcAuthResolver()); authResolver->setNetrc(netrc_); authResolver->ignoreDefault(); resolver = authResolver; } resolver->setUserDefinedAuthConfig (createAuthConfig(op->get(PREF_HTTP_USER), op->get(PREF_HTTP_PASSWD))); - return resolver; + return SharedHandle(resolver); } -AuthResolverHandle AuthConfigFactory::createFtpAuthResolver +SharedHandle AuthConfigFactory::createFtpAuthResolver (const Option* op) const { - AbstractAuthResolverHandle resolver; + AbstractAuthResolver* resolver; if(op->getAsBool(PREF_NO_NETRC)) { - resolver.reset(new DefaultAuthResolver()); + resolver = new DefaultAuthResolver(); } else { - NetrcAuthResolverHandle authResolver(new NetrcAuthResolver()); + NetrcAuthResolver* authResolver(new NetrcAuthResolver()); authResolver->setNetrc(netrc_); resolver = authResolver; } @@ -162,7 +162,7 @@ AuthResolverHandle AuthConfigFactory::createFtpAuthResolver SharedHandle defaultAuthConfig (new AuthConfig(AUTH_DEFAULT_USER, AUTH_DEFAULT_PASSWD)); resolver->setDefaultAuthConfig(defaultAuthConfig); - return resolver; + return SharedHandle(resolver); } void AuthConfigFactory::setNetrc(const SharedHandle& netrc) diff --git a/src/AuthConfigFactory.h b/src/AuthConfigFactory.h index abd8efb8..6b520e2d 100644 --- a/src/AuthConfigFactory.h +++ b/src/AuthConfigFactory.h @@ -55,12 +55,12 @@ class AuthResolver; class AuthConfigFactory { private: SharedHandle netrc_; - + SharedHandle createAuthConfig(const std::string& user, const std::string& password) const; SharedHandle createHttpAuthResolver(const Option* op) const; - + SharedHandle createFtpAuthResolver(const Option* op) const; public: class BasicCred { @@ -90,7 +90,6 @@ public: private: BasicCredSet basicCreds_; public: - AuthConfigFactory(); ~AuthConfigFactory(); @@ -131,8 +130,6 @@ public: void updateBasicCred(const SharedHandle& basicCred); }; -typedef SharedHandle AuthConfigFactoryHandle; - } // namespace aria2 #endif // D_AUTH_CONFIG_FACTORY_H diff --git a/src/AuthResolver.h b/src/AuthResolver.h index 1000b16d..ab2cccf7 100644 --- a/src/AuthResolver.h +++ b/src/AuthResolver.h @@ -36,9 +36,11 @@ #define D_AUTH_RESOLVER_H #include "common.h" -#include "SharedHandle.h" + #include +#include "SharedHandle.h" + namespace aria2 { class AuthConfig; @@ -50,8 +52,6 @@ public: virtual SharedHandle resolveAuthConfig(const std::string& hostname) = 0; }; -typedef SharedHandle AuthResolverHandle; - } // namespace aria2 #endif // D_AUTH_RESOLVER_H diff --git a/src/BinaryStream.h b/src/BinaryStream.h index 585fa5e9..dabf8aa5 100644 --- a/src/BinaryStream.h +++ b/src/BinaryStream.h @@ -39,14 +39,12 @@ #include -#include "SharedHandle.h" - namespace aria2 { class BinaryStream { public: virtual ~BinaryStream() {} - + virtual void writeData(const unsigned char* data, size_t len, int64_t offset) = 0; @@ -61,8 +59,6 @@ public: virtual void allocate(int64_t offset, int64_t length) {} }; -typedef SharedHandle BinaryStreamHandle; - } // namespace aria2 #endif // D_BINARY_STREAM_H diff --git a/src/BtAnnounce.h b/src/BtAnnounce.h index 1641e90a..6cdd6804 100644 --- a/src/BtAnnounce.h +++ b/src/BtAnnounce.h @@ -39,7 +39,6 @@ #include -#include "SharedHandle.h" #include "a2time.h" namespace aria2 { @@ -132,8 +131,6 @@ public: static const time_t DEFAULT_ANNOUNCE_INTERVAL = 120; }; -typedef SharedHandle BtAnnounceHandle; - } // namespace aria2 #endif // D_BT_ANNOUNCE_H diff --git a/src/BtBitfieldMessageValidator.h b/src/BtBitfieldMessageValidator.h index ecdaa3a6..b53e7335 100644 --- a/src/BtBitfieldMessageValidator.h +++ b/src/BtBitfieldMessageValidator.h @@ -53,8 +53,6 @@ public: virtual void validate(); }; -typedef SharedHandle BtBitfieldMessageValidatorHandle; - } // namespace aria2 #endif // D_BT_BITFIELD_MESSAGE_VALIDATOR_H diff --git a/src/BtCheckIntegrityEntry.h b/src/BtCheckIntegrityEntry.h index b77ab5e5..91b140ac 100644 --- a/src/BtCheckIntegrityEntry.h +++ b/src/BtCheckIntegrityEntry.h @@ -52,8 +52,6 @@ public: DownloadEngine* e); }; -typedef SharedHandle BtCheckIntegrityEntryHandle; - } // namespace aria2 #endif // D_BT_FILE_ALLOCATION_ENTRY_H diff --git a/src/BtDependency.h b/src/BtDependency.h index 79bf77d2..ffb9175b 100644 --- a/src/BtDependency.h +++ b/src/BtDependency.h @@ -36,6 +36,7 @@ #define D_BT_DEPENDENCY_H #include "Dependency.h" +#include "SharedHandle.h" namespace aria2 { @@ -56,8 +57,6 @@ public: virtual bool resolve(); }; -typedef SharedHandle BtDependencyHandle; - } // namespace aria2 #endif // D_BT_DEPENDENCY_H diff --git a/src/BtExtendedMessage.cc b/src/BtExtendedMessage.cc index cd048a35..c9281be8 100644 --- a/src/BtExtendedMessage.cc +++ b/src/BtExtendedMessage.cc @@ -51,7 +51,7 @@ namespace aria2 { const char BtExtendedMessage::NAME[] = "extended"; BtExtendedMessage::BtExtendedMessage -(const ExtensionMessageHandle& extensionMessage): +(const SharedHandle& extensionMessage): SimpleBtMessage(ID, NAME), extensionMessage_(extensionMessage), msgLength_(0) diff --git a/src/BtFileAllocationEntry.h b/src/BtFileAllocationEntry.h index f4e098fb..a263a8ed 100644 --- a/src/BtFileAllocationEntry.h +++ b/src/BtFileAllocationEntry.h @@ -49,8 +49,6 @@ public: DownloadEngine* e); }; -typedef SharedHandle BtFileAllocationEntryHandle; - } // namespace aria2 #endif // D_BT_FILE_ALLOCATION_ENTRY_H diff --git a/src/BtHandshakeMessageValidator.h b/src/BtHandshakeMessageValidator.h index f0e863d0..274aa25b 100644 --- a/src/BtHandshakeMessageValidator.h +++ b/src/BtHandshakeMessageValidator.h @@ -58,8 +58,6 @@ public: virtual void validate(); }; -typedef SharedHandle BtHandshakeMessageValidatorHandle; - } // namespace aria2 #endif // D_BT_HANDSHAKE_MESSAGE_VALIDATOR_H diff --git a/src/BtInteractive.h b/src/BtInteractive.h index 3f901e6c..bec4069f 100644 --- a/src/BtInteractive.h +++ b/src/BtInteractive.h @@ -69,8 +69,6 @@ public: virtual size_t countOutstandingRequest() = 0; }; -typedef SharedHandle BtInteractiveHandle; - } // namespace aria2 #endif // D_BT_INTERACTIVE_H diff --git a/src/BtKeepAliveMessage.h b/src/BtKeepAliveMessage.h index de8e7b51..2e3ac116 100644 --- a/src/BtKeepAliveMessage.h +++ b/src/BtKeepAliveMessage.h @@ -39,10 +39,6 @@ namespace aria2 { -class BtKeepAliveMessage; - -typedef SharedHandle BtKeepAliveMessageHandle; - class BtKeepAliveMessage : public SimpleBtMessage { private: static const size_t MESSAGE_LENGTH = 4; diff --git a/src/BtMessage.h b/src/BtMessage.h index 418ad885..53f6ed82 100644 --- a/src/BtMessage.h +++ b/src/BtMessage.h @@ -39,7 +39,6 @@ #include -#include "SharedHandle.h" #include "BtAbortOutstandingRequestEvent.h" #include "BtCancelSendingPieceEvent.h" #include "BtChokingEvent.h" @@ -84,8 +83,6 @@ public: }; -typedef SharedHandle BtMessageHandle; - } // namespace aria2 #endif // D_BT_MESSAGE_H diff --git a/src/BtMessageDispatcher.h b/src/BtMessageDispatcher.h index d15ef532..24234f9a 100644 --- a/src/BtMessageDispatcher.h +++ b/src/BtMessageDispatcher.h @@ -89,8 +89,6 @@ public: virtual size_t countOutstandingUpload() = 0; }; -typedef SharedHandle BtMessageDispatcherHandle; - } // namespace aria2 #endif // D_BT_MESSAGE_DISPATCHER_H diff --git a/src/BtMessageFactory.h b/src/BtMessageFactory.h index 0a44bf1a..963b373c 100644 --- a/src/BtMessageFactory.h +++ b/src/BtMessageFactory.h @@ -73,7 +73,7 @@ public: virtual SharedHandle createChokeMessage() = 0; virtual SharedHandle createUnchokeMessage() = 0; - + virtual SharedHandle createInterestedMessage() = 0; virtual SharedHandle createNotInterestedMessage() = 0; @@ -81,7 +81,7 @@ public: virtual SharedHandle createBitfieldMessage() = 0; virtual SharedHandle createKeepAliveMessage() = 0; - + virtual SharedHandle createHaveAllMessage() = 0; virtual SharedHandle createHaveNoneMessage() = 0; @@ -97,8 +97,6 @@ public: createBtExtendedMessage(const SharedHandle& msg) = 0; }; -typedef SharedHandle BtMessageFactoryHandle; - } // namespace aria2 #endif // D_BT_MESSAGE_FACTORY_H diff --git a/src/BtMessageReceiver.h b/src/BtMessageReceiver.h index e3a59593..f9500b3d 100644 --- a/src/BtMessageReceiver.h +++ b/src/BtMessageReceiver.h @@ -54,8 +54,6 @@ public: virtual SharedHandle receiveMessage() = 0; }; -typedef SharedHandle BtMessageReceiverHandle; - } // namespace aria2 #endif // D_BT_MESSAGE_RECEIVER_H diff --git a/src/BtMessageValidator.h b/src/BtMessageValidator.h index 86882fb1..d2896409 100644 --- a/src/BtMessageValidator.h +++ b/src/BtMessageValidator.h @@ -39,8 +39,6 @@ #include -#include "SharedHandle.h" - namespace aria2 { class BtMessageValidator { @@ -51,8 +49,6 @@ public: virtual void validate() = 0; }; -typedef SharedHandle BtMessageValidatorHandle; - } // namespace aria2 #endif // D_BT_MESSAGE_VALIDATOR_H diff --git a/src/BtPieceMessage.cc b/src/BtPieceMessage.cc index 1d44af7a..be2ced99 100644 --- a/src/BtPieceMessage.cc +++ b/src/BtPieceMessage.cc @@ -281,7 +281,7 @@ void BtPieceMessage::onChokingEvent(const BtChokingEvent& event) begin_, blockLength_)); if(getPeer()->isFastExtensionEnabled()) { - BtMessageHandle rej = + SharedHandle rej = getBtMessageFactory()->createRejectMessage (index_, begin_, blockLength_); getBtMessageDispatcher()->addMessageToQueue(rej); @@ -304,13 +304,13 @@ void BtPieceMessage::onCancelSendingPieceEvent begin_, blockLength_)); if(getPeer()->isFastExtensionEnabled()) { - BtMessageHandle rej = + SharedHandle rej = getBtMessageFactory()->createRejectMessage (index_, begin_, blockLength_); getBtMessageDispatcher()->addMessageToQueue(rej); } setInvalidate(true); - } + } } void BtPieceMessage::setDownloadContext diff --git a/src/BtPieceMessageValidator.h b/src/BtPieceMessageValidator.h index 1f24fdab..77a21e56 100644 --- a/src/BtPieceMessageValidator.h +++ b/src/BtPieceMessageValidator.h @@ -56,8 +56,6 @@ public: virtual void validate(); }; -typedef SharedHandle BtPieceMessageValidatorHandle; - } // namespace aria2 #endif // D_BT_PIECE_MESSAGE_VALIDATOR_H diff --git a/src/BtProgressInfoFile.h b/src/BtProgressInfoFile.h index 82ba0561..ce60b6a2 100644 --- a/src/BtProgressInfoFile.h +++ b/src/BtProgressInfoFile.h @@ -36,7 +36,7 @@ #define D_BT_PROGRESS_INFO_FILE_H #include "common.h" -#include "SharedHandle.h" + #include namespace aria2 { @@ -59,8 +59,6 @@ public: virtual void updateFilename() = 0; }; -typedef SharedHandle BtProgressInfoFileHandle; - } // namespace aria2 #endif // D_BT_PROGRESS_INFO_FILE_H diff --git a/src/BtRequestFactory.h b/src/BtRequestFactory.h index 9e812c89..b1f58ad3 100644 --- a/src/BtRequestFactory.h +++ b/src/BtRequestFactory.h @@ -87,8 +87,6 @@ public: }; -typedef SharedHandle BtRequestFactoryHandle; - } // namespace aria2 #endif // D_BT_REQUEST_FACTORY_H diff --git a/src/BtRequestMessage.cc b/src/BtRequestMessage.cc index 5a8c76c8..5595bdca 100644 --- a/src/BtRequestMessage.cc +++ b/src/BtRequestMessage.cc @@ -63,13 +63,13 @@ void BtRequestMessage::doReceivedAction() (!getPeer()->amChoking() || (getPeer()->amChoking() && getPeer()->isInAmAllowedIndexSet(getIndex())))) { - BtMessageHandle msg = + SharedHandle msg = getBtMessageFactory()->createPieceMessage (getIndex(), getBegin(), getLength()); getBtMessageDispatcher()->addMessageToQueue(msg); } else { if(getPeer()->isFastExtensionEnabled()) { - BtMessageHandle msg = + SharedHandle msg = getBtMessageFactory()->createRejectMessage (getIndex(), getBegin(), getLength()); getBtMessageDispatcher()->addMessageToQueue(msg); diff --git a/src/BtRuntime.h b/src/BtRuntime.h index 5a500d39..2403e765 100644 --- a/src/BtRuntime.h +++ b/src/BtRuntime.h @@ -36,7 +36,6 @@ #define D_BT_RUNTIME_H #include "common.h" -#include "SharedHandle.h" namespace aria2 { @@ -107,8 +106,6 @@ public: static const int DEFAULT_MIN_PEERS = 40; }; -typedef SharedHandle BtRuntimeHandle; - } // namespace aria2 #endif // D_BT_RUNTIME_H diff --git a/src/ByteArrayDiskWriter.h b/src/ByteArrayDiskWriter.h index 864b1b1e..4fbeb49c 100644 --- a/src/ByteArrayDiskWriter.h +++ b/src/ByteArrayDiskWriter.h @@ -67,8 +67,6 @@ public: std::string getString() const; }; -typedef SharedHandle ByteArrayDiskWriterHandle; - } // namespace aria2 #endif // D_BYTE_ARRAY_DISK_WRITER_H diff --git a/src/ByteArrayDiskWriterFactory.h b/src/ByteArrayDiskWriterFactory.h index 5a839371..63860dd7 100644 --- a/src/ByteArrayDiskWriterFactory.h +++ b/src/ByteArrayDiskWriterFactory.h @@ -43,8 +43,6 @@ namespace aria2 { typedef AnonDiskWriterFactory ByteArrayDiskWriterFactory; -typedef SharedHandle ByteArrayDiskWriterFactoryHandle; - } // namespace aria2 #endif // D_BYTE_ARRAY_DISK_WRITER_FACTORY_H diff --git a/src/CheckIntegrityEntry.h b/src/CheckIntegrityEntry.h index 4025d7af..64fe0506 100644 --- a/src/CheckIntegrityEntry.h +++ b/src/CheckIntegrityEntry.h @@ -36,10 +36,12 @@ #define D_CHECK_INTEGRITY_ENTRY_H #include "RequestGroupEntry.h" -#include "ProgressAwareEntry.h" #include +#include "SharedHandle.h" +#include "ProgressAwareEntry.h" + namespace aria2 { class IteratableValidator; diff --git a/src/ConsoleStatCalc.h b/src/ConsoleStatCalc.h index 566f7aa8..13dd7111 100644 --- a/src/ConsoleStatCalc.h +++ b/src/ConsoleStatCalc.h @@ -83,8 +83,6 @@ public: } }; -typedef SharedHandle ConsoleStatCalcHandle; - } // namespace aria2 #endif // D_CONSOLE_STAT_CALC_H diff --git a/src/DHTConnectionImpl.cc b/src/DHTConnectionImpl.cc index f026dd24..3f02d0b4 100644 --- a/src/DHTConnectionImpl.cc +++ b/src/DHTConnectionImpl.cc @@ -41,7 +41,7 @@ #include "Logger.h" #include "RecoverableException.h" #include "util.h" -#include "Socket.h" +#include "SocketCore.h" #include "SimpleRandomizer.h" #include "fmt.h" diff --git a/src/DHTInteractionCommand.cc b/src/DHTInteractionCommand.cc index f98e4699..4fc3f371 100644 --- a/src/DHTInteractionCommand.cc +++ b/src/DHTInteractionCommand.cc @@ -39,7 +39,7 @@ #include "DHTMessageReceiver.h" #include "DHTTaskQueue.h" #include "DHTMessage.h" -#include "Socket.h" +#include "SocketCore.h" #include "message.h" #include "RequestGroupMan.h" #include "Logger.h" @@ -60,7 +60,7 @@ DHTInteractionCommand::~DHTInteractionCommand() disableReadCheckSocket(readCheckSocket_); } -void DHTInteractionCommand::setReadCheckSocket(const SocketHandle& socket) +void DHTInteractionCommand::setReadCheckSocket(const SharedHandle& socket) { readCheckSocket_ = socket; if(socket) { @@ -68,7 +68,7 @@ void DHTInteractionCommand::setReadCheckSocket(const SocketHandle& socket) } } -void DHTInteractionCommand::disableReadCheckSocket(const SocketHandle& socket) +void DHTInteractionCommand::disableReadCheckSocket(const SharedHandle& socket) { if(socket) { e_->deleteSocketForReadCheck(socket, this); diff --git a/src/DefaultAuthResolver.cc b/src/DefaultAuthResolver.cc index bc6650a0..dc5f01c7 100644 --- a/src/DefaultAuthResolver.cc +++ b/src/DefaultAuthResolver.cc @@ -37,7 +37,7 @@ namespace aria2 { -AuthConfigHandle DefaultAuthResolver::resolveAuthConfig +SharedHandle DefaultAuthResolver::resolveAuthConfig (const std::string& hostname) { if(!getUserDefinedAuthConfig()) { diff --git a/src/DefaultBtAnnounce.cc b/src/DefaultBtAnnounce.cc index 16f197c7..8e7b4dc7 100644 --- a/src/DefaultBtAnnounce.cc +++ b/src/DefaultBtAnnounce.cc @@ -297,22 +297,24 @@ void DefaultBtAnnounce::shuffleAnnounce() { announceList_.shuffle(); } -void DefaultBtAnnounce::setRandomizer(const RandomizerHandle& randomizer) +void DefaultBtAnnounce::setRandomizer +(const SharedHandle& randomizer) { randomizer_ = randomizer; } -void DefaultBtAnnounce::setBtRuntime(const BtRuntimeHandle& btRuntime) +void DefaultBtAnnounce::setBtRuntime(const SharedHandle& btRuntime) { btRuntime_ = btRuntime; } -void DefaultBtAnnounce::setPieceStorage(const PieceStorageHandle& pieceStorage) +void DefaultBtAnnounce::setPieceStorage(const SharedHandle& pieceStorage) { pieceStorage_ = pieceStorage; } -void DefaultBtAnnounce::setPeerStorage(const PeerStorageHandle& peerStorage) +void DefaultBtAnnounce::setPeerStorage +(const SharedHandle& peerStorage) { peerStorage_ = peerStorage; } diff --git a/src/DefaultBtInteractive.cc b/src/DefaultBtInteractive.cc index 4e3948f9..8c3a5f24 100644 --- a/src/DefaultBtInteractive.cc +++ b/src/DefaultBtInteractive.cc @@ -108,7 +108,7 @@ void DefaultBtInteractive::initiateHandshake() { dispatcher_->sendMessages(); } -BtMessageHandle DefaultBtInteractive::receiveHandshake(bool quickReply) { +SharedHandle DefaultBtInteractive::receiveHandshake(bool quickReply) { SharedHandle message = btMessageReceiver_->receiveHandshake(quickReply); if(!message) { @@ -155,7 +155,7 @@ BtMessageHandle DefaultBtInteractive::receiveHandshake(bool quickReply) { return message; } -BtMessageHandle DefaultBtInteractive::receiveAndSendHandshake() { +SharedHandle DefaultBtInteractive::receiveAndSendHandshake() { return receiveHandshake(true); } @@ -188,7 +188,7 @@ void DefaultBtInteractive::addPortMessageToQueue() void DefaultBtInteractive::addHandshakeExtendedMessageToQueue() { - HandshakeExtensionMessageHandle m(new HandshakeExtensionMessage()); + SharedHandle m(new HandshakeExtensionMessage()); m->setClientVersion("aria2/" PACKAGE_VERSION); m->setTCPPort(tcpPort_); m->setExtensions(extensionMessageRegistry_->getExtensions()); @@ -279,7 +279,7 @@ size_t DefaultBtInteractive::receiveMessages() { downloadContext_->getOwnerRequestGroup()->doesDownloadSpeedExceed()) { break; } - BtMessageHandle message = btMessageReceiver_->receiveMessage(); + SharedHandle message = btMessageReceiver_->receiveMessage(); if(!message) { break; } @@ -472,7 +472,7 @@ void DefaultBtInteractive::addPeerExchangeMessage() { if(pexTimer_. difference(global::wallclock()) >= UTPexExtensionMessage::DEFAULT_INTERVAL) { - UTPexExtensionMessageHandle m + SharedHandle m (new UTPexExtensionMessage(peer_->getExtensionMessageID (ExtensionMessageRegistry::UT_PEX))); @@ -496,7 +496,7 @@ void DefaultBtInteractive::addPeerExchangeMessage() } } - BtMessageHandle msg = messageFactory_->createBtExtendedMessage(m); + SharedHandle msg = messageFactory_->createBtExtendedMessage(m); dispatcher_->addMessageToQueue(msg); pexTimer_ = global::wallclock(); } diff --git a/src/DefaultBtMessageDispatcher.cc b/src/DefaultBtMessageDispatcher.cc index c55ee8a3..78df946c 100644 --- a/src/DefaultBtMessageDispatcher.cc +++ b/src/DefaultBtMessageDispatcher.cc @@ -72,7 +72,7 @@ DefaultBtMessageDispatcher::~DefaultBtMessageDispatcher() } void DefaultBtMessageDispatcher::addMessageToQueue -(const BtMessageHandle& btMessage) +(const SharedHandle& btMessage) { btMessage->onQueued(); messageQueue_.push_back(btMessage); @@ -90,7 +90,7 @@ void DefaultBtMessageDispatcher::addMessageToQueue void DefaultBtMessageDispatcher::sendMessages() { std::vector > tempQueue; while(!messageQueue_.empty()) { - BtMessageHandle msg = messageQueue_.front(); + SharedHandle msg = messageQueue_.front(); messageQueue_.pop_front(); if(msg->isUploading() && !msg->isSendingInProgress()) { if(requestGroupMan_->doesOverallUploadSpeedExceed() || diff --git a/src/DefaultBtMessageFactory.cc b/src/DefaultBtMessageFactory.cc index d4e16545..e2666fa5 100644 --- a/src/DefaultBtMessageFactory.cc +++ b/src/DefaultBtMessageFactory.cc @@ -165,7 +165,7 @@ DefaultBtMessageFactory::createBtMessage case BtPieceMessage::ID: { BtPieceMessage* m = BtPieceMessage::create(data, dataLength); if(!metadataGetMode_) { - BtMessageValidatorHandle validator + SharedHandle validator (new BtPieceMessageValidator (m, downloadContext_->getNumPieces(), @@ -264,7 +264,7 @@ DefaultBtMessageFactory::createHandshakeMessage { SharedHandle msg = BtHandshakeMessage::create(data, dataLength); - BtMessageValidatorHandle validator + SharedHandle validator (new BtHandshakeMessageValidator (msg.get(), bittorrent::getInfoHash(downloadContext_))); msg->setBtMessageValidator(validator); @@ -416,7 +416,7 @@ DefaultBtMessageFactory::createPortMessage(uint16_t port) SharedHandle DefaultBtMessageFactory::createBtExtendedMessage -(const ExtensionMessageHandle& msg) +(const SharedHandle& msg) { BtExtendedMessage* m(new BtExtendedMessage(msg)); setCommonProperty(m); diff --git a/src/DefaultBtMessageReceiver.cc b/src/DefaultBtMessageReceiver.cc index 9832d5ac..ae406657 100644 --- a/src/DefaultBtMessageReceiver.cc +++ b/src/DefaultBtMessageReceiver.cc @@ -114,13 +114,13 @@ void DefaultBtMessageReceiver::sendHandshake() { dispatcher_->sendMessages(); } -BtMessageHandle DefaultBtMessageReceiver::receiveMessage() { +SharedHandle DefaultBtMessageReceiver::receiveMessage() { size_t dataLength = 0; // Give 0 to PeerConnection::receiveMessage() to prevent memcpy. if(!peerConnection_->receiveMessage(0, dataLength)) { return SharedHandle(); } - BtMessageHandle msg = + SharedHandle msg = messageFactory_->createBtMessage(peerConnection_->getMsgPayloadBuffer(), dataLength); msg->validate(); diff --git a/src/DefaultBtProgressInfoFile.cc b/src/DefaultBtProgressInfoFile.cc index 43281d58..0c670517 100644 --- a/src/DefaultBtProgressInfoFile.cc +++ b/src/DefaultBtProgressInfoFile.cc @@ -75,7 +75,7 @@ std::string createFilename DefaultBtProgressInfoFile::DefaultBtProgressInfoFile (const SharedHandle& dctx, - const PieceStorageHandle& pieceStorage, + const SharedHandle& pieceStorage, const Option* option) : dctx_(dctx), pieceStorage_(pieceStorage), diff --git a/src/DefaultBtProgressInfoFile.h b/src/DefaultBtProgressInfoFile.h index f630a806..f81a2fae 100644 --- a/src/DefaultBtProgressInfoFile.h +++ b/src/DefaultBtProgressInfoFile.h @@ -36,6 +36,7 @@ #define D_DEFAULT_BT_PROGRESS_INFO_FILE_H #include "BtProgressInfoFile.h" +#include "SharedHandle.h" namespace aria2 { @@ -65,7 +66,7 @@ public: virtual ~DefaultBtProgressInfoFile(); virtual std::string getFilename() { return filename_; } - + virtual bool exists(); virtual void save(); diff --git a/src/DefaultExtensionMessageFactory.cc b/src/DefaultExtensionMessageFactory.cc index c84c6789..24f2c564 100644 --- a/src/DefaultExtensionMessageFactory.cc +++ b/src/DefaultExtensionMessageFactory.cc @@ -72,13 +72,13 @@ DefaultExtensionMessageFactory::DefaultExtensionMessageFactory DefaultExtensionMessageFactory::~DefaultExtensionMessageFactory() {} -ExtensionMessageHandle +SharedHandle DefaultExtensionMessageFactory::createMessage(const unsigned char* data, size_t length) { uint8_t extensionMessageID = *data; if(extensionMessageID == 0) { // handshake - HandshakeExtensionMessageHandle m = + SharedHandle m = HandshakeExtensionMessage::create(data, length); m->setPeer(peer_); m->setDownloadContext(dctx_); @@ -92,7 +92,7 @@ DefaultExtensionMessageFactory::createMessage(const unsigned char* data, size_t } if(strcmp(extensionName, "ut_pex") == 0) { // uTorrent compatible Peer-Exchange - UTPexExtensionMessageHandle m = + SharedHandle m = UTPexExtensionMessage::create(data, length); m->setPeerStorage(peerStorage_); return m; diff --git a/src/DefaultPieceStorage.cc b/src/DefaultPieceStorage.cc index a59a20a1..de179bad 100644 --- a/src/DefaultPieceStorage.cc +++ b/src/DefaultPieceStorage.cc @@ -613,25 +613,25 @@ void DefaultPieceStorage::initStorage() { if(downloadContext_->getFileEntries().size() == 1) { A2_LOG_DEBUG("Instantiating DirectDiskAdaptor"); - DirectDiskAdaptorHandle directDiskAdaptor(new DirectDiskAdaptor()); + DirectDiskAdaptor* directDiskAdaptor(new DirectDiskAdaptor()); directDiskAdaptor->setTotalLength(downloadContext_->getTotalLength()); directDiskAdaptor->setFileEntries (downloadContext_->getFileEntries().begin(), downloadContext_->getFileEntries().end()); - DiskWriterHandle writer = + SharedHandle writer = diskWriterFactory_->newDiskWriter(directDiskAdaptor->getFilePath()); directDiskAdaptor->setDiskWriter(writer); - diskAdaptor_ = directDiskAdaptor; + diskAdaptor_.reset(directDiskAdaptor); } else { A2_LOG_DEBUG("Instantiating MultiDiskAdaptor"); - MultiDiskAdaptorHandle multiDiskAdaptor(new MultiDiskAdaptor()); + MultiDiskAdaptor* multiDiskAdaptor(new MultiDiskAdaptor()); multiDiskAdaptor->setFileEntries(downloadContext_->getFileEntries().begin(), downloadContext_->getFileEntries().end()); multiDiskAdaptor->setPieceLength(downloadContext_->getPieceLength()); multiDiskAdaptor->setMaxOpenFiles (option_->getAsInt(PREF_BT_MAX_OPEN_FILES)); - diskAdaptor_ = multiDiskAdaptor; + diskAdaptor_.reset(multiDiskAdaptor); } if(option_->get(PREF_FILE_ALLOCATION) == V_FALLOC) { diskAdaptor_->setFileAllocationMethod(DiskAdaptor::FILE_ALLOC_FALLOC); @@ -657,7 +657,7 @@ const unsigned char* DefaultPieceStorage::getBitfield() return bitfieldMan_->getBitfield(); } -DiskAdaptorHandle DefaultPieceStorage::getDiskAdaptor() { +SharedHandle DefaultPieceStorage::getDiskAdaptor() { return diskAdaptor_; } @@ -741,7 +741,7 @@ void DefaultPieceStorage::markPiecesDone(int64_t length) if(r > 0) { SharedHandle p (new Piece(numPiece, bitfieldMan_->getBlockLength(numPiece))); - + for(size_t i = 0; i < r; ++i) { p->completeBlock(i); } @@ -780,7 +780,7 @@ void DefaultPieceStorage::getInFlightPieces } void DefaultPieceStorage::setDiskWriterFactory -(const DiskWriterFactoryHandle& diskWriterFactory) +(const SharedHandle& diskWriterFactory) { diskWriterFactory_ = diskWriterFactory; } diff --git a/src/Dependency.h b/src/Dependency.h index e8d6b828..abae39fd 100644 --- a/src/Dependency.h +++ b/src/Dependency.h @@ -36,7 +36,6 @@ #define D_DEPENDENCY_H #include "common.h" -#include "SharedHandle.h" namespace aria2 { @@ -47,8 +46,6 @@ public: virtual bool resolve() = 0; }; -typedef SharedHandle DependencyHandle; - } // namespace aria2 #endif // D_DEPENDENCY_H diff --git a/src/DirectDiskAdaptor.h b/src/DirectDiskAdaptor.h index 959cfdc8..a46a05dd 100644 --- a/src/DirectDiskAdaptor.h +++ b/src/DirectDiskAdaptor.h @@ -46,8 +46,6 @@ public: virtual size_t utime(const Time& actime, const Time& modtime); }; -typedef SharedHandle DirectDiskAdaptorHandle; - } // namespace aria2 #endif // D_DIRECT_DISK_ADAPTOR_H diff --git a/src/DiskAdaptor.h b/src/DiskAdaptor.h index 9bf9ca11..a1ba1c76 100644 --- a/src/DiskAdaptor.h +++ b/src/DiskAdaptor.h @@ -41,6 +41,7 @@ #include #include "TimeA2.h" +#include "SharedHandle.h" namespace aria2 { @@ -118,8 +119,6 @@ private: FileAllocationMethod fileAllocationMethod_; }; -typedef SharedHandle DiskAdaptorHandle; - } // namespace aria2 #endif // D_DISK_ADAPTOR_H diff --git a/src/DiskWriter.h b/src/DiskWriter.h index 2d9c06e9..88715e96 100644 --- a/src/DiskWriter.h +++ b/src/DiskWriter.h @@ -52,7 +52,7 @@ public: * Opens file. If the file exists, then it is truncated to 0 length. */ virtual void initAndOpenFile(int64_t totalLength = 0) = 0; - + virtual void openFile(int64_t totalLength = 0) = 0; /** @@ -84,8 +84,6 @@ public: virtual void enableMmap() {} }; -typedef SharedHandle DiskWriterHandle; - } // namespace aria2 #endif // D_DISK_WRITER_H diff --git a/src/DiskWriterFactory.h b/src/DiskWriterFactory.h index 2ab57196..125ec098 100644 --- a/src/DiskWriterFactory.h +++ b/src/DiskWriterFactory.h @@ -52,8 +52,6 @@ public: virtual SharedHandle newDiskWriter(const std::string& filename)=0; }; -typedef SharedHandle DiskWriterFactoryHandle; - } // namespace aria2 #endif // D_DISK_WRITER_FACTORY_H diff --git a/src/DownloadCommand.cc b/src/DownloadCommand.cc index 2ed595b5..054aa407 100644 --- a/src/DownloadCommand.cc +++ b/src/DownloadCommand.cc @@ -53,7 +53,7 @@ #include "DownloadContext.h" #include "Option.h" #include "util.h" -#include "Socket.h" +#include "SocketCore.h" #include "message.h" #include "prefs.h" #include "fmt.h" @@ -82,7 +82,7 @@ DownloadCommand::DownloadCommand const SharedHandle& fileEntry, RequestGroup* requestGroup, DownloadEngine* e, - const SocketHandle& s, + const SharedHandle& s, const SharedHandle& socketRecvBuffer) : AbstractCommand(cuid, req, fileEntry, requestGroup, e, s, socketRecvBuffer), startupIdleTime_(10), diff --git a/src/DownloadEngine.cc b/src/DownloadEngine.cc index 4cf1f9ef..c81cdcbd 100644 --- a/src/DownloadEngine.cc +++ b/src/DownloadEngine.cc @@ -48,7 +48,7 @@ #include "StatCalc.h" #include "LogFactory.h" #include "Logger.h" -#include "Socket.h" +#include "SocketCore.h" #include "util.h" #include "a2functional.h" #include "DlAbortEx.h" @@ -176,28 +176,28 @@ void DownloadEngine::waitData() eventPoll_->poll(tv); } -bool DownloadEngine::addSocketForReadCheck(const SocketHandle& socket, +bool DownloadEngine::addSocketForReadCheck(const SharedHandle& socket, Command* command) { return eventPoll_->addEvents(socket->getSockfd(), command, EventPoll::EVENT_READ); } -bool DownloadEngine::deleteSocketForReadCheck(const SocketHandle& socket, +bool DownloadEngine::deleteSocketForReadCheck(const SharedHandle& socket, Command* command) { return eventPoll_->deleteEvents(socket->getSockfd(), command, EventPoll::EVENT_READ); } -bool DownloadEngine::addSocketForWriteCheck(const SocketHandle& socket, +bool DownloadEngine::addSocketForWriteCheck(const SharedHandle& socket, Command* command) { return eventPoll_->addEvents(socket->getSockfd(), command, EventPoll::EVENT_WRITE); } -bool DownloadEngine::deleteSocketForWriteCheck(const SocketHandle& socket, +bool DownloadEngine::deleteSocketForWriteCheck(const SharedHandle& socket, Command* command) { return eventPoll_->deleteEvents(socket->getSockfd(), command, @@ -249,7 +249,7 @@ void DownloadEngine::requestForceHalt() requestGroupMan_->forceHalt(); } -void DownloadEngine::setStatCalc(const StatCalcHandle& statCalc) +void DownloadEngine::setStatCalc(const SharedHandle& statCalc) { statCalc_ = statCalc; } diff --git a/src/DownloadEngine.h b/src/DownloadEngine.h index 91d827f8..cbea65ec 100644 --- a/src/DownloadEngine.h +++ b/src/DownloadEngine.h @@ -341,8 +341,6 @@ public: #endif // HAVE_ARES_ADDR_NODE }; -typedef SharedHandle DownloadEngineHandle; - } // namespace aria2 #endif // D_DOWNLOAD_ENGINE_H diff --git a/src/DownloadEngineFactory.cc b/src/DownloadEngineFactory.cc index 9fd1db42..7cdb8e3e 100644 --- a/src/DownloadEngineFactory.cc +++ b/src/DownloadEngineFactory.cc @@ -79,7 +79,7 @@ namespace aria2 { DownloadEngineFactory::DownloadEngineFactory() {} -DownloadEngineHandle +SharedHandle DownloadEngineFactory::newDownloadEngine (Option* op, const std::vector >& requestGroups) { @@ -130,10 +130,10 @@ DownloadEngineFactory::newDownloadEngine } else { abort(); } - DownloadEngineHandle e(new DownloadEngine(eventPoll)); + SharedHandle e(new DownloadEngine(eventPoll)); e->setOption(op); - RequestGroupManHandle + SharedHandle requestGroupMan(new RequestGroupMan(requestGroups, MAX_CONCURRENT_DOWNLOADS, op)); e->setRequestGroupMan(requestGroupMan); diff --git a/src/DownloadResult.h b/src/DownloadResult.h index 312d67d5..fa7e3f51 100644 --- a/src/DownloadResult.h +++ b/src/DownloadResult.h @@ -55,7 +55,7 @@ class MetadataInfo; struct DownloadResult { a2_gid_t gid; - + std::vector > fileEntries; bool inMemoryDownload; @@ -103,8 +103,6 @@ struct DownloadResult DownloadResult& operator=(const DownloadResult& c); }; -typedef SharedHandle DownloadResultHandle; - } // namespace aria2 #endif // D_DOWNLOAD_RESULT_H diff --git a/src/ExtensionMessage.h b/src/ExtensionMessage.h index 6fc5012a..86418d66 100644 --- a/src/ExtensionMessage.h +++ b/src/ExtensionMessage.h @@ -39,8 +39,6 @@ #include -#include "SharedHandle.h" - namespace aria2 { class ExtensionMessage { public: @@ -57,8 +55,6 @@ public: virtual void doReceivedAction() = 0; }; -typedef SharedHandle ExtensionMessageHandle; - } // namespace aria2 #endif // D_EXTENSION_MESSAGE_H diff --git a/src/ExtensionMessageFactory.h b/src/ExtensionMessageFactory.h index a8ef32fe..9a49d9d0 100644 --- a/src/ExtensionMessageFactory.h +++ b/src/ExtensionMessageFactory.h @@ -50,8 +50,6 @@ public: createMessage(const unsigned char* data, size_t length) = 0; }; -typedef SharedHandle ExtensionMessageFactoryHandle; - } // namespace aria2 #endif // D_EXTENSION_MESSAGE_FACTORY_H diff --git a/src/FileAllocationEntry.h b/src/FileAllocationEntry.h index 4114d515..26228413 100644 --- a/src/FileAllocationEntry.h +++ b/src/FileAllocationEntry.h @@ -36,10 +36,12 @@ #define D_FILE_ALLOCATION_ENTRY_H #include "RequestGroupEntry.h" -#include "ProgressAwareEntry.h" #include +#include "SharedHandle.h" +#include "ProgressAwareEntry.h" + namespace aria2 { class FileAllocationIterator; diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc index 26d4dacb..ff7e9e2c 100644 --- a/src/FtpConnection.cc +++ b/src/FtpConnection.cc @@ -50,7 +50,7 @@ #include "AuthConfig.h" #include "DlRetryEx.h" #include "DlAbortEx.h" -#include "Socket.h" +#include "SocketCore.h" #include "A2STR.h" #include "fmt.h" #include "AuthConfig.h" @@ -62,7 +62,7 @@ namespace aria2 { FtpConnection::FtpConnection (cuid_t cuid, - const SocketHandle& socket, + const SharedHandle& socket, const SharedHandle& req, const SharedHandle& authConfig, const Option* op) diff --git a/src/FtpDownloadCommand.cc b/src/FtpDownloadCommand.cc index 4b175d7b..84e6bc58 100644 --- a/src/FtpDownloadCommand.cc +++ b/src/FtpDownloadCommand.cc @@ -34,7 +34,7 @@ /* copyright --> */ #include "FtpDownloadCommand.h" #include "Request.h" -#include "Socket.h" +#include "SocketCore.h" #include "Segment.h" #include "DownloadEngine.h" #include "RequestGroup.h" @@ -55,8 +55,8 @@ FtpDownloadCommand::FtpDownloadCommand RequestGroup* requestGroup, const SharedHandle& ftpConnection, DownloadEngine* e, - const SocketHandle& dataSocket, - const SocketHandle& ctrlSocket) + const SharedHandle& dataSocket, + const SharedHandle& ctrlSocket) :DownloadCommand(cuid, req, fileEntry, requestGroup, e, dataSocket, SharedHandle (new SocketRecvBuffer(dataSocket))), diff --git a/src/FtpInitiateConnectionCommand.cc b/src/FtpInitiateConnectionCommand.cc index 2700b85f..0ba6c197 100644 --- a/src/FtpInitiateConnectionCommand.cc +++ b/src/FtpInitiateConnectionCommand.cc @@ -50,7 +50,7 @@ #include "message.h" #include "prefs.h" #include "HttpConnection.h" -#include "Socket.h" +#include "SocketCore.h" #include "util.h" #include "AuthConfigFactory.h" #include "AuthConfig.h" diff --git a/src/FtpNegotiationCommand.cc b/src/FtpNegotiationCommand.cc index 796910bc..42a10a7b 100644 --- a/src/FtpNegotiationCommand.cc +++ b/src/FtpNegotiationCommand.cc @@ -58,7 +58,7 @@ #include "DefaultBtProgressInfoFile.h" #include "RequestGroupMan.h" #include "DownloadFailureException.h" -#include "Socket.h" +#include "SocketCore.h" #include "fmt.h" #include "DiskAdaptor.h" #include "SegmentMan.h" @@ -86,7 +86,7 @@ FtpNegotiationCommand::FtpNegotiationCommand const SharedHandle& fileEntry, RequestGroup* requestGroup, DownloadEngine* e, - const SocketHandle& socket, + const SharedHandle& socket, Seq seq, const std::string& baseWorkingDir): AbstractCommand(cuid, req, fileEntry, requestGroup, e, socket), diff --git a/src/FtpTunnelRequestCommand.cc b/src/FtpTunnelRequestCommand.cc index 8ea81617..2ca92895 100644 --- a/src/FtpTunnelRequestCommand.cc +++ b/src/FtpTunnelRequestCommand.cc @@ -35,7 +35,7 @@ #include "FtpTunnelRequestCommand.h" #include "FtpTunnelResponseCommand.h" #include "Request.h" -#include "Socket.h" +#include "SocketCore.h" #include "DownloadContext.h" #include "SocketRecvBuffer.h" @@ -48,7 +48,7 @@ FtpTunnelRequestCommand::FtpTunnelRequestCommand RequestGroup* requestGroup, DownloadEngine* e, const SharedHandle& proxyRequest, - const SocketHandle& s) + const SharedHandle& s) : AbstractProxyRequestCommand(cuid, req, fileEntry, requestGroup, e, proxyRequest, s) diff --git a/src/FtpTunnelResponseCommand.cc b/src/FtpTunnelResponseCommand.cc index a17eeda3..abafea18 100644 --- a/src/FtpTunnelResponseCommand.cc +++ b/src/FtpTunnelResponseCommand.cc @@ -38,7 +38,7 @@ #include "HttpConnection.h" #include "HttpRequest.h" #include "Segment.h" -#include "Socket.h" +#include "SocketCore.h" #include "SocketRecvBuffer.h" namespace aria2 { @@ -48,9 +48,9 @@ FtpTunnelResponseCommand::FtpTunnelResponseCommand const SharedHandle& req, const SharedHandle& fileEntry, RequestGroup* requestGroup, - const HttpConnectionHandle& httpConnection, + const SharedHandle& httpConnection, DownloadEngine* e, - const SocketHandle& s) + const SharedHandle& s) :AbstractProxyResponseCommand(cuid, req, fileEntry, requestGroup, httpConnection,e, s) {} diff --git a/src/HandshakeExtensionMessage.cc b/src/HandshakeExtensionMessage.cc index 63afd356..d9f13f23 100644 --- a/src/HandshakeExtensionMessage.cc +++ b/src/HandshakeExtensionMessage.cc @@ -164,7 +164,7 @@ uint8_t HandshakeExtensionMessage::getExtensionMessageID(int key) const return extreg_.getExtensionMessageID(key); } -HandshakeExtensionMessageHandle +SharedHandle HandshakeExtensionMessage::create(const unsigned char* data, size_t length) { if(length < 1) { @@ -172,7 +172,7 @@ HandshakeExtensionMessage::create(const unsigned char* data, size_t length) (fmt(MSG_TOO_SMALL_PAYLOAD_SIZE, EXTENSION_NAME, static_cast(length))); } - HandshakeExtensionMessageHandle msg(new HandshakeExtensionMessage()); + SharedHandle msg(new HandshakeExtensionMessage()); A2_LOG_DEBUG(fmt("Creating HandshakeExtensionMessage from %s", util::percentEncode(data, length).c_str())); SharedHandle decoded = bencode2::decode(data+1, length - 1); diff --git a/src/HandshakeExtensionMessage.h b/src/HandshakeExtensionMessage.h index d53c5c9d..16f11dda 100644 --- a/src/HandshakeExtensionMessage.h +++ b/src/HandshakeExtensionMessage.h @@ -39,6 +39,7 @@ #include "BtConstants.h" #include "ExtensionMessageRegistry.h" +#include "SharedHandle.h" namespace aria2 { @@ -69,7 +70,7 @@ public: { return 0; } - + virtual const char* getExtensionName() const { return EXTENSION_NAME; @@ -128,8 +129,6 @@ public: create(const unsigned char* data, size_t dataLength); }; -typedef SharedHandle HandshakeExtensionMessageHandle; - } // namespace aria2 #endif // D_HANDSHAKE_EXTENSION_MESSAGE_H diff --git a/src/HaveEraseCommand.cc b/src/HaveEraseCommand.cc index 0c0756e9..5eff358d 100644 --- a/src/HaveEraseCommand.cc +++ b/src/HaveEraseCommand.cc @@ -58,7 +58,7 @@ void HaveEraseCommand::process() size_t numLoop = getDownloadEngine()->getRequestGroupMan()->countRequestGroup(); for(size_t i = 0; i < numLoop; ++i) { - PieceStorageHandle ps = + SharedHandle ps = getDownloadEngine()->getRequestGroupMan()->getRequestGroup(i)-> getPieceStorage(); if(ps) { diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc index a452c956..84e3461f 100644 --- a/src/HttpConnection.cc +++ b/src/HttpConnection.cc @@ -49,7 +49,7 @@ #include "HttpHeaderProcessor.h" #include "HttpHeader.h" #include "Logger.h" -#include "Socket.h" +#include "SocketCore.h" #include "Option.h" #include "CookieStorage.h" #include "AuthConfigFactory.h" @@ -71,7 +71,7 @@ HttpRequestEntry::~HttpRequestEntry() {} HttpConnection::HttpConnection (cuid_t cuid, - const SocketHandle& socket, + const SharedHandle& socket, const SharedHandle& socketRecvBuffer) : cuid_(cuid), socket_(socket), @@ -129,7 +129,7 @@ SharedHandle HttpConnection::receiveResponse() if(outstandingHttpRequests_.empty()) { throw DL_ABORT_EX(EX_NO_HTTP_REQUEST_ENTRY_FOUND); } - HttpRequestEntryHandle entry = outstandingHttpRequests_.front(); + SharedHandle entry = outstandingHttpRequests_.front(); const SharedHandle& proc = entry->getHttpHeaderProcessor(); if(socketRecvBuffer_->bufferEmpty()) { diff --git a/src/HttpConnection.h b/src/HttpConnection.h index 4467a4d2..d337782e 100644 --- a/src/HttpConnection.h +++ b/src/HttpConnection.h @@ -74,8 +74,7 @@ public: } }; -typedef SharedHandle HttpRequestEntryHandle; -typedef std::deque HttpRequestEntries; +typedef std::deque > HttpRequestEntries; class HttpConnection { private: @@ -114,10 +113,10 @@ public: * object which contains response header and HttpRequestHandle object * for this response. * If a response is not fully received, received header is buffured - * in this object and returns 0. + * in this object and returns 0. * You should continue to call this method until whole response header is * received and this method returns non-null HttpResponseHandle object. - * + * * @return HttpResponse or 0 if whole response header is not received */ SharedHandle receiveResponse(); @@ -136,8 +135,6 @@ public: } }; -typedef SharedHandle HttpConnectionHandle; - } // namespace aria2 #endif // D_HTTP_CONNECTION_H diff --git a/src/HttpDownloadCommand.cc b/src/HttpDownloadCommand.cc index 0963665a..47c17f66 100644 --- a/src/HttpDownloadCommand.cc +++ b/src/HttpDownloadCommand.cc @@ -40,7 +40,7 @@ #include "HttpConnection.h" #include "HttpRequest.h" #include "Segment.h" -#include "Socket.h" +#include "SocketCore.h" #include "prefs.h" #include "Option.h" #include "HttpResponse.h" @@ -61,9 +61,9 @@ HttpDownloadCommand::HttpDownloadCommand const SharedHandle& fileEntry, RequestGroup* requestGroup, const SharedHandle& httpResponse, - const HttpConnectionHandle& httpConnection, + const SharedHandle& httpConnection, DownloadEngine* e, - const SocketHandle& socket) + const SharedHandle& socket) : DownloadCommand(cuid, req, fileEntry, requestGroup, e, socket, httpConnection->getSocketRecvBuffer()), httpResponse_(httpResponse), diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc index d7a313e6..a349a7a3 100644 --- a/src/HttpHeader.cc +++ b/src/HttpHeader.cc @@ -85,7 +85,7 @@ HttpHeader::equalRange(int hdKey) const return table_.equal_range(hdKey); } -RangeHandle HttpHeader::getRange() const +SharedHandle HttpHeader::getRange() const { const std::string& rangeStr = find(CONTENT_RANGE); if(rangeStr.empty()) { diff --git a/src/HttpHeader.h b/src/HttpHeader.h index 782a7d27..4a1d3f9d 100644 --- a/src/HttpHeader.h +++ b/src/HttpHeader.h @@ -162,8 +162,6 @@ public: int idInterestingHeader(const char* hdName); -typedef SharedHandle HttpHeaderHandle; - } // namespace #endif // D_HTTP_HEADER_H diff --git a/src/HttpInitiateConnectionCommand.cc b/src/HttpInitiateConnectionCommand.cc index 5b7f1ced..418aac15 100644 --- a/src/HttpInitiateConnectionCommand.cc +++ b/src/HttpInitiateConnectionCommand.cc @@ -44,7 +44,7 @@ #include "Option.h" #include "Logger.h" #include "LogFactory.h" -#include "Socket.h" +#include "SocketCore.h" #include "message.h" #include "prefs.h" #include "A2STR.h" diff --git a/src/HttpProxyRequestCommand.cc b/src/HttpProxyRequestCommand.cc index 5764f42b..410345ce 100644 --- a/src/HttpProxyRequestCommand.cc +++ b/src/HttpProxyRequestCommand.cc @@ -35,7 +35,7 @@ #include "HttpProxyRequestCommand.h" #include "HttpProxyResponseCommand.h" #include "Request.h" -#include "Socket.h" +#include "SocketCore.h" #include "SocketRecvBuffer.h" namespace aria2 { @@ -47,7 +47,7 @@ HttpProxyRequestCommand::HttpProxyRequestCommand RequestGroup* requestGroup, DownloadEngine* e, const SharedHandle& proxyRequest, - const SocketHandle& s) + const SharedHandle& s) : AbstractProxyRequestCommand(cuid, req, fileEntry, requestGroup, e, proxyRequest, s) diff --git a/src/HttpProxyResponseCommand.cc b/src/HttpProxyResponseCommand.cc index d3e819a8..598bac25 100644 --- a/src/HttpProxyResponseCommand.cc +++ b/src/HttpProxyResponseCommand.cc @@ -38,7 +38,7 @@ #include "HttpConnection.h" #include "HttpRequest.h" #include "Segment.h" -#include "Socket.h" +#include "SocketCore.h" #include "SocketRecvBuffer.h" namespace aria2 { @@ -48,9 +48,9 @@ HttpProxyResponseCommand::HttpProxyResponseCommand const SharedHandle& req, const SharedHandle& fileEntry, RequestGroup* requestGroup, - const HttpConnectionHandle& httpConnection, + const SharedHandle& httpConnection, DownloadEngine* e, - const SocketHandle& s) + const SharedHandle& s) :AbstractProxyResponseCommand(cuid, req, fileEntry, requestGroup, httpConnection, e, s) {} diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index d25e0f11..fcf8ef0c 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -101,7 +101,7 @@ int64_t HttpRequest::getEndByte() const } } -RangeHandle HttpRequest::getRange() const +SharedHandle HttpRequest::getRange() const { // content-length is always 0 if(!segment_) { @@ -112,7 +112,7 @@ RangeHandle HttpRequest::getRange() const } } -bool HttpRequest::isRangeSatisfied(const RangeHandle& range) const +bool HttpRequest::isRangeSatisfied(const SharedHandle& range) const { if(!segment_) { return true; diff --git a/src/HttpRequestCommand.cc b/src/HttpRequestCommand.cc index 9eb9daba..d96ead50 100644 --- a/src/HttpRequestCommand.cc +++ b/src/HttpRequestCommand.cc @@ -45,7 +45,7 @@ #include "SegmentMan.h" #include "Segment.h" #include "Option.h" -#include "Socket.h" +#include "SocketCore.h" #include "prefs.h" #include "a2functional.h" #include "util.h" @@ -67,9 +67,9 @@ HttpRequestCommand::HttpRequestCommand const SharedHandle& req, const SharedHandle& fileEntry, RequestGroup* requestGroup, - const HttpConnectionHandle& httpConnection, + const SharedHandle& httpConnection, DownloadEngine* e, - const SocketHandle& s) + const SharedHandle& s) : AbstractCommand(cuid, req, fileEntry, requestGroup, e, s, httpConnection->getSocketRecvBuffer()), httpConnection_(httpConnection) diff --git a/src/HttpResponse.cc b/src/HttpResponse.cc index 26272ee2..b721d64b 100644 --- a/src/HttpResponse.cc +++ b/src/HttpResponse.cc @@ -96,7 +96,7 @@ void HttpResponse::validateResponse() const } else if(statusCode == 200 || statusCode == 206) { if(!httpHeader_->defined(HttpHeader::TRANSFER_ENCODING)) { // compare the received range against the requested range - RangeHandle responseRange = httpHeader_->getRange(); + SharedHandle responseRange = httpHeader_->getRange(); if(!httpRequest_->isRangeSatisfied(responseRange)) { throw DL_ABORT_EX2 (fmt(EX_INVALID_RANGE_HEADER, diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc index 66d5035c..761b6422 100644 --- a/src/HttpResponseCommand.cc +++ b/src/HttpResponseCommand.cc @@ -54,7 +54,7 @@ #include "File.h" #include "Option.h" #include "Logger.h" -#include "Socket.h" +#include "SocketCore.h" #include "message.h" #include "prefs.h" #include "fmt.h" @@ -137,9 +137,9 @@ HttpResponseCommand::HttpResponseCommand const SharedHandle& req, const SharedHandle& fileEntry, RequestGroup* requestGroup, - const HttpConnectionHandle& httpConnection, + const SharedHandle& httpConnection, DownloadEngine* e, - const SocketHandle& s) + const SharedHandle& s) : AbstractCommand(cuid, req, fileEntry, requestGroup, e, s, httpConnection->getSocketRecvBuffer()), httpConnection_(httpConnection) diff --git a/src/InitiatorMSEHandshakeCommand.cc b/src/InitiatorMSEHandshakeCommand.cc index 52066c02..eec75444 100644 --- a/src/InitiatorMSEHandshakeCommand.cc +++ b/src/InitiatorMSEHandshakeCommand.cc @@ -39,7 +39,7 @@ #include "DlAbortEx.h" #include "message.h" #include "prefs.h" -#include "Socket.h" +#include "SocketCore.h" #include "Logger.h" #include "LogFactory.h" #include "Peer.h" diff --git a/src/IteratableChecksumValidator.cc b/src/IteratableChecksumValidator.cc index deb177a8..405ba2bf 100644 --- a/src/IteratableChecksumValidator.cc +++ b/src/IteratableChecksumValidator.cc @@ -51,7 +51,7 @@ namespace aria2 { IteratableChecksumValidator::IteratableChecksumValidator (const SharedHandle& dctx, - const PieceStorageHandle& pieceStorage) + const SharedHandle& pieceStorage) : dctx_(dctx), pieceStorage_(pieceStorage), currentOffset_(0) diff --git a/src/IteratableChecksumValidator.h b/src/IteratableChecksumValidator.h index a4300763..18d51efd 100644 --- a/src/IteratableChecksumValidator.h +++ b/src/IteratableChecksumValidator.h @@ -36,6 +36,7 @@ #define D_ITERATABLE_CHECKSUM_VALIDATOR_H #include "IteratableValidator.h" +#include "SharedHandle.h" namespace aria2 { @@ -73,8 +74,6 @@ public: virtual int64_t getTotalLength() const; }; -typedef SharedHandle IteratableChecksumValidatorHandle; - } // namespace aria2 #endif // D_ITERATABLE_CHECKSUM_VALIDATOR_H diff --git a/src/IteratableChunkChecksumValidator.cc b/src/IteratableChunkChecksumValidator.cc index b3401ae5..17c2558c 100644 --- a/src/IteratableChunkChecksumValidator.cc +++ b/src/IteratableChunkChecksumValidator.cc @@ -55,7 +55,7 @@ namespace aria2 { IteratableChunkChecksumValidator::IteratableChunkChecksumValidator (const SharedHandle& dctx, - const PieceStorageHandle& pieceStorage) + const SharedHandle& pieceStorage) : dctx_(dctx), pieceStorage_(pieceStorage), bitfield_(new BitfieldMan(dctx_->getPieceLength(), diff --git a/src/IteratableChunkChecksumValidator.h b/src/IteratableChunkChecksumValidator.h index 052d22af..ed72ebb4 100644 --- a/src/IteratableChunkChecksumValidator.h +++ b/src/IteratableChunkChecksumValidator.h @@ -39,6 +39,8 @@ #include +#include "SharedHandle.h" + namespace aria2 { class DownloadContext; @@ -76,8 +78,6 @@ public: virtual int64_t getTotalLength() const; }; -typedef SharedHandle IteratableChunkChecksumValidatorHandle; - } // namespace aria2 #endif // D_ITERATABLE_CHUNK_CHECKSUM_VALIDATOR_H diff --git a/src/IteratableValidator.h b/src/IteratableValidator.h index 405df202..76921d09 100644 --- a/src/IteratableValidator.h +++ b/src/IteratableValidator.h @@ -36,7 +36,7 @@ #define D_ITERATABLE_VALIDATOR_H #include "common.h" -#include "SharedHandle.h" + #include namespace aria2 { @@ -65,8 +65,6 @@ public: virtual int64_t getTotalLength() const = 0; }; -typedef SharedHandle IteratableValidatorHandle; - } // namespace aria2 #endif // D_ITERATABLE_VALIDATOR_H diff --git a/src/MSEHandshake.cc b/src/MSEHandshake.cc index 26c3c816..9e5b8a35 100644 --- a/src/MSEHandshake.cc +++ b/src/MSEHandshake.cc @@ -42,7 +42,7 @@ #include "LogFactory.h" #include "Logger.h" #include "BtHandshakeMessage.h" -#include "Socket.h" +#include "SocketCore.h" #include "a2netcompat.h" #include "DHKeyExchange.h" #include "ARC4Encryptor.h" @@ -72,7 +72,7 @@ const unsigned char* GENERATOR = reinterpret_cast("2"); MSEHandshake::MSEHandshake (cuid_t cuid, - const SocketHandle& socket, + const SharedHandle& socket, const Option* op) : cuid_(cuid), socket_(socket), diff --git a/src/MultiDiskAdaptor.cc b/src/MultiDiskAdaptor.cc index af83cd95..6397a019 100644 --- a/src/MultiDiskAdaptor.cc +++ b/src/MultiDiskAdaptor.cc @@ -305,7 +305,7 @@ void MultiDiskAdaptor::closeFile() } namespace { -bool isInRange(const DiskWriterEntryHandle entry, int64_t offset) +bool isInRange(const SharedHandle entry, int64_t offset) { return entry->getFileEntry()->getOffset() <= offset && offset < entry->getFileEntry()->getLastOffset(); @@ -313,7 +313,7 @@ bool isInRange(const DiskWriterEntryHandle entry, int64_t offset) } // namespace namespace { -ssize_t calculateLength(const DiskWriterEntryHandle entry, +ssize_t calculateLength(const SharedHandle entry, int64_t fileOffset, ssize_t rem) { if(entry->getFileEntry()->getLength() < fileOffset+rem) { diff --git a/src/MultiDiskAdaptor.h b/src/MultiDiskAdaptor.h index 9c96e398..392b97bf 100644 --- a/src/MultiDiskAdaptor.h +++ b/src/MultiDiskAdaptor.h @@ -97,9 +97,7 @@ public: }; -typedef SharedHandle DiskWriterEntryHandle; - -typedef std::vector DiskWriterEntries; +typedef std::vector > DiskWriterEntries; class MultiDiskAdaptor : public DiskAdaptor { friend class MultiFileAllocationIterator; @@ -118,7 +116,7 @@ private: void openIfNot(const SharedHandle& entry, void (DiskWriterEntry::*f)()); - + static const int DEFAULT_MAX_OPEN_FILES = 100; public: @@ -175,8 +173,6 @@ public: }; -typedef SharedHandle MultiDiskAdaptorHandle; - } // namespace aria2 #endif // D_MULTI_DISK_ADAPTOR_H diff --git a/src/MultiUrlRequestInfo.cc b/src/MultiUrlRequestInfo.cc index ed6a4b09..d0528c73 100644 --- a/src/MultiUrlRequestInfo.cc +++ b/src/MultiUrlRequestInfo.cc @@ -137,7 +137,7 @@ error_code::Value MultiUrlRequestInfo::execute() Notifier notifier(wsSessionMan); SingletonHolder::instance(¬ifier); - DownloadEngineHandle e = + SharedHandle e = DownloadEngineFactory().newDownloadEngine(option_.get(), requestGroups_); if(!option_->blank(PREF_LOAD_COOKIES)) { diff --git a/src/MultiUrlRequestInfo.h b/src/MultiUrlRequestInfo.h index 24b0a54a..cdc84bc4 100644 --- a/src/MultiUrlRequestInfo.h +++ b/src/MultiUrlRequestInfo.h @@ -70,7 +70,7 @@ public: const SharedHandle& statCalc, const SharedHandle& summaryOut, const SharedHandle& uriListParser); - + virtual ~MultiUrlRequestInfo(); /** @@ -80,8 +80,6 @@ public: error_code::Value execute(); }; -typedef SharedHandle MultiUrlRequestInfoHandle; - } // namespace aria2 #endif // D_MULTI_URL_REQUEST_INFO_H diff --git a/src/NetrcAuthResolver.h b/src/NetrcAuthResolver.h index 153ac686..84b748af 100644 --- a/src/NetrcAuthResolver.h +++ b/src/NetrcAuthResolver.h @@ -64,13 +64,11 @@ public: // Ignores default token of netrc void ignoreDefault(); - + // Uses default token of netrc void useDefault(); }; -typedef SharedHandle NetrcAuthResolverHandle; - } // namespace aria2 #endif // D_NETRC_AUTH_RESOLVER_H diff --git a/src/NullProgressInfoFile.h b/src/NullProgressInfoFile.h index 4440b72a..7ae2e44f 100644 --- a/src/NullProgressInfoFile.h +++ b/src/NullProgressInfoFile.h @@ -60,8 +60,6 @@ public: virtual void updateFilename() {} }; -typedef SharedHandle NullProgressInfoFileHandle; - } // namespace aria2 #endif // D_NULL_PROGRESS_INFO_FILE_H diff --git a/src/PeerAbstractCommand.cc b/src/PeerAbstractCommand.cc index 63420d61..d949fa12 100644 --- a/src/PeerAbstractCommand.cc +++ b/src/PeerAbstractCommand.cc @@ -37,7 +37,7 @@ #include "DownloadEngine.h" #include "Option.h" #include "DlAbortEx.h" -#include "Socket.h" +#include "SocketCore.h" #include "Logger.h" #include "LogFactory.h" #include "message.h" @@ -53,7 +53,7 @@ PeerAbstractCommand::PeerAbstractCommand (cuid_t cuid, const SharedHandle& peer, DownloadEngine* e, - const SocketHandle& s) + const SharedHandle& s) : Command(cuid), checkPoint_(global::wallclock()), // TODO referring global option @@ -136,7 +136,7 @@ void PeerAbstractCommand::disableReadCheckSocket() } } -void PeerAbstractCommand::setReadCheckSocket(const SocketHandle& socket) +void PeerAbstractCommand::setReadCheckSocket(const SharedHandle& socket) { if(!socket->isOpen()) { disableReadCheckSocket(); @@ -164,7 +164,7 @@ void PeerAbstractCommand::disableWriteCheckSocket() } } -void PeerAbstractCommand::setWriteCheckSocket(const SocketHandle& socket) +void PeerAbstractCommand::setWriteCheckSocket(const SharedHandle& socket) { if(!socket->isOpen()) { disableWriteCheckSocket(); diff --git a/src/PeerConnection.cc b/src/PeerConnection.cc index 48a78d93..1039f9ec 100644 --- a/src/PeerConnection.cc +++ b/src/PeerConnection.cc @@ -43,7 +43,7 @@ #include "LogFactory.h" #include "Logger.h" #include "BtHandshakeMessage.h" -#include "Socket.h" +#include "SocketCore.h" #include "a2netcompat.h" #include "ARC4Encryptor.h" #include "fmt.h" @@ -64,7 +64,7 @@ enum { } // namespace PeerConnection::PeerConnection -(cuid_t cuid, const SharedHandle& peer, const SocketHandle& socket) +(cuid_t cuid, const SharedHandle& peer, const SharedHandle& socket) : cuid_(cuid), peer_(peer), socket_(socket), diff --git a/src/PeerConnection.h b/src/PeerConnection.h index b4889e0e..beb7f3ff 100644 --- a/src/PeerConnection.h +++ b/src/PeerConnection.h @@ -117,7 +117,7 @@ public: void presetBuffer(const unsigned char* data, size_t length); bool sendBufferIsEmpty() const; - + ssize_t sendPendingData(); const unsigned char* getBuffer() const @@ -144,8 +144,6 @@ public: } }; -typedef SharedHandle PeerConnectionHandle; - } // namespace aria2 #endif // D_PEER_CONNECTION_H diff --git a/src/PeerInitiateConnectionCommand.cc b/src/PeerInitiateConnectionCommand.cc index 9369f59e..c2f23bb1 100644 --- a/src/PeerInitiateConnectionCommand.cc +++ b/src/PeerInitiateConnectionCommand.cc @@ -39,7 +39,7 @@ #include "DlAbortEx.h" #include "message.h" #include "prefs.h" -#include "Socket.h" +#include "SocketCore.h" #include "Logger.h" #include "LogFactory.h" #include "Peer.h" diff --git a/src/PeerInteractionCommand.cc b/src/PeerInteractionCommand.cc index 785e5f67..d35e3bff 100644 --- a/src/PeerInteractionCommand.cc +++ b/src/PeerInteractionCommand.cc @@ -42,7 +42,7 @@ #include "DlAbortEx.h" #include "message.h" #include "prefs.h" -#include "Socket.h" +#include "SocketCore.h" #include "Option.h" #include "DownloadContext.h" #include "Peer.h" @@ -87,9 +87,9 @@ PeerInteractionCommand::PeerInteractionCommand const SharedHandle& btRuntime, const SharedHandle& pieceStorage, const SharedHandle& peerStorage, - const SocketHandle& s, + const SharedHandle& s, Seq sequence, - const PeerConnectionHandle& passedPeerConnection) + const SharedHandle& passedPeerConnection) :PeerAbstractCommand(cuid, p, e, s), requestGroup_(requestGroup), btRuntime_(btRuntime), @@ -169,7 +169,7 @@ PeerInteractionCommand::PeerInteractionCommand SharedHandle factory(factoryPtr); - PeerConnectionHandle peerConnection; + SharedHandle peerConnection; if(!passedPeerConnection) { peerConnection.reset(new PeerConnection(cuid, getPeer(), getSocket())); } else { @@ -327,7 +327,8 @@ bool PeerInteractionCommand::executeInternal() { break; } } - BtMessageHandle handshakeMessage = btInteractive_->receiveHandshake(); + SharedHandle handshakeMessage = + btInteractive_->receiveHandshake(); if(!handshakeMessage) { done = true; break; @@ -337,7 +338,7 @@ bool PeerInteractionCommand::executeInternal() { break; } case RECEIVER_WAIT_HANDSHAKE: { - BtMessageHandle handshakeMessage = + SharedHandle handshakeMessage = btInteractive_->receiveAndSendHandshake(); if(!handshakeMessage) { done = true; diff --git a/src/PeerListenCommand.cc b/src/PeerListenCommand.cc index 401e1634..154d7b77 100644 --- a/src/PeerListenCommand.cc +++ b/src/PeerListenCommand.cc @@ -45,7 +45,7 @@ #include "ReceiverMSEHandshakeCommand.h" #include "Logger.h" #include "LogFactory.h" -#include "Socket.h" +#include "SocketCore.h" #include "SimpleRandomizer.h" #include "util.h" #include "fmt.h" @@ -108,7 +108,7 @@ bool PeerListenCommand::execute() { return true; } for(int i = 0; i < 3 && socket_->isReadable(0); ++i) { - SocketHandle peerSocket; + SharedHandle peerSocket; try { peerSocket.reset(socket_->acceptConnection()); std::pair peerInfo; diff --git a/src/PeerReceiveHandshakeCommand.cc b/src/PeerReceiveHandshakeCommand.cc index 850fb589..7acbda48 100644 --- a/src/PeerReceiveHandshakeCommand.cc +++ b/src/PeerReceiveHandshakeCommand.cc @@ -50,7 +50,7 @@ #include "BtRuntime.h" #include "BtConstants.h" #include "message.h" -#include "Socket.h" +#include "SocketCore.h" #include "Logger.h" #include "LogFactory.h" #include "prefs.h" @@ -65,7 +65,7 @@ PeerReceiveHandshakeCommand::PeerReceiveHandshakeCommand (cuid_t cuid, const SharedHandle& peer, DownloadEngine* e, - const SocketHandle& s, + const SharedHandle& s, const SharedHandle& peerConnection) : PeerAbstractCommand(cuid, peer, e, s), peerConnection_(peerConnection) diff --git a/src/PeerStat.h b/src/PeerStat.h index f651e9f5..7cfaf16b 100644 --- a/src/PeerStat.h +++ b/src/PeerStat.h @@ -151,8 +151,6 @@ public: } }; -typedef SharedHandle PeerStatHandle; - } // namespace aria2 #endif // D_PEER_STAT_H diff --git a/src/PeerStorage.h b/src/PeerStorage.h index 7e75a11f..57d3b1ac 100644 --- a/src/PeerStorage.h +++ b/src/PeerStorage.h @@ -88,7 +88,7 @@ public: * Otherwise returns false. */ virtual bool isPeerAvailable() = 0; - + /** * Returns the list of peers which are currently connected from localhost. */ @@ -124,8 +124,6 @@ public: virtual void executeChoke() = 0; }; -typedef SharedHandle PeerStorageHandle; - } // namespace aria2 #endif // D_PEER_STORAGE_H diff --git a/src/PieceHashCheckIntegrityEntry.cc b/src/PieceHashCheckIntegrityEntry.cc index 40665b76..7af39539 100644 --- a/src/PieceHashCheckIntegrityEntry.cc +++ b/src/PieceHashCheckIntegrityEntry.cc @@ -57,7 +57,7 @@ bool PieceHashCheckIntegrityEntry::isValidationReady() void PieceHashCheckIntegrityEntry::initValidator() { #ifdef ENABLE_MESSAGE_DIGEST - IteratableChunkChecksumValidatorHandle validator + SharedHandle validator (new IteratableChunkChecksumValidator (getRequestGroup()->getDownloadContext(), getRequestGroup()->getPieceStorage())); diff --git a/src/PieceStorage.h b/src/PieceStorage.h index 4e4e24a9..57114dba 100644 --- a/src/PieceStorage.h +++ b/src/PieceStorage.h @@ -288,8 +288,6 @@ public: virtual void onDownloadIncomplete() = 0; }; -typedef SharedHandle PieceStorageHandle; - } // namespace aria2 #endif // D_PIECE_STORAGE_H diff --git a/src/ProgressAwareEntry.h b/src/ProgressAwareEntry.h index 7b189595..f9e1f2db 100644 --- a/src/ProgressAwareEntry.h +++ b/src/ProgressAwareEntry.h @@ -40,8 +40,6 @@ #include #include -#include "SharedHandle.h" - namespace aria2 { class ProgressAwareEntry { @@ -55,8 +53,6 @@ public: virtual bool finished() = 0; }; -typedef SharedHandle ProgressAwareEntryHandle; - } // namespace aria2 #endif // D_PROGRESS_AWARE_ENTRY_H diff --git a/src/Randomizer.h b/src/Randomizer.h index 16427d28..ad8cd0c7 100644 --- a/src/Randomizer.h +++ b/src/Randomizer.h @@ -36,7 +36,6 @@ #define D_RANDOMIZER_H #include "common.h" -#include "SharedHandle.h" namespace aria2 { @@ -54,8 +53,6 @@ public: virtual long int getRandomNumber(long int to) = 0; }; -typedef SharedHandle RandomizerHandle; - } // namespace aria2 #endif // D_RANDOMIZER_H diff --git a/src/Range.h b/src/Range.h index 913742bb..c4d1ad4d 100644 --- a/src/Range.h +++ b/src/Range.h @@ -39,8 +39,6 @@ #include -#include "SharedHandle.h" - namespace aria2 { class Range { @@ -81,8 +79,6 @@ public: int64_t getContentLength() const; }; -typedef SharedHandle RangeHandle; - } // namespace aria2 #endif // D_RANGE_H diff --git a/src/ReceiverMSEHandshakeCommand.cc b/src/ReceiverMSEHandshakeCommand.cc index cfde2d42..e64e591e 100644 --- a/src/ReceiverMSEHandshakeCommand.cc +++ b/src/ReceiverMSEHandshakeCommand.cc @@ -40,7 +40,7 @@ #include "DlAbortEx.h" #include "Peer.h" #include "message.h" -#include "Socket.h" +#include "SocketCore.h" #include "Logger.h" #include "prefs.h" #include "Option.h" diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc index 4d2b504b..31b2262a 100644 --- a/src/RequestGroup.cc +++ b/src/RequestGroup.cc @@ -319,7 +319,7 @@ void RequestGroup::createInitialCommand progressInfoFile.reset(progressInfoFilePtr); } - BtRuntimeHandle btRuntime(new BtRuntime()); + SharedHandle btRuntime(new BtRuntime()); btRuntime->setMaxPeers(option_->getAsInt(PREF_BT_MAX_PEERS)); btRuntime_ = btRuntime.get(); if(progressInfoFilePtr) { @@ -1102,12 +1102,13 @@ bool RequestGroup::isDependencyResolved() return dependency_->resolve(); } -void RequestGroup::dependsOn(const DependencyHandle& dep) +void RequestGroup::dependsOn(const SharedHandle& dep) { dependency_ = dep; } -void RequestGroup::setDiskWriterFactory(const DiskWriterFactoryHandle& diskWriterFactory) +void RequestGroup::setDiskWriterFactory +(const SharedHandle& diskWriterFactory) { diskWriterFactory_ = diskWriterFactory; } @@ -1134,7 +1135,7 @@ void RequestGroup::clearPreDownloadHandler() preDownloadHandlers_.clear(); } -void RequestGroup::setPieceStorage(const PieceStorageHandle& pieceStorage) +void RequestGroup::setPieceStorage(const SharedHandle& pieceStorage) { pieceStorage_ = pieceStorage; } @@ -1152,7 +1153,7 @@ bool RequestGroup::needsFileAllocation() const !pieceStorage_->getDiskAdaptor()->fileAllocationIterator()->finished(); } -DownloadResultHandle RequestGroup::createDownloadResult() const +SharedHandle RequestGroup::createDownloadResult() const { A2_LOG_DEBUG(fmt("GID#%" PRId64 " - Creating DownloadResult.", gid_)); TransferStat st = calculateStat(); @@ -1188,7 +1189,7 @@ DownloadResultHandle RequestGroup::createDownloadResult() const res->dir = option_->get(PREF_DIR); return res; } - + void RequestGroup::reportDownloadFinished() { A2_LOG_NOTICE(fmt(MSG_FILE_DOWNLOAD_COMPLETED, diff --git a/src/RequestGroupEntry.h b/src/RequestGroupEntry.h index 30e8a942..fedd41d5 100644 --- a/src/RequestGroupEntry.h +++ b/src/RequestGroupEntry.h @@ -36,7 +36,6 @@ #define D_REQUEST_GROUP_ENTRY_H #include "common.h" -#include "SharedHandle.h" namespace aria2 { @@ -66,15 +65,13 @@ public: Command* popNextCommand(); void pushNextCommand(Command* nextCommand); - + bool operator==(const RequestGroupEntry& entry) const { return this == &entry; } }; -typedef SharedHandle RequestGroupEntryHandle; - } // namespace aria2 #endif // D_REQUEST_GROUP_ENTRY_H diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc index 0e8ea1da..8eebd469 100644 --- a/src/RequestGroupMan.cc +++ b/src/RequestGroupMan.cc @@ -787,7 +787,7 @@ namespace { void formatDownloadResultCommon (std::ostream& o, const char* status, - const DownloadResultHandle& downloadResult) + const SharedHandle& downloadResult) { o << std::setw(3) << downloadResult->gid << "|" << std::setw(4) << status << "|" @@ -806,7 +806,7 @@ void formatDownloadResultCommon void RequestGroupMan::formatDownloadResultFull (OutputFile& out, const char* status, - const DownloadResultHandle& downloadResult) const + const SharedHandle& downloadResult) const { BitfieldMan bt(downloadResult->pieceLength, downloadResult->totalLength); bt.setBitfield(reinterpret_cast @@ -848,7 +848,7 @@ void RequestGroupMan::formatDownloadResultFull std::string RequestGroupMan::formatDownloadResult (const char* status, - const DownloadResultHandle& downloadResult) const + const SharedHandle& downloadResult) const { std::stringstream o; formatDownloadResultCommon(o, status, downloadResult); diff --git a/src/RequestGroupMan.h b/src/RequestGroupMan.h index 4bdc9f66..94ccc8ae 100644 --- a/src/RequestGroupMan.h +++ b/src/RequestGroupMan.h @@ -95,11 +95,11 @@ private: void formatDownloadResultFull (OutputFile& out, const char* status, - const DownloadResultHandle& downloadResult) const; + const SharedHandle& downloadResult) const; std::string formatDownloadResult (const char* status, - const DownloadResultHandle& downloadResult) const; + const SharedHandle& downloadResult) const; void configureRequestGroup (const SharedHandle& requestGroup) const; @@ -335,8 +335,6 @@ public: void setUriListParser(const SharedHandle& uriListParser); }; -typedef SharedHandle RequestGroupManHandle; - } // namespace aria2 #endif // D_REQUEST_GROUP_MAN_H diff --git a/src/SegmentMan.cc b/src/SegmentMan.cc index 92bc3f59..c8fec8c2 100644 --- a/src/SegmentMan.cc +++ b/src/SegmentMan.cc @@ -65,7 +65,7 @@ SegmentEntry::~SegmentEntry() {} SegmentMan::SegmentMan (const Option* option, const SharedHandle& downloadContext, - const PieceStorageHandle& pieceStorage) + const SharedHandle& pieceStorage) : option_(option), downloadContext_(downloadContext), pieceStorage_(pieceStorage), @@ -103,7 +103,7 @@ int64_t SegmentMan::getTotalLength() const } } -void SegmentMan::setPieceStorage(const PieceStorageHandle& pieceStorage) +void SegmentMan::setPieceStorage(const SharedHandle& pieceStorage) { pieceStorage_ = pieceStorage; } @@ -130,7 +130,7 @@ SharedHandle SegmentMan::checkoutSegment } else { segment.reset(new PiecedSegment(downloadContext_->getPieceLength(), piece)); } - SegmentEntryHandle entry(new SegmentEntry(cuid, segment)); + SharedHandle entry(new SegmentEntry(cuid, segment)); usedSegmentEntries_.push_back(entry); A2_LOG_DEBUG(fmt("index=%lu, length=%d, segmentLength=%d," " writtenLength=%d", @@ -162,7 +162,7 @@ void SegmentMan::getInFlightSegment { for(SegmentEntries::const_iterator itr = usedSegmentEntries_.begin(), eoi = usedSegmentEntries_.end(); itr != eoi; ++itr) { - const SegmentEntryHandle& segmentEntry = *itr; + const SharedHandle& segmentEntry = *itr; if(segmentEntry->cuid == cuid) { segments.push_back(segmentEntry->segment); } @@ -314,7 +314,7 @@ private: public: FindSegmentEntry(const SharedHandle& segment):segment_(segment) {} - bool operator()(const SegmentEntryHandle& segmentEntry) const + bool operator()(const SharedHandle& segmentEntry) const { return segmentEntry->segment->getIndex() == segment_->getIndex(); } diff --git a/src/SegmentMan.h b/src/SegmentMan.h index 5a6f47df..16a322ca 100644 --- a/src/SegmentMan.h +++ b/src/SegmentMan.h @@ -68,8 +68,7 @@ struct SegmentEntry { SegmentEntry& operator=(const SegmentEntry&); }; -typedef SharedHandle SegmentEntryHandle; -typedef std::deque SegmentEntries; +typedef std::deque > SegmentEntries; /** * This class holds the download progress of the one download entry. diff --git a/src/SimpleRandomizer.h b/src/SimpleRandomizer.h index 6ffc43eb..abbd2d46 100644 --- a/src/SimpleRandomizer.h +++ b/src/SimpleRandomizer.h @@ -41,6 +41,8 @@ # include #endif // __MINGW32__ +#include "SharedHandle.h" + namespace aria2 { class SimpleRandomizer : public Randomizer { @@ -53,9 +55,9 @@ private: SimpleRandomizer(); public: - + static const SharedHandle& getInstance(); - + static void init(); virtual ~SimpleRandomizer(); diff --git a/src/Socket.h b/src/Socket.h deleted file mode 100644 index 41e36cdc..00000000 --- a/src/Socket.h +++ /dev/null @@ -1,47 +0,0 @@ -/* */ -#ifndef D_SOCKET_H -#define D_SOCKET_H - -#include "SocketCore.h" -#include "SharedHandle.h" - -namespace aria2 { - -typedef SharedHandle SocketHandle; - -} // namespace aria2 - -#endif // D_SOCKET_H diff --git a/src/StatCalc.h b/src/StatCalc.h index 8c00a369..209ada99 100644 --- a/src/StatCalc.h +++ b/src/StatCalc.h @@ -49,8 +49,6 @@ public: virtual void calculateStat(const DownloadEngine* e) = 0; }; -typedef SharedHandle StatCalcHandle; - } // namespace aria2 #endif // D_STAT_CALC_H diff --git a/src/StreamCheckIntegrityEntry.h b/src/StreamCheckIntegrityEntry.h index 72f88ac0..02e48522 100644 --- a/src/StreamCheckIntegrityEntry.h +++ b/src/StreamCheckIntegrityEntry.h @@ -54,8 +54,6 @@ public: DownloadEngine* e); }; -typedef SharedHandle StreamCheckIntegrityEntryHandle; - } // namespace aria2 #endif // D_STREAM_CHECK_INTEGRITY_ENTRY_H diff --git a/src/UTMetadataDataExtensionMessage.h b/src/UTMetadataDataExtensionMessage.h index adac0e9b..75720412 100644 --- a/src/UTMetadataDataExtensionMessage.h +++ b/src/UTMetadataDataExtensionMessage.h @@ -36,6 +36,7 @@ #define D_UT_METADATA_DATA_EXTENSION_MESSAGE_H #include "UTMetadataExtensionMessage.h" +#include "SharedHandle.h" namespace aria2 { diff --git a/src/UTMetadataRequestExtensionMessage.h b/src/UTMetadataRequestExtensionMessage.h index 12ea1436..5c5e3f7f 100644 --- a/src/UTMetadataRequestExtensionMessage.h +++ b/src/UTMetadataRequestExtensionMessage.h @@ -36,6 +36,7 @@ #define D_UT_METADATA_REQUEST_EXTENSION_MESSAGE_H #include "UTMetadataExtensionMessage.h" +#include "SharedHandle.h" namespace aria2 { diff --git a/src/UTPexExtensionMessage.cc b/src/UTPexExtensionMessage.cc index a2573030..1aa6b34b 100644 --- a/src/UTPexExtensionMessage.cc +++ b/src/UTPexExtensionMessage.cc @@ -181,7 +181,7 @@ void UTPexExtensionMessage::setPeerStorage peerStorage_ = peerStorage; } -UTPexExtensionMessageHandle +SharedHandle UTPexExtensionMessage::create(const unsigned char* data, size_t len) { if(len < 1) { @@ -189,7 +189,7 @@ UTPexExtensionMessage::create(const unsigned char* data, size_t len) EXTENSION_NAME, static_cast(len))); } - UTPexExtensionMessageHandle msg(new UTPexExtensionMessage(*data)); + SharedHandle msg(new UTPexExtensionMessage(*data)); SharedHandle decoded = bencode2::decode(data+1, len - 1); const Dict* dict = downcast(decoded); diff --git a/src/UTPexExtensionMessage.h b/src/UTPexExtensionMessage.h index 7bc2393a..c59dfb51 100644 --- a/src/UTPexExtensionMessage.h +++ b/src/UTPexExtensionMessage.h @@ -41,13 +41,12 @@ #include #include "a2time.h" +#include "SharedHandle.h" namespace aria2 { class PeerStorage; class Peer; -class UTPexExtensionMessage; -typedef SharedHandle UTPexExtensionMessageHandle; class UTPexExtensionMessage:public ExtensionMessage { private: @@ -80,7 +79,7 @@ public: { return extensionMessageID_; } - + virtual const char* getExtensionName() const { return EXTENSION_NAME; @@ -98,7 +97,7 @@ public: { return freshPeers_; } - + bool freshPeersAreFull() const; bool addDroppedPeer(const SharedHandle& peer); @@ -112,7 +111,7 @@ public: void setPeerStorage(const SharedHandle& peerStorage); - static UTPexExtensionMessageHandle + static SharedHandle create(const unsigned char* data, size_t len); void setMaxFreshPeer(size_t maxFreshPeer); @@ -132,8 +131,6 @@ public: static const time_t DEFAULT_INTERVAL = 60; }; -typedef SharedHandle UTPexExtensionMessageHandle; - } // namespace aria2 #endif // D_UT_PEX_EXTENSION_MESSAGE_H diff --git a/src/UnknownLengthPieceStorage.cc b/src/UnknownLengthPieceStorage.cc index c93f5d63..acc7fa60 100644 --- a/src/UnknownLengthPieceStorage.cc +++ b/src/UnknownLengthPieceStorage.cc @@ -59,16 +59,16 @@ UnknownLengthPieceStorage::~UnknownLengthPieceStorage() {} void UnknownLengthPieceStorage::initStorage() { - DirectDiskAdaptorHandle directDiskAdaptor(new DirectDiskAdaptor()); + DirectDiskAdaptor* directDiskAdaptor(new DirectDiskAdaptor()); directDiskAdaptor->setTotalLength(downloadContext_->getTotalLength()); directDiskAdaptor->setFileEntries(downloadContext_->getFileEntries().begin(), downloadContext_->getFileEntries().end()); - DiskWriterHandle writer = + SharedHandle writer = diskWriterFactory_->newDiskWriter(directDiskAdaptor->getFilePath()); directDiskAdaptor->setDiskWriter(writer); - diskAdaptor_ = directDiskAdaptor; + diskAdaptor_.reset(directDiskAdaptor); } #ifdef ENABLE_BITTORRENT @@ -215,7 +215,7 @@ bool UnknownLengthPieceStorage::isPieceUsed(size_t index) } } -DiskAdaptorHandle UnknownLengthPieceStorage::getDiskAdaptor() +SharedHandle UnknownLengthPieceStorage::getDiskAdaptor() { return diskAdaptor_; } @@ -255,7 +255,7 @@ void UnknownLengthPieceStorage::getInFlightPieces {} void UnknownLengthPieceStorage::setDiskWriterFactory -(const DiskWriterFactoryHandle& diskWriterFactory) +(const SharedHandle& diskWriterFactory) { diskWriterFactory_ = diskWriterFactory; } diff --git a/src/UnknownLengthPieceStorage.h b/src/UnknownLengthPieceStorage.h index c6c8f73c..d28bd622 100644 --- a/src/UnknownLengthPieceStorage.h +++ b/src/UnknownLengthPieceStorage.h @@ -296,8 +296,6 @@ public: virtual void onDownloadIncomplete() {} }; -typedef SharedHandle UnknownLengthPieceStorageHandle; - } // namespace aria2 #endif // D_UNKNOWN_LENGTH_PIECE_STORAGE_H diff --git a/src/message_digest_helper.cc b/src/message_digest_helper.cc index 63457626..4faca61b 100644 --- a/src/message_digest_helper.cc +++ b/src/message_digest_helper.cc @@ -66,7 +66,7 @@ void staticSHA1DigestFree() } std::string staticSHA1Digest -(const BinaryStreamHandle& bs, int64_t offset, int64_t length) +(const SharedHandle& bs, int64_t offset, int64_t length) { sha1Ctx_->reset(); return digest(sha1Ctx_, bs, offset, length); diff --git a/src/util.cc b/src/util.cc index b28b4569..189d91aa 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1098,7 +1098,7 @@ void convertBitfield(BitfieldMan* dest, const BitfieldMan* src) } } -std::string toString(const BinaryStreamHandle& binaryStream) +std::string toString(const SharedHandle& binaryStream) { std::stringstream strm; char data[2048]; diff --git a/test/MSEHandshakeTest.cc b/test/MSEHandshakeTest.cc index 8d11a7f1..d2369296 100644 --- a/test/MSEHandshakeTest.cc +++ b/test/MSEHandshakeTest.cc @@ -7,7 +7,7 @@ #include "Exception.h" #include "util.h" #include "prefs.h" -#include "Socket.h" +#include "SocketCore.h" #include "Option.h" #include "DownloadContext.h" #include "FileEntry.h"