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

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

Renamed member variables. Removed unused member variable.
	* src/DefaultBtRequestFactory.cc
	* src/DefaultBtRequestFactory.h
	* src/PeerInteractionCommand.cc
pull/1/head
Tatsuhiro Tsujikawa 2010-06-12 08:39:11 +00:00
parent d4eebc843a
commit c6def0cbd7
4 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables. Removed unused member variable.
* src/DefaultBtRequestFactory.cc
* src/DefaultBtRequestFactory.h
* src/PeerInteractionCommand.cc
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables. Removed unused member variables. Renamed member variables. Removed unused member variables.

70
src/DefaultBtRequestFactory.cc
View File

@ -51,7 +51,6 @@
namespace aria2 { namespace aria2 {
DefaultBtRequestFactory::DefaultBtRequestFactory(): DefaultBtRequestFactory::DefaultBtRequestFactory():
cuid(0),
_logger(LogFactory::getInstance()) _logger(LogFactory::getInstance())
{ {
if(_logger->debug()) { if(_logger->debug()) {
@ -68,7 +67,7 @@ DefaultBtRequestFactory::~DefaultBtRequestFactory()
void DefaultBtRequestFactory::addTargetPiece(const SharedHandle<Piece>& piece) void DefaultBtRequestFactory::addTargetPiece(const SharedHandle<Piece>& piece)
{ {
pieces.push_back(piece); _pieces.push_back(piece);
} }
class AbortCompletedPieceRequest class AbortCompletedPieceRequest
@ -88,17 +87,19 @@ public:
}; };
void DefaultBtRequestFactory::removeCompletedPiece() { void DefaultBtRequestFactory::removeCompletedPiece() {
std::for_each(pieces.begin(), pieces.end(), std::for_each(_pieces.begin(), _pieces.end(),
AbortCompletedPieceRequest(dispatcher)); AbortCompletedPieceRequest(_dispatcher));
pieces.erase(std::remove_if(pieces.begin(), pieces.end(), _pieces.erase(std::remove_if(_pieces.begin(), _pieces.end(),
mem_fun_sh(&Piece::pieceComplete)), mem_fun_sh(&Piece::pieceComplete)),
pieces.end()); _pieces.end());
} }
void DefaultBtRequestFactory::removeTargetPiece(const SharedHandle<Piece>& piece) { void DefaultBtRequestFactory::removeTargetPiece
pieces.erase(std::remove(pieces.begin(), pieces.end(), piece), (const SharedHandle<Piece>& piece)
pieces.end()); {
dispatcher->doAbortOutstandingRequestAction(piece); _pieces.erase(std::remove(_pieces.begin(), _pieces.end(), piece),
_pieces.end());
_dispatcher->doAbortOutstandingRequestAction(piece);
_pieceStorage->cancelPiece(piece); _pieceStorage->cancelPiece(piece);
} }
@ -134,20 +135,20 @@ public:
void DefaultBtRequestFactory::doChokedAction() void DefaultBtRequestFactory::doChokedAction()
{ {
std::for_each(pieces.begin(), pieces.end(), std::for_each(_pieces.begin(), _pieces.end(),
ProcessChokedPiece(peer, _pieceStorage)); ProcessChokedPiece(_peer, _pieceStorage));
pieces.erase(std::remove_if(pieces.begin(), pieces.end(), _pieces.erase(std::remove_if(_pieces.begin(), _pieces.end(),
FindChokedPiece(peer)), FindChokedPiece(_peer)),
pieces.end()); _pieces.end());
} }
void DefaultBtRequestFactory::removeAllTargetPiece() { void DefaultBtRequestFactory::removeAllTargetPiece() {
for(std::deque<SharedHandle<Piece> >::iterator itr = pieces.begin(), for(std::deque<SharedHandle<Piece> >::iterator itr = _pieces.begin(),
eoi = pieces.end(); itr != eoi; ++itr) { eoi = _pieces.end(); itr != eoi; ++itr) {
dispatcher->doAbortOutstandingRequestAction(*itr); _dispatcher->doAbortOutstandingRequestAction(*itr);
_pieceStorage->cancelPiece(*itr); _pieceStorage->cancelPiece(*itr);
} }
pieces.clear(); _pieces.clear();
} }
void DefaultBtRequestFactory::createRequestMessages void DefaultBtRequestFactory::createRequestMessages
@ -159,8 +160,8 @@ void DefaultBtRequestFactory::createRequestMessages
size_t getnum = max-requests.size(); size_t getnum = max-requests.size();
std::vector<size_t> blockIndexes; std::vector<size_t> blockIndexes;
blockIndexes.reserve(getnum); blockIndexes.reserve(getnum);
for(std::deque<SharedHandle<Piece> >::iterator itr = pieces.begin(), for(std::deque<SharedHandle<Piece> >::iterator itr = _pieces.begin(),
eoi = pieces.end(); itr != eoi && getnum; ++itr) { eoi = _pieces.end(); itr != eoi && getnum; ++itr) {
SharedHandle<Piece>& piece = *itr; SharedHandle<Piece>& piece = *itr;
if(piece->getMissingUnusedBlockIndex(blockIndexes, getnum)) { if(piece->getMissingUnusedBlockIndex(blockIndexes, getnum)) {
getnum -= blockIndexes.size(); getnum -= blockIndexes.size();
@ -174,7 +175,7 @@ void DefaultBtRequestFactory::createRequestMessages
(*i)); (*i));
} }
requests.push_back requests.push_back
(messageFactory->createRequestMessage(piece, *i)); (_messageFactory->createRequestMessage(piece, *i));
} }
blockIndexes.clear(); blockIndexes.clear();
} }
@ -184,8 +185,8 @@ void DefaultBtRequestFactory::createRequestMessages
void DefaultBtRequestFactory::createRequestMessagesOnEndGame void DefaultBtRequestFactory::createRequestMessagesOnEndGame
(std::vector<SharedHandle<BtMessage> >& requests, size_t max) (std::vector<SharedHandle<BtMessage> >& requests, size_t max)
{ {
for(std::deque<SharedHandle<Piece> >::iterator itr = pieces.begin(), for(std::deque<SharedHandle<Piece> >::iterator itr = _pieces.begin(),
eoi = pieces.end(); itr != eoi && requests.size() < max; ++itr) { eoi = _pieces.end(); itr != eoi && requests.size() < max; ++itr) {
SharedHandle<Piece>& piece = *itr; SharedHandle<Piece>& piece = *itr;
const size_t mislen = piece->getBitfieldLength(); const size_t mislen = piece->getBitfieldLength();
array_ptr<unsigned char> misbitfield(new unsigned char[mislen]); array_ptr<unsigned char> misbitfield(new unsigned char[mislen]);
@ -209,7 +210,7 @@ void DefaultBtRequestFactory::createRequestMessagesOnEndGame
eoi2 = missingBlockIndexes.end(); eoi2 = missingBlockIndexes.end();
bitr != eoi2 && requests.size() < max; ++bitr) { bitr != eoi2 && requests.size() < max; ++bitr) {
const size_t& blockIndex = *bitr; const size_t& blockIndex = *bitr;
if(!dispatcher->isOutstandingRequest(piece->getIndex(), if(!_dispatcher->isOutstandingRequest(piece->getIndex(),
blockIndex)) { blockIndex)) {
if(_logger->debug()) { if(_logger->debug()) {
_logger->debug("Creating RequestMessage index=%u, begin=%u," _logger->debug("Creating RequestMessage index=%u, begin=%u,"
@ -218,7 +219,8 @@ void DefaultBtRequestFactory::createRequestMessagesOnEndGame
blockIndex*piece->getBlockLength(), blockIndex*piece->getBlockLength(),
blockIndex); blockIndex);
} }
requests.push_back(messageFactory->createRequestMessage(piece, blockIndex)); requests.push_back(_messageFactory->createRequestMessage
(piece, blockIndex));
} }
} }
} }
@ -244,14 +246,14 @@ public:
size_t DefaultBtRequestFactory::countMissingBlock() size_t DefaultBtRequestFactory::countMissingBlock()
{ {
return std::for_each(pieces.begin(), pieces.end(), return std::for_each(_pieces.begin(), _pieces.end(),
CountMissingBlock()).getNumMissingBlock(); CountMissingBlock()).getNumMissingBlock();
} }
void DefaultBtRequestFactory::getTargetPieceIndexes void DefaultBtRequestFactory::getTargetPieceIndexes
(std::vector<size_t>& indexes) const (std::vector<size_t>& indexes) const
{ {
std::transform(pieces.begin(), pieces.end(), std::back_inserter(indexes), std::transform(_pieces.begin(), _pieces.end(), std::back_inserter(indexes),
mem_fun_sh(&Piece::getIndex)); mem_fun_sh(&Piece::getIndex));
} }
@ -263,17 +265,19 @@ void DefaultBtRequestFactory::setPieceStorage
void DefaultBtRequestFactory::setPeer(const SharedHandle<Peer>& peer) void DefaultBtRequestFactory::setPeer(const SharedHandle<Peer>& peer)
{ {
this->peer = peer; _peer = peer;
} }
void DefaultBtRequestFactory::setBtMessageDispatcher(const WeakHandle<BtMessageDispatcher>& dispatcher) void DefaultBtRequestFactory::setBtMessageDispatcher
(const WeakHandle<BtMessageDispatcher>& dispatcher)
{ {
this->dispatcher = dispatcher; _dispatcher = dispatcher;
} }
void DefaultBtRequestFactory::setBtMessageFactory(const WeakHandle<BtMessageFactory>& factory) void DefaultBtRequestFactory::setBtMessageFactory
(const WeakHandle<BtMessageFactory>& factory)
{ {
this->messageFactory = factory; _messageFactory = factory;
} }
} // namespace aria2 } // namespace aria2

21
src/DefaultBtRequestFactory.h
View File

@ -52,12 +52,11 @@ class Logger;
class DefaultBtRequestFactory : public BtRequestFactory { class DefaultBtRequestFactory : public BtRequestFactory {
private: private:
cuid_t cuid;
SharedHandle<PieceStorage> _pieceStorage; SharedHandle<PieceStorage> _pieceStorage;
SharedHandle<Peer> peer; SharedHandle<Peer> _peer;
WeakHandle<BtMessageDispatcher> dispatcher; WeakHandle<BtMessageDispatcher> _dispatcher;
WeakHandle<BtMessageFactory> messageFactory; WeakHandle<BtMessageFactory> _messageFactory;
std::deque<SharedHandle<Piece> > pieces; std::deque<SharedHandle<Piece> > _pieces;
Logger* _logger; Logger* _logger;
public: public:
DefaultBtRequestFactory(); DefaultBtRequestFactory();
@ -71,7 +70,7 @@ public:
virtual void removeAllTargetPiece(); virtual void removeAllTargetPiece();
virtual size_t countTargetPiece() { virtual size_t countTargetPiece() {
return pieces.size(); return _pieces.size();
} }
virtual size_t countMissingBlock(); virtual size_t countMissingBlock();
@ -90,19 +89,15 @@ public:
std::deque<SharedHandle<Piece> >& getTargetPieces() std::deque<SharedHandle<Piece> >& getTargetPieces()
{ {
return pieces; return _pieces;
}
void setCuid(cuid_t cuid)
{
this->cuid = cuid;
} }
void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage); void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage);
void setPeer(const SharedHandle<Peer>& peer); void setPeer(const SharedHandle<Peer>& peer);
void setBtMessageDispatcher(const WeakHandle<BtMessageDispatcher>& dispatcher); void setBtMessageDispatcher
(const WeakHandle<BtMessageDispatcher>& dispatcher);
void setBtMessageFactory(const WeakHandle<BtMessageFactory>& factory); void setBtMessageFactory(const WeakHandle<BtMessageFactory>& factory);
}; };

1
src/PeerInteractionCommand.cc
View File

@ -168,7 +168,6 @@ PeerInteractionCommand::PeerInteractionCommand
SharedHandle<DefaultBtRequestFactory> reqFactory SharedHandle<DefaultBtRequestFactory> reqFactory
(new DefaultBtRequestFactory()); (new DefaultBtRequestFactory());
reqFactory->setCuid(cuid);
reqFactory->setPeer(getPeer()); reqFactory->setPeer(getPeer());
reqFactory->setPieceStorage(pieceStorage); reqFactory->setPieceStorage(pieceStorage);
reqFactory->setBtMessageDispatcher(dispatcher); reqFactory->setBtMessageDispatcher(dispatcher);