mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-04 21:17:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Faster deletion of RequestGroup and DownloadResult lists

Browse source
This commit is contained in:
Tatsuhiro Tsujikawa 2012-12-19 23:03:48 +09:00
parent d2892cf7b4
commit 07bb779eb0
14 changed files with 813 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

38
test/RpcMethodTest.cc
View file

@ -161,11 +161,11 @@ void RpcMethodTest::testAddUri()
{
RpcResponse res = m.execute(req, e_.get());
CPPUNIT_ASSERT_EQUAL(0, res.code);
const std::deque<SharedHandle<RequestGroup> > rgs =
const RequestGroupList& rgs =
e_->getRequestGroupMan()->getReservedGroups();
CPPUNIT_ASSERT_EQUAL((size_t)1, rgs.size());
CPPUNIT_ASSERT_EQUAL(std::string("http://localhost/"),
rgs.front()->getDownloadContext()->
(*rgs.begin()).second->getDownloadContext()->
getFirstFileEntry()->getRemainingUris().front());
}
// with options
@ -179,7 +179,7 @@ void RpcMethodTest::testAddUri()
CPPUNIT_ASSERT_EQUAL(0, GroupId::toNumericId
(gid, downcast<String>(res.param)->s().c_str()));
CPPUNIT_ASSERT_EQUAL(std::string("/sink"),
e_->getRequestGroupMan()->findReservedGroup(gid)->
findReservedGroup(e_->getRequestGroupMan(), gid)->
getOption()->get(PREF_DIR));
}
}
@ -236,7 +236,7 @@ void RpcMethodTest::testAddUri_withPosition()
m.execute(req2, e_.get());
std::string uri =
e_->getRequestGroupMan()->getReservedGroups()[0]->
getReservedGroup(e_->getRequestGroupMan(), 0)->
getDownloadContext()->getFirstFileEntry()->getRemainingUris()[0];
CPPUNIT_ASSERT_EQUAL(std::string("http://uri2"), uri);
@ -288,7 +288,7 @@ void RpcMethodTest::testAddTorrent()
(gid, downcast<String>(res.param)->s().c_str()));
SharedHandle<RequestGroup> group =
e_->getRequestGroupMan()->findReservedGroup(gid);
findReservedGroup(e_->getRequestGroupMan(), gid);
CPPUNIT_ASSERT(group);
CPPUNIT_ASSERT_EQUAL(e_->getOption()->get(PREF_DIR)+"/aria2-0.8.2.tar.bz2",
group->getFirstFilePath());
@ -314,7 +314,7 @@ void RpcMethodTest::testAddTorrent()
(gid, downcast<String>(res.param)->s().c_str()));
CPPUNIT_ASSERT_EQUAL
(dir+"/aria2-0.8.2.tar.bz2",
e_->getRequestGroupMan()->findReservedGroup(gid)->getFirstFilePath());
findReservedGroup(e_->getRequestGroupMan(), gid)->getFirstFilePath());
CPPUNIT_ASSERT
(File(dir+"/0a3893293e27ac0490424c06de4d09242215f0a6.torrent").exists());
}
@ -355,7 +355,7 @@ void RpcMethodTest::testAddTorrent_withPosition()
m.execute(req2, e_.get());
CPPUNIT_ASSERT_EQUAL((size_t)1,
e_->getRequestGroupMan()->getReservedGroups()[0]->
getReservedGroup(e_->getRequestGroupMan(), 0)->
getDownloadContext()->getFileEntries().size());
}
@ -406,12 +406,12 @@ void RpcMethodTest::testAddMetalink()
#endif // ENABLE_MESSAGE_DIGEST
SharedHandle<RequestGroup> tar =
e_->getRequestGroupMan()->findReservedGroup(gid3);
findReservedGroup(e_->getRequestGroupMan(), gid3);
CPPUNIT_ASSERT(tar);
CPPUNIT_ASSERT_EQUAL(e_->getOption()->get(PREF_DIR)+"/aria2-5.0.0.tar.bz2",
tar->getFirstFilePath());
SharedHandle<RequestGroup> deb =
e_->getRequestGroupMan()->findReservedGroup(gid4);
findReservedGroup(e_->getRequestGroupMan(), gid4);
CPPUNIT_ASSERT(deb);
CPPUNIT_ASSERT_EQUAL(e_->getOption()->get(PREF_DIR)+"/aria2-5.0.0.deb",
deb->getFirstFilePath());
@ -433,7 +433,7 @@ void RpcMethodTest::testAddMetalink()
(0, GroupId::toNumericId
(gid5, downcast<String>(resParams->get(0))->s().c_str()));
CPPUNIT_ASSERT_EQUAL(dir+"/aria2-5.0.0.tar.bz2",
e_->getRequestGroupMan()->findReservedGroup(gid5)->
findReservedGroup(e_->getRequestGroupMan(), gid5)->
getFirstFilePath());
#ifdef ENABLE_MESSAGE_DIGEST
CPPUNIT_ASSERT
@ -478,7 +478,7 @@ void RpcMethodTest::testAddMetalink_withPosition()
CPPUNIT_ASSERT_EQUAL(0, res2.code);
CPPUNIT_ASSERT_EQUAL(e_->getOption()->get(PREF_DIR)+"/aria2-5.0.0.tar.bz2",
e_->getRequestGroupMan()->getReservedGroups()[0]->
getReservedGroup(e_->getRequestGroupMan(), 0)->
getFirstFilePath());
}
@ -684,9 +684,9 @@ void RpcMethodTest::testTellWaiting()
CPPUNIT_ASSERT_EQUAL(0, res.code);
const List* resParams = downcast<List>(res.param);
CPPUNIT_ASSERT_EQUAL((size_t)2, resParams->size());
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(rgman->getReservedGroups()[1]->getGID()),
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(getReservedGroup(rgman, 1)->getGID()),
getString(downcast<Dict>(resParams->get(0)), "gid"));
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(rgman->getReservedGroups()[2]->getGID()),
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(getReservedGroup(rgman, 2)->getGID()),
getString(downcast<Dict>(resParams->get(1)), "gid"));
// waiting.size() == offset+num
req = RpcRequest(TellWaitingRpcMethod::getMethodName(), List::g());
@ -742,9 +742,9 @@ void RpcMethodTest::testTellWaiting()
CPPUNIT_ASSERT_EQUAL(0, res.code);
resParams = downcast<List>(res.param);
CPPUNIT_ASSERT_EQUAL((size_t)2, resParams->size());
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(rgman->getReservedGroups()[3]->getGID()),
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(getReservedGroup(rgman, 3)->getGID()),
getString(downcast<Dict>(resParams->get(0)), "gid"));
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(rgman->getReservedGroups()[2]->getGID()),
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(getReservedGroup(rgman, 2)->getGID()),
getString(downcast<Dict>(resParams->get(1)), "gid"));
// negative offset and size < num
req.params->set(1, Integer::g(100));
@ -936,7 +936,7 @@ void RpcMethodTest::testChangePosition()
(SharedHandle<RequestGroup>(new RequestGroup(GroupId::create(),
util::copy(option_))));
a2_gid_t gid = e_->getRequestGroupMan()->getReservedGroups()[0]->getGID();
a2_gid_t gid = getReservedGroup(e_->getRequestGroupMan(), 0)->getGID();
ChangePositionRpcMethod m;
RpcRequest req(ChangePositionRpcMethod::getMethodName(), List::g());
req.params->append(GroupId::toHex(gid));
@ -946,7 +946,7 @@ void RpcMethodTest::testChangePosition()
CPPUNIT_ASSERT_EQUAL(0, res.code);
CPPUNIT_ASSERT_EQUAL((int64_t)1, downcast<Integer>(res.param)->i());
CPPUNIT_ASSERT_EQUAL
(gid, e_->getRequestGroupMan()->getReservedGroups()[1]->getGID());
(gid, getReservedGroup(e_->getRequestGroupMan(), 1)->getGID());
}
void RpcMethodTest::testChangePosition_fail()
@ -1211,9 +1211,9 @@ void RpcMethodTest::testSystemMulticall()
const List* resParams = downcast<List>(res.param);
CPPUNIT_ASSERT_EQUAL((size_t)7, resParams->size());
SharedHandle<RequestGroupMan> rgman = e_->getRequestGroupMan();
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(rgman->getReservedGroups()[0]->getGID()),
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(getReservedGroup(rgman, 0)->getGID()),
downcast<String>(downcast<List>(resParams->get(0))->get(0))->s());
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(rgman->getReservedGroups()[1]->getGID()),
CPPUNIT_ASSERT_EQUAL(GroupId::toHex(getReservedGroup(rgman, 1)->getGID()),
downcast<String>(downcast<List>(resParams->get(1))->get(0))->s());
CPPUNIT_ASSERT_EQUAL((int64_t)1,
downcast<Integer>