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

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

Allocate buffer in ctor of DownloadCommand.
	* src/DownloadCommand.cc
	* src/DownloadCommand.h
pull/1/head
Tatsuhiro Tsujikawa 2009-07-05 03:24:31 +00:00
parent 6bd4447d23
commit 9263894689
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-07-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Allocate buffer in ctor of DownloadCommand.
* src/DownloadCommand.cc
* src/DownloadCommand.h
2009-07-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed DiskAdaptor::onDownloadComplete()

11
src/DownloadCommand.cc
View File

@ -70,7 +70,8 @@ DownloadCommand::DownloadCommand(int cuid,
RequestGroup* requestGroup,
DownloadEngine* e,
const SocketHandle& s):
AbstractCommand(cuid, req, fileEntry, requestGroup, e, s)
AbstractCommand(cuid, req, fileEntry, requestGroup, e, s),
_buf(new unsigned char[BUFSIZE])
#ifdef ENABLE_MESSAGE_DIGEST
, _pieceHashValidationEnabled(false)
#endif // ENABLE_MESSAGE_DIGEST
@ -110,8 +111,6 @@ bool DownloadCommand::executeInternal() {
setReadCheckSocket(socket);
SegmentHandle segment = _segments.front();
size_t BUFSIZE = 16*1024;
unsigned char buf[BUFSIZE];
size_t bufSize;
if(segment->getLength() > 0) {
if(segment->getPosition()+segment->getLength() <= static_cast<uint64_t>(_fileEntry->getLastOffset())) {
@ -123,7 +122,7 @@ bool DownloadCommand::executeInternal() {
} else {
bufSize = BUFSIZE;
}
socket->readData(buf, bufSize);
socket->readData(_buf, bufSize);
const SharedHandle<DiskAdaptor>& diskAdaptor =
_requestGroup->getPieceStorage()->getDiskAdaptor();
@ -133,10 +132,10 @@ bool DownloadCommand::executeInternal() {
std::string decoded;
if(_transferEncodingDecoder.isNull()) {
bufFinal = buf;
bufFinal = _buf;
bufSizeFinal = bufSize;
} else {
decoded = _transferEncodingDecoder->decode(buf, bufSize);
decoded = _transferEncodingDecoder->decode(_buf, bufSize);
bufFinal = reinterpret_cast<const unsigned char*>(decoded.c_str());
bufSizeFinal = decoded.size();

4
src/DownloadCommand.h
View File

@ -47,6 +47,10 @@ class MessageDigestContext;
class DownloadCommand : public AbstractCommand {
private:
static const size_t BUFSIZE = 16*1024;
unsigned char* _buf;
time_t startupIdleTime;
unsigned int lowestDownloadSpeedLimit;
SharedHandle<PeerStat> peerStat;