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

Pack Piece message header and body into one chunk

pull/43/head
Tatsuhiro Tsujikawa 2013-01-14 18:08:52 +09:00
parent 36fcccbbdf
commit 63b6075c91
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/BtPieceMessage.cc
View File

@ -157,7 +157,7 @@ void BtPieceMessage::doReceivedAction()
size_t BtPieceMessage::MESSAGE_HEADER_LENGTH = 13; size_t BtPieceMessage::MESSAGE_HEADER_LENGTH = 13;
unsigned char* BtPieceMessage::createMessageHeader() void BtPieceMessage::createMessageHeader(unsigned char* msgHeader) const
{ {
/** /**
* len --- 9+blockLength, 4bytes * len --- 9+blockLength, 4bytes
@ -166,12 +166,10 @@ unsigned char* BtPieceMessage::createMessageHeader()
* begin --- begin, 4bytes * begin --- begin, 4bytes
* total: 13bytes * total: 13bytes
*/ */
unsigned char* msgHeader = new unsigned char[MESSAGE_HEADER_LENGTH];
bittorrent::createPeerMessageString(msgHeader, MESSAGE_HEADER_LENGTH, bittorrent::createPeerMessageString(msgHeader, MESSAGE_HEADER_LENGTH,
9+blockLength_, ID); 9+blockLength_, ID);
bittorrent::setIntParam(&msgHeader[5], index_); bittorrent::setIntParam(&msgHeader[5], index_);
bittorrent::setIntParam(&msgHeader[9], begin_); bittorrent::setIntParam(&msgHeader[9], begin_);
return msgHeader;
} }
size_t BtPieceMessage::getMessageHeaderLength() size_t BtPieceMessage::getMessageHeaderLength()
@ -181,13 +179,19 @@ size_t BtPieceMessage::getMessageHeaderLength()
namespace { namespace {
struct PieceSendUpdate : public ProgressUpdate { struct PieceSendUpdate : public ProgressUpdate {
PieceSendUpdate(const SharedHandle<Peer>& peer) PieceSendUpdate(const SharedHandle<Peer>& peer, size_t headerLength)
: peer(peer) {} : peer(peer), headerLength(headerLength) {}
virtual void update(size_t length, bool complete) virtual void update(size_t length, bool complete)
{ {
if(headerLength > 0) {
size_t m = std::min(headerLength, length);
headerLength -= m;
length -= m;
}
peer->updateUploadLength(length); peer->updateUploadLength(length);
} }
SharedHandle<Peer> peer; SharedHandle<Peer> peer;
size_t headerLength;
}; };
} // namespace } // namespace
@ -201,8 +205,6 @@ void BtPieceMessage::send()
getPeer()->getIPAddress().c_str(), getPeer()->getIPAddress().c_str(),
getPeer()->getPort(), getPeer()->getPort(),
toString().c_str())); toString().c_str()));
getPeerConnection()->pushBytes(createMessageHeader(),
getMessageHeaderLength());
int64_t pieceDataOffset = int64_t pieceDataOffset =
static_cast<int64_t>(index_)*downloadContext_->getPieceLength()+begin_; static_cast<int64_t>(index_)*downloadContext_->getPieceLength()+begin_;
pushPieceData(pieceDataOffset, blockLength_); pushPieceData(pieceDataOffset, blockLength_);
@ -211,14 +213,18 @@ void BtPieceMessage::send()
void BtPieceMessage::pushPieceData(int64_t offset, int32_t length) const void BtPieceMessage::pushPieceData(int64_t offset, int32_t length) const
{ {
assert(length <= 16*1024); assert(length <= 16*1024);
array_ptr<unsigned char> buf(new unsigned char[length]); array_ptr<unsigned char> buf
(new unsigned char[length+MESSAGE_HEADER_LENGTH]);
createMessageHeader(buf);
ssize_t r; ssize_t r;
r = getPieceStorage()->getDiskAdaptor()->readData(buf, length, offset); r = getPieceStorage()->getDiskAdaptor()->readData(buf+MESSAGE_HEADER_LENGTH,
length, offset);
if(r == length) { if(r == length) {
unsigned char* dbuf = buf; unsigned char* dbuf = buf;
buf.reset(0); buf.reset(0);
getPeerConnection()->pushBytes(dbuf, length, getPeerConnection()->pushBytes(dbuf, length+MESSAGE_HEADER_LENGTH,
new PieceSendUpdate(getPeer())); new PieceSendUpdate(getPeer(),
MESSAGE_HEADER_LENGTH));
// To avoid upload rate overflow, we update the length here at // To avoid upload rate overflow, we update the length here at
// once. // once.
downloadContext_->updateUploadLength(length); downloadContext_->updateUploadLength(length);

2
src/BtPieceMessage.h
View File

@ -96,7 +96,7 @@ public:
virtual void doReceivedAction(); virtual void doReceivedAction();
unsigned char* createMessageHeader(); void createMessageHeader(unsigned char* msgHeader) const;
size_t getMessageHeaderLength(); size_t getMessageHeaderLength();