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

Replaced InOrder with Inorder.

pull/1/head
Tatsuhiro Tsujikawa 2011-06-11 21:49:09 +09:00
parent 8566fde624
commit 65ec9e98df
11 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DefaultPieceStorage.cc
View File

@ -57,7 +57,7 @@
#include "fmt.h" #include "fmt.h"
#include "RarestPieceSelector.h" #include "RarestPieceSelector.h"
#include "DefaultStreamPieceSelector.h" #include "DefaultStreamPieceSelector.h"
#include "InOrderStreamPieceSelector.h" #include "InorderStreamPieceSelector.h"
#include "array_fun.h" #include "array_fun.h"
#include "PieceStatMan.h" #include "PieceStatMan.h"
#include "wallclock.h" #include "wallclock.h"

8
src/InOrderURISelector.cc → src/InorderURISelector.cc
View File

@ -32,17 +32,17 @@
* files in the program, then also delete it here. * files in the program, then also delete it here.
*/ */
/* copyright --> */ /* copyright --> */
#include "InOrderURISelector.h" #include "InorderURISelector.h"
#include "A2STR.h" #include "A2STR.h"
#include "FileEntry.h" #include "FileEntry.h"
namespace aria2 { namespace aria2 {
InOrderURISelector::InOrderURISelector() {} InorderURISelector::InorderURISelector() {}
InOrderURISelector::~InOrderURISelector() {} InorderURISelector::~InorderURISelector() {}
std::string InOrderURISelector::select std::string InorderURISelector::select
(FileEntry* fileEntry, (FileEntry* fileEntry,
const std::vector<std::pair<size_t, std::string> >& usedHosts) const std::vector<std::pair<size_t, std::string> >& usedHosts)
{ {

12
src/InOrderURISelector.h → src/InorderURISelector.h
View File

@ -32,17 +32,17 @@
* files in the program, then also delete it here. * files in the program, then also delete it here.
*/ */
/* copyright --> */ /* copyright --> */
#ifndef D_IN_ORDER_URI_SELECTOR_H #ifndef D_INORDER_URI_SELECTOR_H
#define D_IN_ORDER_URI_SELECTOR_H #define D_INORDER_URI_SELECTOR_H
#include "URISelector.h" #include "URISelector.h"
namespace aria2 { namespace aria2 {
class InOrderURISelector:public URISelector { class InorderURISelector:public URISelector {
public: public:
InOrderURISelector(); InorderURISelector();
virtual ~InOrderURISelector(); virtual ~InorderURISelector();
virtual std::string select virtual std::string select
(FileEntry* fileEntry, (FileEntry* fileEntry,
@ -50,4 +50,4 @@ public:
}; };
} // namespace aria2 } // namespace aria2
#endif // D_IN_ORDER_URI_SELECTOR_H #endif // D_INORDER_URI_SELECTOR_H

2
src/Makefile.am
View File

@ -177,7 +177,7 @@ SRCS = Socket.h\
ServerStatMan.cc ServerStatMan.h\ ServerStatMan.cc ServerStatMan.h\
URISelector.h\ URISelector.h\
AdaptiveURISelector.cc AdaptiveURISelector.h\ AdaptiveURISelector.cc AdaptiveURISelector.h\
InOrderURISelector.cc InOrderURISelector.h\ InorderURISelector.cc InorderURISelector.h\
FeedbackURISelector.cc FeedbackURISelector.h\ FeedbackURISelector.cc FeedbackURISelector.h\
NsCookieParser.cc NsCookieParser.h\ NsCookieParser.cc NsCookieParser.h\
CookieStorage.cc CookieStorage.h\ CookieStorage.cc CookieStorage.h\

4
src/RequestGroup.cc
View File

@ -71,7 +71,7 @@
#include "fmt.h" #include "fmt.h"
#include "A2STR.h" #include "A2STR.h"
#include "URISelector.h" #include "URISelector.h"
#include "InOrderURISelector.h" #include "InorderURISelector.h"
#include "PieceSelector.h" #include "PieceSelector.h"
#include "a2functional.h" #include "a2functional.h"
#include "SocketCore.h" #include "SocketCore.h"
@ -136,7 +136,7 @@ RequestGroup::RequestGroup(const SharedHandle<Option>& option)
forceHaltRequested_(false), forceHaltRequested_(false),
haltReason_(RequestGroup::NONE), haltReason_(RequestGroup::NONE),
pauseRequested_(false), pauseRequested_(false),
uriSelector_(new InOrderURISelector()), uriSelector_(new InorderURISelector()),
lastModifiedTime_(Time::null()), lastModifiedTime_(Time::null()),
fileNotFoundCount_(0), fileNotFoundCount_(0),
timeout_(option->getAsInt(PREF_TIMEOUT)), timeout_(option->getAsInt(PREF_TIMEOUT)),

4
src/RequestGroupMan.cc
View File

@ -59,7 +59,7 @@
#include "PeerStat.h" #include "PeerStat.h"
#include "SegmentMan.h" #include "SegmentMan.h"
#include "FeedbackURISelector.h" #include "FeedbackURISelector.h"
#include "InOrderURISelector.h" #include "InorderURISelector.h"
#include "AdaptiveURISelector.h" #include "AdaptiveURISelector.h"
#include "Option.h" #include "Option.h"
#include "prefs.h" #include "prefs.h"
@ -468,7 +468,7 @@ void RequestGroupMan::configureRequestGroup
SharedHandle<URISelector> sel(new FeedbackURISelector(serverStatMan_)); SharedHandle<URISelector> sel(new FeedbackURISelector(serverStatMan_));
requestGroup->setURISelector(sel); requestGroup->setURISelector(sel);
} else if(uriSelectorValue == V_INORDER) { } else if(uriSelectorValue == V_INORDER) {
SharedHandle<URISelector> sel(new InOrderURISelector()); SharedHandle<URISelector> sel(new InorderURISelector());
requestGroup->setURISelector(sel); requestGroup->setURISelector(sel);
} else if(uriSelectorValue == V_ADAPTIVE) { } else if(uriSelectorValue == V_ADAPTIVE) {
SharedHandle<URISelector> sel(new AdaptiveURISelector(serverStatMan_, SharedHandle<URISelector> sel(new AdaptiveURISelector(serverStatMan_,

4
test/DefaultPieceStorageTest.cc
View File

@ -9,7 +9,7 @@
#include "Option.h" #include "Option.h"
#include "FileEntry.h" #include "FileEntry.h"
#include "RarestPieceSelector.h" #include "RarestPieceSelector.h"
#include "InOrderPieceSelector.h" #include "InorderPieceSelector.h"
#include "DownloadContext.h" #include "DownloadContext.h"
#include "bittorrent_helper.h" #include "bittorrent_helper.h"
#include "DiskAdaptor.h" #include "DiskAdaptor.h"
@ -53,7 +53,7 @@ public:
peer.reset(new Peer("192.168.0.1", 6889)); peer.reset(new Peer("192.168.0.1", 6889));
peer->allocateSessionResource(dctx_->getPieceLength(), peer->allocateSessionResource(dctx_->getPieceLength(),
dctx_->getTotalLength()); dctx_->getTotalLength());
pieceSelector_.reset(new InOrderPieceSelector()); pieceSelector_.reset(new InorderPieceSelector());
} }
void testGetTotalLength(); void testGetTotalLength();

12
test/FileEntryTest.cc
View File

@ -2,7 +2,7 @@
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#include "InOrderURISelector.h" #include "InorderURISelector.h"
#include "util.h" #include "util.h"
namespace aria2 { namespace aria2 {
@ -91,7 +91,7 @@ void FileEntryTest::testExtractURIResult()
void FileEntryTest::testGetRequest() void FileEntryTest::testGetRequest()
{ {
SharedHandle<FileEntry> fileEntry = createFileEntry(); SharedHandle<FileEntry> fileEntry = createFileEntry();
SharedHandle<InOrderURISelector> selector(new InOrderURISelector()); SharedHandle<InorderURISelector> selector(new InorderURISelector());
std::vector<std::pair<size_t, std::string> > usedHosts; std::vector<std::pair<size_t, std::string> > usedHosts;
SharedHandle<Request> req = SharedHandle<Request> req =
fileEntry->getRequest(selector, true, usedHosts); fileEntry->getRequest(selector, true, usedHosts);
@ -135,7 +135,7 @@ void FileEntryTest::testGetRequest_withoutUriReuse()
std::vector<std::pair<size_t, std::string> > usedHosts; std::vector<std::pair<size_t, std::string> > usedHosts;
SharedHandle<FileEntry> fileEntry = createFileEntry(); SharedHandle<FileEntry> fileEntry = createFileEntry();
fileEntry->setMaxConnectionPerServer(2); fileEntry->setMaxConnectionPerServer(2);
SharedHandle<InOrderURISelector> selector(new InOrderURISelector()); SharedHandle<InorderURISelector> selector(new InorderURISelector());
SharedHandle<Request> req = fileEntry->getRequest(selector, false, usedHosts); SharedHandle<Request> req = fileEntry->getRequest(selector, false, usedHosts);
CPPUNIT_ASSERT_EQUAL(std::string("localhost"), req->getHost()); CPPUNIT_ASSERT_EQUAL(std::string("localhost"), req->getHost());
CPPUNIT_ASSERT_EQUAL(std::string("http"), req->getProtocol()); CPPUNIT_ASSERT_EQUAL(std::string("http"), req->getProtocol());
@ -160,7 +160,7 @@ void FileEntryTest::testGetRequest_withUniqueProtocol()
std::vector<std::pair<size_t, std::string> > usedHosts; std::vector<std::pair<size_t, std::string> > usedHosts;
SharedHandle<FileEntry> fileEntry = createFileEntry(); SharedHandle<FileEntry> fileEntry = createFileEntry();
fileEntry->setUniqueProtocol(true); fileEntry->setUniqueProtocol(true);
SharedHandle<InOrderURISelector> selector(new InOrderURISelector()); SharedHandle<InorderURISelector> selector(new InorderURISelector());
SharedHandle<Request> req = SharedHandle<Request> req =
fileEntry->getRequest(selector, true, usedHosts); fileEntry->getRequest(selector, true, usedHosts);
CPPUNIT_ASSERT_EQUAL(std::string("localhost"), req->getHost()); CPPUNIT_ASSERT_EQUAL(std::string("localhost"), req->getHost());
@ -184,7 +184,7 @@ void FileEntryTest::testGetRequest_withUniqueProtocol()
void FileEntryTest::testReuseUri() void FileEntryTest::testReuseUri()
{ {
SharedHandle<InOrderURISelector> selector(new InOrderURISelector()); SharedHandle<InorderURISelector> selector(new InorderURISelector());
SharedHandle<FileEntry> fileEntry = createFileEntry(); SharedHandle<FileEntry> fileEntry = createFileEntry();
fileEntry->setMaxConnectionPerServer(3); fileEntry->setMaxConnectionPerServer(3);
size_t numUris = fileEntry->getRemainingUris().size(); size_t numUris = fileEntry->getRemainingUris().size();
@ -244,7 +244,7 @@ void FileEntryTest::testInsertUri()
void FileEntryTest::testRemoveUri() void FileEntryTest::testRemoveUri()
{ {
std::vector<std::pair<size_t, std::string> > usedHosts; std::vector<std::pair<size_t, std::string> > usedHosts;
SharedHandle<InOrderURISelector> selector(new InOrderURISelector()); SharedHandle<InorderURISelector> selector(new InorderURISelector());
FileEntry file; FileEntry file;
file.addUri("http://example.org/"); file.addUri("http://example.org/");
CPPUNIT_ASSERT(file.removeUri("http://example.org/")); CPPUNIT_ASSERT(file.removeUri("http://example.org/"));

2
test/InOrderPieceSelector.h → test/InorderPieceSelector.h
View File

@ -6,7 +6,7 @@
namespace aria2 { namespace aria2 {
class InOrderPieceSelector:public PieceSelector { class InorderPieceSelector:public PieceSelector {
public: public:
virtual bool select virtual bool select
(size_t& index, const unsigned char* bitfield, size_t nbits) const (size_t& index, const unsigned char* bitfield, size_t nbits) const

14
test/InOrderURISelectorTest.cc → test/InorderURISelectorTest.cc
View File

@ -1,4 +1,4 @@
#include "InOrderURISelector.h" #include "InorderURISelector.h"
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
@ -9,15 +9,15 @@
namespace aria2 { namespace aria2 {
class InOrderURISelectorTest:public CppUnit::TestFixture { class InorderURISelectorTest:public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(InOrderURISelectorTest); CPPUNIT_TEST_SUITE(InorderURISelectorTest);
CPPUNIT_TEST(testSelect); CPPUNIT_TEST(testSelect);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
FileEntry fileEntry_; FileEntry fileEntry_;
SharedHandle<InOrderURISelector> sel; SharedHandle<InorderURISelector> sel;
public: public:
void setUp() void setUp()
@ -32,7 +32,7 @@ public:
fileEntry_.setUris(uris); fileEntry_.setUris(uris);
sel.reset(new InOrderURISelector()); sel.reset(new InorderURISelector());
} }
void tearDown() {} void tearDown() {}
@ -41,9 +41,9 @@ public:
}; };
CPPUNIT_TEST_SUITE_REGISTRATION(InOrderURISelectorTest); CPPUNIT_TEST_SUITE_REGISTRATION(InorderURISelectorTest);
void InOrderURISelectorTest::testSelect() void InorderURISelectorTest::testSelect()
{ {
std::vector<std::pair<size_t, std::string> > usedHosts; std::vector<std::pair<size_t, std::string> > usedHosts;
CPPUNIT_ASSERT_EQUAL(std::string("http://alpha/file"), CPPUNIT_ASSERT_EQUAL(std::string("http://alpha/file"),

4
test/Makefile.am
View File

@ -51,7 +51,7 @@ aria2c_SOURCES = AllTest.cc\
SignatureTest.cc\ SignatureTest.cc\
ServerStatManTest.cc\ ServerStatManTest.cc\
FeedbackURISelectorTest.cc\ FeedbackURISelectorTest.cc\
InOrderURISelectorTest.cc\ InorderURISelectorTest.cc\
ServerStatTest.cc\ ServerStatTest.cc\
NsCookieParserTest.cc\ NsCookieParserTest.cc\
DirectDiskAdaptorTest.cc\ DirectDiskAdaptorTest.cc\
@ -65,7 +65,7 @@ aria2c_SOURCES = AllTest.cc\
SequentialPickerTest.cc\ SequentialPickerTest.cc\
RarestPieceSelectorTest.cc\ RarestPieceSelectorTest.cc\
PieceStatManTest.cc\ PieceStatManTest.cc\
InOrderPieceSelector.h\ InorderPieceSelector.h\
LongestSequencePieceSelectorTest.cc\ LongestSequencePieceSelectorTest.cc\
a2algoTest.cc\ a2algoTest.cc\
bitfieldTest.cc\ bitfieldTest.cc\