Download-Tools/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-02-26 08:22:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use SocketCore::isReadable() repeatedly.

Browse Source 
We can know whether data is available by inspecting 2nd argument of
SocketCore::readData() because we use non-blocking I/O.
This commit is contained in:
Tatsuhiro Tsujikawa 2011-01-16 21:04:31 +09:00
parent 63fe7874da
commit 97d0b71dd4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/FtpConnection.cc
View File

@ -363,14 +363,15 @@ bool FtpConnection::bulkReceiveResponse
(std::pair<unsigned int, std::string>& response) (std::pair<unsigned int, std::string>& response)
{ {
char buf[1024]; char buf[1024];
while(socket_->isReadable(0)) { while(1) {
size_t size = sizeof(buf); size_t size = sizeof(buf);
socket_->readData(buf, size); socket_->readData(buf, size);
if(size == 0) { if(size == 0) {
if(socket_->wantRead() || socket_->wantWrite()) { if(socket_->wantRead() || socket_->wantWrite()) {
return false; break;
} else {
throw DL_RETRY_EX(EX_GOT_EOF);
} }
throw DL_RETRY_EX(EX_GOT_EOF);
} }
if(strbuf_.size()+size > MAX_RECV_BUFFER) { if(strbuf_.size()+size > MAX_RECV_BUFFER) {
throw DL_RETRY_EX throw DL_RETRY_EX

1
test/FtpConnectionTest.cc
View File

@ -63,7 +63,6 @@ public:
clientSocket_->establishConnection("localhost", listenPort_); clientSocket_->establishConnection("localhost", listenPort_);
while(!clientSocket_->isWritable(0)); while(!clientSocket_->isWritable(0));
clientSocket_->setBlockingMode();
serverSocket_.reset(listenSocket->acceptConnection()); serverSocket_.reset(listenSocket->acceptConnection());
ftp_.reset(new FtpConnection(1, clientSocket_, req_, ftp_.reset(new FtpConnection(1, clientSocket_, req_,