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

2008-07-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Code cleanup.
	* src/PeerAbstractCommand.cc
	* src/PeerAbstractCommand.h
pull/1/head
Tatsuhiro Tsujikawa 2008-07-01 13:40:48 +00:00
parent 888d6ff4dd
commit dbb8cbc88d
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-07-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Code cleanup.
* src/PeerAbstractCommand.cc
* src/PeerAbstractCommand.h
2008-07-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2008-07-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Removed TransferEncoding. Removed TransferEncoding.

48
src/PeerAbstractCommand.cc
View File

@ -48,10 +48,16 @@ namespace aria2 {
PeerAbstractCommand::PeerAbstractCommand(int32_t cuid, PeerAbstractCommand::PeerAbstractCommand(int32_t cuid,
const PeerHandle& peer, const PeerHandle& peer,
DownloadEngine* e, DownloadEngine* e,
const SocketHandle& s) const SocketHandle& s):
:Command(cuid), e(e), socket(s), peer(peer), Command(cuid),
checkSocketIsReadable(false), checkSocketIsWritable(false), e(e),
uploadLimitCheck(false), uploadLimit(0), noCheck(false) socket(s),
peer(peer),
checkSocketIsReadable(false),
checkSocketIsWritable(false),
uploadLimitCheck(false),
uploadLimit(0),
noCheck(false)
{ {
if(!socket.isNull() && socket->isOpen()) { if(!socket.isNull() && socket->isOpen()) {
setReadCheckSocket(socket); setReadCheckSocket(socket);
@ -59,22 +65,20 @@ PeerAbstractCommand::PeerAbstractCommand(int32_t cuid,
timeout = e->option->getAsInt(PREF_BT_TIMEOUT); timeout = e->option->getAsInt(PREF_BT_TIMEOUT);
} }
PeerAbstractCommand::~PeerAbstractCommand() { PeerAbstractCommand::~PeerAbstractCommand()
{
disableReadCheckSocket(); disableReadCheckSocket();
disableWriteCheckSocket(); disableWriteCheckSocket();
} }
bool PeerAbstractCommand::execute() { bool PeerAbstractCommand::execute()
{
if(exitBeforeExecute()) { if(exitBeforeExecute()) {
onAbort(); onAbort();
return true; return true;
} }
try { try {
if(noCheck || if(noCheck ||
/*
uploadLimitCheck && (uploadLimit == 0 ||
e->getUploadSpeed() <= uploadLimit*1024) ||
*/
(checkSocketIsReadable && _readEvent) || (checkSocketIsReadable && _readEvent) ||
(checkSocketIsWritable && _writeEvent) || (checkSocketIsWritable && _writeEvent) ||
_errorEvent) { _errorEvent) {
@ -99,11 +103,13 @@ bool PeerAbstractCommand::execute() {
} }
// TODO this method removed when PeerBalancerCommand is implemented // TODO this method removed when PeerBalancerCommand is implemented
bool PeerAbstractCommand::prepareForNextPeer(time_t wait) { bool PeerAbstractCommand::prepareForNextPeer(time_t wait)
{
return true; return true;
} }
void PeerAbstractCommand::disableReadCheckSocket() { void PeerAbstractCommand::disableReadCheckSocket()
{
if(checkSocketIsReadable) { if(checkSocketIsReadable) {
e->deleteSocketForReadCheck(readCheckTarget, this); e->deleteSocketForReadCheck(readCheckTarget, this);
checkSocketIsReadable = false; checkSocketIsReadable = false;
@ -111,7 +117,8 @@ void PeerAbstractCommand::disableReadCheckSocket() {
} }
} }
void PeerAbstractCommand::setReadCheckSocket(const SocketHandle& socket) { void PeerAbstractCommand::setReadCheckSocket(const SocketHandle& socket)
{
if(!socket->isOpen()) { if(!socket->isOpen()) {
disableReadCheckSocket(); disableReadCheckSocket();
} else { } else {
@ -129,7 +136,8 @@ void PeerAbstractCommand::setReadCheckSocket(const SocketHandle& socket) {
} }
} }
void PeerAbstractCommand::disableWriteCheckSocket() { void PeerAbstractCommand::disableWriteCheckSocket()
{
if(checkSocketIsWritable) { if(checkSocketIsWritable) {
e->deleteSocketForWriteCheck(writeCheckTarget, this); e->deleteSocketForWriteCheck(writeCheckTarget, this);
checkSocketIsWritable = false; checkSocketIsWritable = false;
@ -137,7 +145,8 @@ void PeerAbstractCommand::disableWriteCheckSocket() {
} }
} }
void PeerAbstractCommand::setWriteCheckSocket(const SocketHandle& socket) { void PeerAbstractCommand::setWriteCheckSocket(const SocketHandle& socket)
{
if(!socket->isOpen()) { if(!socket->isOpen()) {
disableWriteCheckSocket(); disableWriteCheckSocket();
} else { } else {
@ -155,15 +164,18 @@ void PeerAbstractCommand::setWriteCheckSocket(const SocketHandle& socket) {
} }
} }
void PeerAbstractCommand::setUploadLimit(unsigned int uploadLimit) { void PeerAbstractCommand::setUploadLimit(unsigned int uploadLimit)
{
this->uploadLimit = uploadLimit; this->uploadLimit = uploadLimit;
} }
void PeerAbstractCommand::setUploadLimitCheck(bool check) { void PeerAbstractCommand::setUploadLimitCheck(bool check)
{
this->uploadLimitCheck = check; this->uploadLimitCheck = check;
} }
void PeerAbstractCommand::setNoCheck(bool check) { void PeerAbstractCommand::setNoCheck(bool check)
{
this->noCheck = check; this->noCheck = check;
} }

3
src/PeerAbstractCommand.h
View File

@ -83,7 +83,8 @@ public:
PeerAbstractCommand(int32_t cuid, PeerAbstractCommand(int32_t cuid,
const SharedHandle<Peer>& peer, const SharedHandle<Peer>& peer,
DownloadEngine* e, DownloadEngine* e,
const SharedHandle<SocketCore>& s = SharedHandle<SocketCore>()); const SharedHandle<SocketCore>& s =
SharedHandle<SocketCore>());
virtual ~PeerAbstractCommand(); virtual ~PeerAbstractCommand();