2006-10-18 14:57:00 +00:00
|
|
|
#include "AnnounceList.h"
|
|
|
|
|
#include "MetaFileUtil.h"
|
|
|
|
|
#include "Exception.h"
|
2008-02-08 15:53:45 +00:00
|
|
|
#include "Dictionary.h"
|
2006-10-18 14:57:00 +00:00
|
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
namespace aria2 {
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
class AnnounceListTest:public CppUnit::TestFixture {
|
|
|
|
|
|
|
|
|
|
CPPUNIT_TEST_SUITE(AnnounceListTest);
|
|
|
|
|
CPPUNIT_TEST(testSingleElementList);
|
|
|
|
|
CPPUNIT_TEST(testMultiElementList);
|
|
|
|
|
CPPUNIT_TEST(testSingleAndMulti);
|
|
|
|
|
CPPUNIT_TEST(testNoGroup);
|
2007-12-07 13:33:59 +00:00
|
|
|
CPPUNIT_TEST(testEvent);
|
|
|
|
|
CPPUNIT_TEST(testNextEventIfAfterStarted);
|
2006-10-18 14:57:00 +00:00
|
|
|
CPPUNIT_TEST(testCountStoppedAllowedTier);
|
|
|
|
|
CPPUNIT_TEST(testCountCompletedAllowedTier);
|
|
|
|
|
CPPUNIT_TEST(testMoveToStoppedAllowedTier);
|
|
|
|
|
CPPUNIT_TEST(testMoveToCompletedAllowedTier);
|
|
|
|
|
CPPUNIT_TEST_SUITE_END();
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
void setUp() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void testSingleElementList();
|
|
|
|
|
void testMultiElementList();
|
|
|
|
|
void testSingleAndMulti();
|
|
|
|
|
void testNoGroup();
|
|
|
|
|
void testEvent();
|
2007-12-07 13:33:59 +00:00
|
|
|
void testNextEventIfAfterStarted();
|
2006-10-18 14:57:00 +00:00
|
|
|
void testCountStoppedAllowedTier();
|
|
|
|
|
void testCountCompletedAllowedTier();
|
|
|
|
|
void testMoveToStoppedAllowedTier();
|
|
|
|
|
void testMoveToCompletedAllowedTier();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION( AnnounceListTest );
|
|
|
|
|
|
|
|
|
|
void AnnounceListTest::testSingleElementList() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
|
2008-03-07 12:05:50 +00:00
|
|
|
Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
// ANNOUNCE_LIST
|
|
|
|
|
// [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
|
|
|
|
|
AnnounceList announceList(announces);
|
2007-11-12 14:13:00 +00:00
|
|
|
|
|
|
|
|
CPPUNIT_ASSERT(!announceList.allTiersFailed());
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string url = announceList.getAnnounce();
|
|
|
|
|
std::string event = announceList.getEventString();
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("started"), event);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker3"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
2007-11-12 14:13:00 +00:00
|
|
|
CPPUNIT_ASSERT(announceList.allTiersFailed());
|
|
|
|
|
announceList.resetTier();
|
|
|
|
|
CPPUNIT_ASSERT(!announceList.allTiersFailed());
|
2006-10-18 14:57:00 +00:00
|
|
|
// back to the first list
|
|
|
|
|
url = announceList.getAnnounce();
|
|
|
|
|
event = announceList.getEventString();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("started"), event);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
|
|
|
|
event = announceList.getEventString();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), url);
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("started"), event);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceSuccess();
|
|
|
|
|
// back to the first list because announce to tracker2 succeeded.
|
|
|
|
|
url = announceList.getAnnounce();
|
|
|
|
|
event = announceList.getEventString();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("started"), event);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
|
|
|
|
event = announceList.getEventString();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), url);
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), event);
|
2006-10-18 14:57:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AnnounceListTest::testMultiElementList() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string peersString = "ll8:tracker18:tracker28:tracker3ee";
|
2008-03-07 12:05:50 +00:00
|
|
|
Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
|
2006-10-18 14:57:00 +00:00
|
|
|
// ANNOUNCE_LIST
|
|
|
|
|
// [ [ tracker1, tracker2, tracker3 ] ]
|
|
|
|
|
AnnounceList announceList(announces);
|
|
|
|
|
|
2007-11-12 14:13:00 +00:00
|
|
|
CPPUNIT_ASSERT(!announceList.allTiersFailed());
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string url = announceList.getAnnounce();
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceSuccess();
|
|
|
|
|
url = announceList.getAnnounce();
|
|
|
|
|
// tracker2 returns because tracker2 is now first.
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker3"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
2007-11-12 14:13:00 +00:00
|
|
|
CPPUNIT_ASSERT(announceList.allTiersFailed());
|
|
|
|
|
announceList.resetTier();
|
|
|
|
|
CPPUNIT_ASSERT(!announceList.allTiersFailed());
|
2006-10-18 14:57:00 +00:00
|
|
|
// back to the first list because there is no other list.
|
2007-11-12 14:13:00 +00:00
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AnnounceListTest::testSingleAndMulti() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string peersString = "ll8:tracker18:tracker2el8:tracker3ee";
|
2008-03-07 12:05:50 +00:00
|
|
|
Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
// ANNOUNCE_LIST
|
|
|
|
|
// [ [ tracker1, tracker2 ], [ tracker3 ] ]
|
|
|
|
|
AnnounceList announceList(announces);
|
|
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string url = announceList.getAnnounce();
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceSuccess();
|
|
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
|
|
|
|
url = announceList.getAnnounce();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker3"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceSuccess();
|
|
|
|
|
url = announceList.getAnnounce();
|
|
|
|
|
// tracker1 returns because after the announce to tracker3 succeeds, list
|
|
|
|
|
// pointer points to the first list.
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
|
2006-10-18 14:57:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AnnounceListTest::testNoGroup() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string peersString = "llee";
|
2008-03-07 12:05:50 +00:00
|
|
|
Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
AnnounceList announceList(announces);
|
|
|
|
|
|
|
|
|
|
CPPUNIT_ASSERT(announceList.countTier() == 0);
|
|
|
|
|
}
|
|
|
|
|
|
2007-12-07 13:33:59 +00:00
|
|
|
void AnnounceListTest::testNextEventIfAfterStarted() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string peersString = "ll8:tracker1ee";
|
2008-03-07 12:05:50 +00:00
|
|
|
Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
|
2007-12-07 13:33:59 +00:00
|
|
|
|
|
|
|
|
// ANNOUNCE_LIST
|
|
|
|
|
// [ [ tracker1 ] ]
|
|
|
|
|
AnnounceList announceList(announces);
|
|
|
|
|
announceList.setEvent(AnnounceTier::STOPPED);
|
|
|
|
|
announceList.announceFailure();
|
|
|
|
|
announceList.resetTier();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), announceList.getEventString());
|
2007-12-07 13:33:59 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(AnnounceTier::HALTED, announceList.getEvent());
|
|
|
|
|
|
|
|
|
|
announceList.setEvent(AnnounceTier::COMPLETED);
|
|
|
|
|
announceList.announceFailure();
|
|
|
|
|
announceList.resetTier();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), announceList.getEventString());
|
2007-12-07 13:33:59 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(AnnounceTier::SEEDING, announceList.getEvent());
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-18 14:57:00 +00:00
|
|
|
void AnnounceListTest::testEvent() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
|
2008-03-07 12:05:50 +00:00
|
|
|
Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
// ANNOUNCE_LIST
|
|
|
|
|
// [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
|
|
|
|
|
AnnounceList announceList(announces);
|
|
|
|
|
|
|
|
|
|
announceList.setEvent(AnnounceTier::STOPPED);
|
|
|
|
|
announceList.announceSuccess();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), announceList.getEventString());
|
2006-10-18 14:57:00 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(AnnounceTier::HALTED, announceList.getEvent());
|
|
|
|
|
|
|
|
|
|
announceList.setEvent(AnnounceTier::COMPLETED);
|
|
|
|
|
announceList.announceSuccess();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), announceList.getEventString());
|
2006-10-18 14:57:00 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(AnnounceTier::SEEDING, announceList.getEvent());
|
|
|
|
|
|
|
|
|
|
announceList.setEvent(AnnounceTier::STARTED_AFTER_COMPLETION);
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("started"), announceList.getEventString());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceSuccess();
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(AnnounceTier::SEEDING, announceList.getEvent());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AnnounceListTest::testCountStoppedAllowedTier() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
|
2008-03-07 12:05:50 +00:00
|
|
|
Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
// ANNOUNCE_LIST
|
|
|
|
|
// [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
|
|
|
|
|
AnnounceList announceList(announces);
|
|
|
|
|
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countStoppedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::STARTED);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countStoppedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::STARTED_AFTER_COMPLETION);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countStoppedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::HALTED);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countStoppedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
announceList.setEvent(AnnounceTier::DOWNLOADING);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, announceList.countStoppedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::STOPPED);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, announceList.countStoppedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::COMPLETED);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, announceList.countStoppedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::SEEDING);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, announceList.countStoppedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AnnounceListTest::testCountCompletedAllowedTier() {
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
|
2008-03-07 12:05:50 +00:00
|
|
|
Dictionary* announces = (Dictionary*)MetaFileUtil::bdecoding(peersString);
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
// ANNOUNCE_LIST
|
|
|
|
|
// [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
|
|
|
|
|
AnnounceList announceList(announces);
|
|
|
|
|
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countCompletedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::STARTED);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countCompletedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::STARTED_AFTER_COMPLETION);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countCompletedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::STOPPED);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countCompletedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::SEEDING);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countCompletedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::HALTED);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, announceList.countCompletedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
announceList.setEvent(AnnounceTier::DOWNLOADING);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, announceList.countCompletedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.setEvent(AnnounceTier::COMPLETED);
|
2008-03-09 12:24:01 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, announceList.countCompletedAllowedTier());
|
2006-10-18 14:57:00 +00:00
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
std::deque<std::string> createUrls(const std::string& url) {
|
|
|
|
|
std::deque<std::string> urls;
|
2006-10-18 14:57:00 +00:00
|
|
|
urls.push_back(url);
|
|
|
|
|
return urls;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AnnounceListTest::testMoveToStoppedAllowedTier() {
|
2008-02-08 15:53:45 +00:00
|
|
|
SharedHandle<AnnounceTier> t1(new AnnounceTier(createUrls("tracker1")));
|
|
|
|
|
SharedHandle<AnnounceTier> t2(new AnnounceTier(createUrls("tracker2")));
|
2006-11-05 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To divide TorrentMan into 6 classes: BtContext, BtRuntime,
PeerStorage, PieceStorage, BtAnnounce and BtProgressInfoFile
* src/TrackerWatcherComand.h: Made subclass of
BtContextAwareCommand.
* src/SeedCheckCommand.cc: Use pieceStorage, btRuntime
* src/PeerAbstractCommand.h: Made subclass of
BtContextAwareCommand.
* src/PeerAbstractCommand.cc: Use btRuntime.
* src/BtContextAwareCommand.h: New class.
* src/FileEntry.h: Added accessor methods for following
variables.
(path): Made private.
(length): Made private.
(offset): Made private.
(extracted): Made private.
(requested): Made private.
(FileEntries): New definition.
(FileEntryHandle): New definition.
* src/FileEntry.cc: New file.
* src/HaveEraseCommand.h: Made subclass of
BtContextAwareCommand.
* src/HaveEraseCommand.cc: Use btRuntime, pieceStorage.
* src/PeerChokeCommand.h: Made subclass of
BtContextAwareCommand.
* src/PeerChokeCommand.cc: Use btRuntime, peerStorage,
pieceStorage.
* src/PieceStorage.h: New file.
* src/PeerInteractionCommand.h: Use btContext.
* src/PeerInteractionCommand.cc: Use pieceStorage, peerStorage,
btRuntime.
* src/DefaultBtProgressInfoFile.h: New file.
* src/DefaultBtProgressInfoFile.cc: New file.
* src/File.cc
(Util.h): New include.
(mkdirs): New function.
* src/MultiDiskAdaptor.h
(mkdir): New function.
* src/PeerListProcessor.h
(Peers): Removed.
* src/PeerInteraction.h
(torrentMan): Removed.
(btContext): New variable.
(peerStorage): New variable.
(pieceStorage): New variable.
(btAnnounce): New variable.
(getTorrentMan): Removed.
(getBtContext): New function.
* src/PeerInteraction.cc: Use btContext, peerStorage,
pieceStorage,
btAnnounce.
* src/HandshakeMessage.h
(TorrentMan.h): Removed.
* src/HandshakeMessage.cc: Use btContext.
* src/DefaultBtAnnounce.cc: New file.
* src/MultiDiskWriter.cc: Use the accessor methods of FileEntry.
* src/DefaultPieceStorage.cc: New file.
* src/DefaultBtContext.h: New file.
* src/TorrentRequestInfo.cc: Use btContext, pieceStorage.
Use the accessor methods of FileEntry.
* src/CookieBox.cc: Updated to use Util::slice().
* src/PieceMessage.cc: Use btContext, pieceStorage.
* src/common.h (SharedHandle.h): New include.
* src/PeerMessage.cc (PeerMessage): Added btContext,
peerStorage,
pieceStorage.
* src/TorrentAutoSaveCommand.h: Made subclass of
BtContextAwareCommand.
* src/DiskAdaptor.h
(topDir): Removed.
(getFileEntryFromPath): Changed the return type to
FileEntryHandle.
(setTopDir): Removed.
(getTopDir): Removed.
* src/BtContext.h: New file.
* src/DefaultPeerStorage.h: New file.
* src/PieceMessage.h (TorrentMan.h): Removed.
* src/RequestMessage.h (TorrentMan.h): Removed.
* src/TorrentDownloadEngine.h
(uploadLength): New variable.
(btContext): New variable.
(btRuntime): New variable.
(pieceStorage): New variable.
(peerStorage): New variable.
(btAnnounce): New variable.
(btProgressInfoFile): New variable.
(torrentMan): Removed.
(setBtContext): New function.
* src/TorrentDownloadEngine.cc: Use BtContext, BtRuntime,
pieceStorage,
peerStorage, btAnnounce, btProgressInfoFile.
* src/Piece.h
(toString): New function.
(Pieces): New type definition.
* src/Peer.h
(active): New variable.
(Peer): Added active.
(activate): Set active to true.
(deactivate): Set active to false.
(isActive): New function.
(Peers): New type definition.
* src/DirectDiskAdaptor.cc
(getFilePath): Use the accessor methods of FileEntry.
* src/TorrentConsoleDownloadEngine.h
(afterEachIteration): New function.
* src/TorrentConsoleDownloadEngine.cc
(haltRequested): New variable.
(sendStatistics): Use pieceStorage, btRuntime.
(afterEachIteration): New function.
* src/AnnounceList: AnnounceTier->AnnounceTierHandle.
* src/Directry.h
(Directory): New function.
(DirectoryHandle): New type definition.
* src/BtProgressInfoFile.h: New file.
* src/RequestMessage.cc: Use pieceStorage.
* src/BtRuntime.h: New file.
* src/DefaultBtContext.cc: New file.
* src/BitfieldMan.h
(getCompletedLength): New function(private).
(getCompletedLength): New function.
(getFilteredCompletedLength): New function.
* src/BitfieldMan.h
(getCompletedLength): New function(private).
(getCompletedLength): New function.
(getFilteredCompletedLength): New function.
* src/MultiDiskAdaptor.cc
(mkdir): New function.
(openFile): Call mkdir().
(initAndOpenFile): Call mkdir().
* src/CancelMessage.h
(TorrentMan.h): Removed.
* src/RejectMessage.h
(TorrentMan.h): Removed.
* src/DownloadEngineFactory.cc
(DefaultPieceStorage.h): New include.
(DefaultPeerStorage.h): New include.
(DefaultBtAnnounce.h): New include.
(DefaultBtProgressInfoFile.h): New include.
(newTorrentConsoleEngine): Rewritten.
* src/ShareRatioSeedCriteria.h
(torrentMan): Removed.
(btContext): New variable.
(peerStorage): New variable.
(btRuntime): New variable.
(evaluate): Use btContext, btRuntime, peerStorage.
* src/AnnounceTier.h: New file.
* src/BtAnnounce.h: New file.
* src/BtRegistry.h: New file.
* src/PeerInitiateConnectionCommand.h: Added btContext.
* src/PeerConnection.h (TorrentMan.h): Removed.
* src/PeerMessageFactory.cc: Use btContext, pieceStorage.
* src/Util.h
(slice): Added an argument.
* src/Util.cc
(slice): Added an argument to control whether trim is made or
not.
* src/PeerStorage.h: New file.
* src/BtRegistry.cc: New file.
* src/TrackerUpdateCommand.h: Made subclass of
BtContextAwareCommand.
* src/CopyDiskAdaptor.cc: Use the accessor methods of FileEntry.
* src/MultiDiskWriter.h: FileEntry -> FileEntryHandle
* src/PeerListenCommand.cc: Use btRuntime, peerStorage,
btContext.
* src/TorrentRequestInfo.h
(e): Removed.
(showFileEntry): Added an argument.
(getDownloadEngine): Return 0.
* src/DefaultBtAnnounce.h: New file.
* src/TorrentAutoSaveCommand.cc: Use btRuntime,
btProgressInfoFile.
* src/TrackerWatcherComand.cc: Use btRuntime, btAnnounce,
* src/PeerMessageFactory.h
(btContext): New variable.
(pieceStorage): New variable.
* src/TrackerUpdateCommand.cc: Use btRuntime, peerStorage,
btContext,
btAnnounce.
* src/DiskAdaptor.cc
(DiskAdaptor): Removed topDir.
(~DiskAdaptor): Removed topDir.
* src/PeerListenCommand.h: Made subclass of
BtContextAwareCommand.
* src/SeedCheckCommand.h: Made subclass of
BtContextAwareCommand.
* src/File.h (mkdirs): New function.
* src/DefaultPeerStorage): New file.
* src/DownloadEngineFactory.h
(newTorrentConsoleEngine): Use btContext.
* src/BtContextAwareCommand.cc: New file.
* src/PeerInitiateConnectionCommand.cc: Use btRuntime,
peerStorage.
* src/PeerMessage.h
(btContext): New variable.
(peerStorage): New variable.
(pieceStorage): New variable.
(setBtContext): New function.
* src/Directry.cc
(Directory): New function.
(createDir): Do nothing if name.size() == 0.
* src/AnnounceList.h
(AnnounceTier): Removed.
(AnnounceTiers): Removed.
* src/DefaultPieceStorage.h: New file.
* src/Piece.cc (toString): New function.
To fix typo:
* src/main.cc (showVersion): Fixed typo.
To fix compile warning:
* src/DelegatingPeerListProcessor.cc
(canHandle): Added "return false".
2006-11-05 15:04:17 +00:00
|
|
|
t2->event = AnnounceTier::COMPLETED;
|
2008-02-08 15:53:45 +00:00
|
|
|
SharedHandle<AnnounceTier> t3(new AnnounceTier(createUrls("tracker3")));
|
2006-10-18 14:57:00 +00:00
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
std::deque<SharedHandle<AnnounceTier> > tiers;
|
2006-10-18 14:57:00 +00:00
|
|
|
tiers.push_back(t1);
|
|
|
|
|
tiers.push_back(t2);
|
|
|
|
|
tiers.push_back(t3);
|
|
|
|
|
|
|
|
|
|
AnnounceList announceList(tiers);
|
|
|
|
|
|
2007-12-09 15:54:54 +00:00
|
|
|
CPPUNIT_ASSERT(!announceList.currentTierAcceptsStoppedEvent());
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), announceList.getAnnounce());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.moveToStoppedAllowedTier();
|
2007-12-09 15:54:54 +00:00
|
|
|
CPPUNIT_ASSERT(announceList.currentTierAcceptsStoppedEvent());
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), announceList.getAnnounce());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
2007-12-09 15:54:54 +00:00
|
|
|
CPPUNIT_ASSERT(!announceList.currentTierAcceptsStoppedEvent());
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker3"), announceList.getAnnounce());
|
2006-10-18 14:57:00 +00:00
|
|
|
// test wrapped search
|
|
|
|
|
announceList.moveToStoppedAllowedTier();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), announceList.getAnnounce());
|
2006-10-18 14:57:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AnnounceListTest::testMoveToCompletedAllowedTier() {
|
2008-02-08 15:53:45 +00:00
|
|
|
SharedHandle<AnnounceTier> t1(new AnnounceTier(createUrls("tracker1")));
|
|
|
|
|
SharedHandle<AnnounceTier> t2(new AnnounceTier(createUrls("tracker2")));
|
2006-11-05 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To divide TorrentMan into 6 classes: BtContext, BtRuntime,
PeerStorage, PieceStorage, BtAnnounce and BtProgressInfoFile
* src/TrackerWatcherComand.h: Made subclass of
BtContextAwareCommand.
* src/SeedCheckCommand.cc: Use pieceStorage, btRuntime
* src/PeerAbstractCommand.h: Made subclass of
BtContextAwareCommand.
* src/PeerAbstractCommand.cc: Use btRuntime.
* src/BtContextAwareCommand.h: New class.
* src/FileEntry.h: Added accessor methods for following
variables.
(path): Made private.
(length): Made private.
(offset): Made private.
(extracted): Made private.
(requested): Made private.
(FileEntries): New definition.
(FileEntryHandle): New definition.
* src/FileEntry.cc: New file.
* src/HaveEraseCommand.h: Made subclass of
BtContextAwareCommand.
* src/HaveEraseCommand.cc: Use btRuntime, pieceStorage.
* src/PeerChokeCommand.h: Made subclass of
BtContextAwareCommand.
* src/PeerChokeCommand.cc: Use btRuntime, peerStorage,
pieceStorage.
* src/PieceStorage.h: New file.
* src/PeerInteractionCommand.h: Use btContext.
* src/PeerInteractionCommand.cc: Use pieceStorage, peerStorage,
btRuntime.
* src/DefaultBtProgressInfoFile.h: New file.
* src/DefaultBtProgressInfoFile.cc: New file.
* src/File.cc
(Util.h): New include.
(mkdirs): New function.
* src/MultiDiskAdaptor.h
(mkdir): New function.
* src/PeerListProcessor.h
(Peers): Removed.
* src/PeerInteraction.h
(torrentMan): Removed.
(btContext): New variable.
(peerStorage): New variable.
(pieceStorage): New variable.
(btAnnounce): New variable.
(getTorrentMan): Removed.
(getBtContext): New function.
* src/PeerInteraction.cc: Use btContext, peerStorage,
pieceStorage,
btAnnounce.
* src/HandshakeMessage.h
(TorrentMan.h): Removed.
* src/HandshakeMessage.cc: Use btContext.
* src/DefaultBtAnnounce.cc: New file.
* src/MultiDiskWriter.cc: Use the accessor methods of FileEntry.
* src/DefaultPieceStorage.cc: New file.
* src/DefaultBtContext.h: New file.
* src/TorrentRequestInfo.cc: Use btContext, pieceStorage.
Use the accessor methods of FileEntry.
* src/CookieBox.cc: Updated to use Util::slice().
* src/PieceMessage.cc: Use btContext, pieceStorage.
* src/common.h (SharedHandle.h): New include.
* src/PeerMessage.cc (PeerMessage): Added btContext,
peerStorage,
pieceStorage.
* src/TorrentAutoSaveCommand.h: Made subclass of
BtContextAwareCommand.
* src/DiskAdaptor.h
(topDir): Removed.
(getFileEntryFromPath): Changed the return type to
FileEntryHandle.
(setTopDir): Removed.
(getTopDir): Removed.
* src/BtContext.h: New file.
* src/DefaultPeerStorage.h: New file.
* src/PieceMessage.h (TorrentMan.h): Removed.
* src/RequestMessage.h (TorrentMan.h): Removed.
* src/TorrentDownloadEngine.h
(uploadLength): New variable.
(btContext): New variable.
(btRuntime): New variable.
(pieceStorage): New variable.
(peerStorage): New variable.
(btAnnounce): New variable.
(btProgressInfoFile): New variable.
(torrentMan): Removed.
(setBtContext): New function.
* src/TorrentDownloadEngine.cc: Use BtContext, BtRuntime,
pieceStorage,
peerStorage, btAnnounce, btProgressInfoFile.
* src/Piece.h
(toString): New function.
(Pieces): New type definition.
* src/Peer.h
(active): New variable.
(Peer): Added active.
(activate): Set active to true.
(deactivate): Set active to false.
(isActive): New function.
(Peers): New type definition.
* src/DirectDiskAdaptor.cc
(getFilePath): Use the accessor methods of FileEntry.
* src/TorrentConsoleDownloadEngine.h
(afterEachIteration): New function.
* src/TorrentConsoleDownloadEngine.cc
(haltRequested): New variable.
(sendStatistics): Use pieceStorage, btRuntime.
(afterEachIteration): New function.
* src/AnnounceList: AnnounceTier->AnnounceTierHandle.
* src/Directry.h
(Directory): New function.
(DirectoryHandle): New type definition.
* src/BtProgressInfoFile.h: New file.
* src/RequestMessage.cc: Use pieceStorage.
* src/BtRuntime.h: New file.
* src/DefaultBtContext.cc: New file.
* src/BitfieldMan.h
(getCompletedLength): New function(private).
(getCompletedLength): New function.
(getFilteredCompletedLength): New function.
* src/BitfieldMan.h
(getCompletedLength): New function(private).
(getCompletedLength): New function.
(getFilteredCompletedLength): New function.
* src/MultiDiskAdaptor.cc
(mkdir): New function.
(openFile): Call mkdir().
(initAndOpenFile): Call mkdir().
* src/CancelMessage.h
(TorrentMan.h): Removed.
* src/RejectMessage.h
(TorrentMan.h): Removed.
* src/DownloadEngineFactory.cc
(DefaultPieceStorage.h): New include.
(DefaultPeerStorage.h): New include.
(DefaultBtAnnounce.h): New include.
(DefaultBtProgressInfoFile.h): New include.
(newTorrentConsoleEngine): Rewritten.
* src/ShareRatioSeedCriteria.h
(torrentMan): Removed.
(btContext): New variable.
(peerStorage): New variable.
(btRuntime): New variable.
(evaluate): Use btContext, btRuntime, peerStorage.
* src/AnnounceTier.h: New file.
* src/BtAnnounce.h: New file.
* src/BtRegistry.h: New file.
* src/PeerInitiateConnectionCommand.h: Added btContext.
* src/PeerConnection.h (TorrentMan.h): Removed.
* src/PeerMessageFactory.cc: Use btContext, pieceStorage.
* src/Util.h
(slice): Added an argument.
* src/Util.cc
(slice): Added an argument to control whether trim is made or
not.
* src/PeerStorage.h: New file.
* src/BtRegistry.cc: New file.
* src/TrackerUpdateCommand.h: Made subclass of
BtContextAwareCommand.
* src/CopyDiskAdaptor.cc: Use the accessor methods of FileEntry.
* src/MultiDiskWriter.h: FileEntry -> FileEntryHandle
* src/PeerListenCommand.cc: Use btRuntime, peerStorage,
btContext.
* src/TorrentRequestInfo.h
(e): Removed.
(showFileEntry): Added an argument.
(getDownloadEngine): Return 0.
* src/DefaultBtAnnounce.h: New file.
* src/TorrentAutoSaveCommand.cc: Use btRuntime,
btProgressInfoFile.
* src/TrackerWatcherComand.cc: Use btRuntime, btAnnounce,
* src/PeerMessageFactory.h
(btContext): New variable.
(pieceStorage): New variable.
* src/TrackerUpdateCommand.cc: Use btRuntime, peerStorage,
btContext,
btAnnounce.
* src/DiskAdaptor.cc
(DiskAdaptor): Removed topDir.
(~DiskAdaptor): Removed topDir.
* src/PeerListenCommand.h: Made subclass of
BtContextAwareCommand.
* src/SeedCheckCommand.h: Made subclass of
BtContextAwareCommand.
* src/File.h (mkdirs): New function.
* src/DefaultPeerStorage): New file.
* src/DownloadEngineFactory.h
(newTorrentConsoleEngine): Use btContext.
* src/BtContextAwareCommand.cc: New file.
* src/PeerInitiateConnectionCommand.cc: Use btRuntime,
peerStorage.
* src/PeerMessage.h
(btContext): New variable.
(peerStorage): New variable.
(pieceStorage): New variable.
(setBtContext): New function.
* src/Directry.cc
(Directory): New function.
(createDir): Do nothing if name.size() == 0.
* src/AnnounceList.h
(AnnounceTier): Removed.
(AnnounceTiers): Removed.
* src/DefaultPieceStorage.h: New file.
* src/Piece.cc (toString): New function.
To fix typo:
* src/main.cc (showVersion): Fixed typo.
To fix compile warning:
* src/DelegatingPeerListProcessor.cc
(canHandle): Added "return false".
2006-11-05 15:04:17 +00:00
|
|
|
t2->event = AnnounceTier::COMPLETED;
|
2008-02-08 15:53:45 +00:00
|
|
|
SharedHandle<AnnounceTier> t3(new AnnounceTier(createUrls("tracker3")));
|
2006-10-18 14:57:00 +00:00
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
std::deque<SharedHandle<AnnounceTier> > tiers;
|
2006-10-18 14:57:00 +00:00
|
|
|
tiers.push_back(t1);
|
|
|
|
|
tiers.push_back(t2);
|
|
|
|
|
tiers.push_back(t3);
|
|
|
|
|
|
|
|
|
|
AnnounceList announceList(tiers);
|
|
|
|
|
|
2007-12-09 15:54:54 +00:00
|
|
|
CPPUNIT_ASSERT(!announceList.currentTierAcceptsCompletedEvent());
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), announceList.getAnnounce());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.moveToStoppedAllowedTier();
|
2007-12-09 15:54:54 +00:00
|
|
|
CPPUNIT_ASSERT(announceList.currentTierAcceptsCompletedEvent());
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), announceList.getAnnounce());
|
2006-10-18 14:57:00 +00:00
|
|
|
announceList.announceFailure();
|
2007-12-09 15:54:54 +00:00
|
|
|
CPPUNIT_ASSERT(!announceList.currentTierAcceptsCompletedEvent());
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker3"), announceList.getAnnounce());
|
2006-10-18 14:57:00 +00:00
|
|
|
// test wrapped search
|
|
|
|
|
announceList.moveToStoppedAllowedTier();
|
2008-02-08 15:53:45 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), announceList.getAnnounce());
|
2006-10-18 14:57:00 +00:00
|
|
|
}
|
2008-02-08 15:53:45 +00:00
|
|
|
|
|
|
|
|
} // namespace aria2
|