mirror of
https://github.com/aria2/aria2.git
synced 2025-04-06 14:07:37 +03:00
d64c8e75f6
Implemented download speed based URI selection algorithm. Introduced new option --uri-selector. If --uri-selector=feedback is given, aria2 uses download speed observed in the previous downloads and chooses fastest server in the URI list. Currently at most 10 URIs are considered to introduce randomeness for finding better servers. The speed is average download speed in the downloads. On the other hand, if --uri-selector=inorder is given, which is default, URI is tried in order in URI list. The usage text for the new option has not been written yet. * src/AbstractCommand.cc * src/DownloadCommand.cc * src/DownloadEngine.cc * src/DownloadEngineFactory.cc * src/InOrderURISelector.cc * src/InOrderURISelector.h * src/OptionHandlerFactory.cc * src/PeerStat.h * src/RequestGroup.cc * src/RequestGroup.h * src/RequestGroupMan.cc * src/RequestGroupMan.h * src/SegmentMan.cc * src/SegmentMan.h * src/ServerStat.cc * src/ServerStat.h * src/ServerStatMan.cc * src/ServerStatMan.h * src/ServerStatURISelector.cc * src/ServerStatURISelector.h * src/URISelector.h * src/option_processing.cc * src/prefs.cc * src/prefs.h * test/InOrderURISelectorTest.cc * test/RequestGroupManTest.cc * test/ServerStatManTest.cc * test/ServerStatURISelectorTest.cc
97 lines
2.5 KiB
C++
97 lines
2.5 KiB
C++
#include "ServerStatURISelector.h"
|
|
#include "Exception.h"
|
|
#include "Util.h"
|
|
#include "array_fun.h"
|
|
#include "ServerStatMan.h"
|
|
#include "ServerStat.h"
|
|
#include <iostream>
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
namespace aria2 {
|
|
|
|
class ServerStatURISelectorTest:public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(ServerStatURISelectorTest);
|
|
CPPUNIT_TEST(testSelect_withoutServerStat);
|
|
CPPUNIT_TEST(testSelect);
|
|
CPPUNIT_TEST(testSelect_skipErrorHost);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
|
|
std::deque<std::string> uris;
|
|
|
|
SharedHandle<ServerStatMan> ssm;
|
|
|
|
SharedHandle<ServerStatURISelector> sel;
|
|
|
|
public:
|
|
void setUp()
|
|
{
|
|
static const char* urisSrc[] = {
|
|
"http://alpha/file",
|
|
"ftp://alpha/file",
|
|
"http://bravo/file"
|
|
};
|
|
uris.assign(&urisSrc[0], &urisSrc[arrayLength(urisSrc)]);
|
|
|
|
ssm.reset(new ServerStatMan());
|
|
sel.reset(new ServerStatURISelector(ssm));
|
|
}
|
|
|
|
void tearDown() {}
|
|
|
|
void testSelect_withoutServerStat();
|
|
|
|
void testSelect();
|
|
|
|
void testSelect_skipErrorHost();
|
|
};
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION(ServerStatURISelectorTest);
|
|
|
|
void ServerStatURISelectorTest::testSelect_withoutServerStat()
|
|
{
|
|
// Without ServerStat, selector returns first URI
|
|
std::string uri = sel->select(uris);
|
|
CPPUNIT_ASSERT_EQUAL(std::string("http://alpha/file"), uri);
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size());
|
|
}
|
|
|
|
void ServerStatURISelectorTest::testSelect()
|
|
{
|
|
SharedHandle<ServerStat> bravo(new ServerStat("bravo", "http"));
|
|
bravo->updateDownloadSpeed(100000);
|
|
SharedHandle<ServerStat> alphaFTP(new ServerStat("alpha", "ftp"));
|
|
alphaFTP->updateDownloadSpeed(80000);
|
|
SharedHandle<ServerStat> alphaHTTP(new ServerStat("alpha", "http"));
|
|
alphaHTTP->updateDownloadSpeed(180000);
|
|
alphaHTTP->setError();
|
|
|
|
ssm->add(bravo);
|
|
ssm->add(alphaFTP);
|
|
ssm->add(alphaHTTP);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("http://bravo/file"), sel->select(uris));
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("ftp://alpha/file"), sel->select(uris));
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size());
|
|
}
|
|
|
|
void ServerStatURISelectorTest::testSelect_skipErrorHost()
|
|
{
|
|
SharedHandle<ServerStat> alphaHTTP(new ServerStat("alpha", "http"));
|
|
alphaHTTP->setError();
|
|
SharedHandle<ServerStat> alphaFTP(new ServerStat("alpha", "ftp"));
|
|
alphaFTP->setError();
|
|
|
|
ssm->add(alphaHTTP);
|
|
ssm->add(alphaFTP);
|
|
|
|
// See error URIs are removed from URI List.
|
|
CPPUNIT_ASSERT_EQUAL(std::string("http://bravo/file"), sel->select(uris));
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, uris.size());
|
|
}
|
|
|
|
} // namespace aria2
|