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

clang-format

pull/629/head
Tatsuhiro Tsujikawa 2016-04-15 22:22:08 +09:00
parent d3b60d17f9
commit a474183bd3
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BitfieldMan.h
View File

@ -166,15 +166,13 @@ public:
// to min(|endIndex|, blocks_) // to min(|endIndex|, blocks_)
// //
// affected by filter // affected by filter
bool getInorderMissingUnusedIndex bool getInorderMissingUnusedIndex(size_t& index, size_t startIndex,
(size_t& index, size_t endIndex, int32_t minSplitSize,
size_t startIndex, size_t endIndex, const unsigned char* ignoreBitfield,
int32_t minSplitSize, size_t ignoreBitfieldLength) const;
const unsigned char* ignoreBitfield,
size_t ignoreBitfieldLength) const;
// affected by filter // affected by filter
bool getAllMissingIndexes(unsigned char *misbitfield, size_t mislen) const; bool getAllMissingIndexes(unsigned char* misbitfield, size_t mislen) const;
// affected by filter // affected by filter
bool getAllMissingIndexes(unsigned char* misbitfield, size_t mislen, bool getAllMissingIndexes(unsigned char* misbitfield, size_t mislen,

26
src/RandomStreamPieceSelector.cc
View File

@ -38,25 +38,23 @@
namespace aria2 { namespace aria2 {
RandomStreamPieceSelector::RandomStreamPieceSelector RandomStreamPieceSelector::RandomStreamPieceSelector(BitfieldMan* bitfieldMan)
(BitfieldMan* bitfieldMan) : bitfieldMan_(bitfieldMan)
: bitfieldMan_(bitfieldMan) {
{} }
RandomStreamPieceSelector::~RandomStreamPieceSelector() {} RandomStreamPieceSelector::~RandomStreamPieceSelector() {}
bool RandomStreamPieceSelector::select bool RandomStreamPieceSelector::select(size_t& index, size_t minSplitSize,
(size_t& index, const unsigned char* ignoreBitfield,
size_t minSplitSize, size_t length)
const unsigned char* ignoreBitfield,
size_t length)
{ {
size_t start = SimpleRandomizer::getInstance()->getRandomNumber size_t start = SimpleRandomizer::getInstance()->getRandomNumber(
(bitfieldMan_->countBlock()); bitfieldMan_->countBlock());
auto rv = bitfieldMan_->getInorderMissingUnusedIndex auto rv = bitfieldMan_->getInorderMissingUnusedIndex(
(index, start, bitfieldMan_->countBlock(), minSplitSize, ignoreBitfield, index, start, bitfieldMan_->countBlock(), minSplitSize, ignoreBitfield,
length); length);
if (rv) { if (rv) {
return true; return true;
} }

11
src/RandomStreamPieceSelector.h
View File

@ -41,18 +41,17 @@ namespace aria2 {
class BitfieldMan; class BitfieldMan;
class RandomStreamPieceSelector:public StreamPieceSelector { class RandomStreamPieceSelector : public StreamPieceSelector {
public: public:
RandomStreamPieceSelector(BitfieldMan* bitfieldMan); RandomStreamPieceSelector(BitfieldMan* bitfieldMan);
virtual ~RandomStreamPieceSelector(); virtual ~RandomStreamPieceSelector();
virtual bool select virtual bool select(size_t& index, size_t minSplitSize,
(size_t& index, const unsigned char* ignoreBitfield,
size_t minSplitSize, size_t length) CXX11_OVERRIDE;
const unsigned char* ignoreBitfield,
size_t length) CXX11_OVERRIDE;
virtual void onBitfieldInit() CXX11_OVERRIDE; virtual void onBitfieldInit() CXX11_OVERRIDE;
private: private:
BitfieldMan* bitfieldMan_; BitfieldMan* bitfieldMan_;
}; };