github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

DefaultBtRequestFactory: Use raw pointer for pieceStorage_

pull/103/head
Tatsuhiro Tsujikawa 2013-06-23 12:02:36 +09:00
parent bef6236da8
commit bfb732c5d4
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/DefaultBtRequestFactory.cc
View File

@ -52,7 +52,8 @@
namespace aria2 { namespace aria2 {
DefaultBtRequestFactory::DefaultBtRequestFactory() DefaultBtRequestFactory::DefaultBtRequestFactory()
: dispatcher_(0), : pieceStorage_(0),
dispatcher_(0),
messageFactory_(0), messageFactory_(0),
cuid_(0) cuid_(0)
{} {}
@ -104,11 +105,11 @@ namespace {
class ProcessChokedPiece { class ProcessChokedPiece {
private: private:
std::shared_ptr<Peer> peer_; std::shared_ptr<Peer> peer_;
std::shared_ptr<PieceStorage> pieceStorage_; PieceStorage* pieceStorage_;
cuid_t cuid_; cuid_t cuid_;
public: public:
ProcessChokedPiece(const std::shared_ptr<Peer>& peer, ProcessChokedPiece(const std::shared_ptr<Peer>& peer,
const std::shared_ptr<PieceStorage>& pieceStorage, PieceStorage* pieceStorage,
cuid_t cuid): cuid_t cuid):
peer_(peer), peer_(peer),
pieceStorage_(pieceStorage), pieceStorage_(pieceStorage),
@ -262,8 +263,7 @@ void DefaultBtRequestFactory::getTargetPieceIndexes
std::mem_fn(&Piece::getIndex)); std::mem_fn(&Piece::getIndex));
} }
void DefaultBtRequestFactory::setPieceStorage void DefaultBtRequestFactory::setPieceStorage(PieceStorage* pieceStorage)
(const std::shared_ptr<PieceStorage>& pieceStorage)
{ {
pieceStorage_ = pieceStorage; pieceStorage_ = pieceStorage;
} }

4
src/DefaultBtRequestFactory.h
View File

@ -51,7 +51,7 @@ class Piece;
class DefaultBtRequestFactory : public BtRequestFactory { class DefaultBtRequestFactory : public BtRequestFactory {
private: private:
std::shared_ptr<PieceStorage> pieceStorage_; PieceStorage* pieceStorage_;
std::shared_ptr<Peer> peer_; std::shared_ptr<Peer> peer_;
BtMessageDispatcher* dispatcher_; BtMessageDispatcher* dispatcher_;
BtMessageFactory* messageFactory_; BtMessageFactory* messageFactory_;
@ -91,7 +91,7 @@ public:
return pieces_; return pieces_;
} }
void setPieceStorage(const std::shared_ptr<PieceStorage>& pieceStorage); void setPieceStorage(PieceStorage* pieceStorage);
void setPeer(const std::shared_ptr<Peer>& peer); void setPeer(const std::shared_ptr<Peer>& peer);

2
src/PeerInteractionCommand.cc
View File

@ -212,7 +212,7 @@ PeerInteractionCommand::PeerInteractionCommand
DefaultBtRequestFactory* reqFactoryPtr(new DefaultBtRequestFactory()); DefaultBtRequestFactory* reqFactoryPtr(new DefaultBtRequestFactory());
reqFactoryPtr->setPeer(getPeer()); reqFactoryPtr->setPeer(getPeer());
reqFactoryPtr->setPieceStorage(pieceStorage); reqFactoryPtr->setPieceStorage(pieceStorage.get());
reqFactoryPtr->setBtMessageDispatcher(dispatcherPtr); reqFactoryPtr->setBtMessageDispatcher(dispatcherPtr);
reqFactoryPtr->setBtMessageFactory(factoryPtr); reqFactoryPtr->setBtMessageFactory(factoryPtr);
reqFactoryPtr->setCuid(cuid); reqFactoryPtr->setCuid(cuid);

2
test/DefaultBtRequestFactoryTest.cc
View File

@ -97,7 +97,7 @@ public:
dispatcher_.reset(new MockBtMessageDispatcher()); dispatcher_.reset(new MockBtMessageDispatcher());
requestFactory_.reset(new DefaultBtRequestFactory()); requestFactory_.reset(new DefaultBtRequestFactory());
requestFactory_->setPieceStorage(pieceStorage_); requestFactory_->setPieceStorage(pieceStorage_.get());
requestFactory_->setPeer(peer_); requestFactory_->setPeer(peer_);
requestFactory_->setBtMessageDispatcher(dispatcher_.get()); requestFactory_->setBtMessageDispatcher(dispatcher_.get());
requestFactory_->setBtMessageFactory(messageFactory_.get()); requestFactory_->setBtMessageFactory(messageFactory_.get());