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

2009-05-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Removed unused uploadLimitCheck and uploadLimit from
	PeerAbstractCommand. Removed unused maxDownloadLimit from
	PeerInteractionCommand.
	* src/PeerAbstractCommand.cc
	* src/PeerAbstractCommand.h
	* src/PeerInteractionCommand.cc
	* src/PeerInteractionCommand.h
pull/1/head
Tatsuhiro Tsujikawa 2009-05-07 08:38:31 +00:00
parent 030bc08287
commit 22ab845df5
5 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2009-05-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed unused uploadLimitCheck and uploadLimit from
PeerAbstractCommand. Removed unused maxDownloadLimit from
PeerInteractionCommand.
* src/PeerAbstractCommand.cc
* src/PeerAbstractCommand.h
* src/PeerInteractionCommand.cc
* src/PeerInteractionCommand.h
2009-05-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-05-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed broken file renaming feature since r1202. Fixed broken file renaming feature since r1202.

12
src/PeerAbstractCommand.cc
View File

@ -56,8 +56,6 @@ PeerAbstractCommand::PeerAbstractCommand(int32_t cuid,
peer(peer), peer(peer),
checkSocketIsReadable(false), checkSocketIsReadable(false),
checkSocketIsWritable(false), checkSocketIsWritable(false),
uploadLimitCheck(false),
uploadLimit(0),
noCheck(false) noCheck(false)
{ {
if(!socket.isNull() && socket->isOpen()) { if(!socket.isNull() && socket->isOpen()) {
@ -172,16 +170,6 @@ void PeerAbstractCommand::setWriteCheckSocket(const SocketHandle& socket)
} }
} }
void PeerAbstractCommand::setUploadLimit(unsigned int uploadLimit)
{
this->uploadLimit = uploadLimit;
}
void PeerAbstractCommand::setUploadLimitCheck(bool check)
{
this->uploadLimitCheck = check;
}
void PeerAbstractCommand::setNoCheck(bool check) void PeerAbstractCommand::setNoCheck(bool check)
{ {
this->noCheck = check; this->noCheck = check;

4
src/PeerAbstractCommand.h
View File

@ -67,8 +67,6 @@ protected:
void setWriteCheckSocket(const SharedHandle<SocketCore>& socket); void setWriteCheckSocket(const SharedHandle<SocketCore>& socket);
void disableReadCheckSocket(); void disableReadCheckSocket();
void disableWriteCheckSocket(); void disableWriteCheckSocket();
void setUploadLimit(unsigned int uploadLimit);
void setUploadLimitCheck(bool check);
void setNoCheck(bool check); void setNoCheck(bool check);
void updateKeepAlive(); void updateKeepAlive();
private: private:
@ -76,8 +74,6 @@ private:
bool checkSocketIsWritable; bool checkSocketIsWritable;
SharedHandle<SocketCore> readCheckTarget; SharedHandle<SocketCore> readCheckTarget;
SharedHandle<SocketCore> writeCheckTarget; SharedHandle<SocketCore> writeCheckTarget;
bool uploadLimitCheck;
unsigned int uploadLimit;
bool noCheck; bool noCheck;
public: public:
PeerAbstractCommand(int32_t cuid, PeerAbstractCommand(int32_t cuid,

7
src/PeerInteractionCommand.cc
View File

@ -89,8 +89,7 @@ PeerInteractionCommand::PeerInteractionCommand
_btContext(btContext), _btContext(btContext),
_btRuntime(btRuntime), _btRuntime(btRuntime),
_pieceStorage(pieceStorage), _pieceStorage(pieceStorage),
sequence(sequence), sequence(sequence)
maxDownloadSpeedLimit(0)
{ {
// TODO move following bunch of processing to separate method, like init() // TODO move following bunch of processing to separate method, like init()
if(sequence == INITIATOR_SEND_HANDSHAKE) { if(sequence == INITIATOR_SEND_HANDSHAKE) {
@ -190,13 +189,10 @@ PeerInteractionCommand::PeerInteractionCommand
factory->setBtRequestFactory(reqFactory); factory->setBtRequestFactory(reqFactory);
factory->setPeerConnection(peerConnection); factory->setPeerConnection(peerConnection);
setUploadLimit(e->option->getAsInt(PREF_MAX_UPLOAD_LIMIT));
peer->allocateSessionResource(_btContext->getPieceLength(), peer->allocateSessionResource(_btContext->getPieceLength(),
_btContext->getTotalLength()); _btContext->getTotalLength());
peer->setBtMessageDispatcher(dispatcher); peer->setBtMessageDispatcher(dispatcher);
maxDownloadSpeedLimit = e->option->getAsInt(PREF_MAX_DOWNLOAD_LIMIT);
_btRuntime->increaseConnections(); _btRuntime->increaseConnections();
_requestGroup->increaseNumCommand(); _requestGroup->increaseNumCommand();
} }
@ -215,7 +211,6 @@ PeerInteractionCommand::~PeerInteractionCommand() {
} }
bool PeerInteractionCommand::executeInternal() { bool PeerInteractionCommand::executeInternal() {
setUploadLimitCheck(false);
setNoCheck(false); setNoCheck(false);
switch(sequence) { switch(sequence) {
case INITIATOR_SEND_HANDSHAKE: case INITIATOR_SEND_HANDSHAKE:

1
src/PeerInteractionCommand.h
View File

@ -67,7 +67,6 @@ private:
Seq sequence; Seq sequence;
SharedHandle<BtInteractive> btInteractive; SharedHandle<BtInteractive> btInteractive;
unsigned int maxDownloadSpeedLimit;
protected: protected:
virtual bool executeInternal(); virtual bool executeInternal();
virtual bool prepareForNextPeer(time_t wait); virtual bool prepareForNextPeer(time_t wait);