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

Rename /BadCondition/ in Peer to /Drop/

pull/43/head
Tatsuhiro Tsujikawa 2013-01-26 18:50:48 +09:00
parent 91b26ab2a8
commit 3a19b65dd7
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DefaultPeerStorage.cc
View File

@ -238,7 +238,7 @@ void DefaultPeerStorage::onReturningPeer(const SharedHandle<Peer>& peer)
{ {
if(peer->isActive()) { if(peer->isActive()) {
if(peer->isDisconnectedGracefully() && !peer->isIncomingPeer()) { if(peer->isDisconnectedGracefully() && !peer->isIncomingPeer()) {
peer->startBadCondition(); peer->startDrop();
addDroppedPeer(peer); addDroppedPeer(peer);
} }
// Execute choking algorithm if unchoked and interested peer is // Execute choking algorithm if unchoked and interested peer is

6
src/Peer.cc
View File

@ -51,7 +51,7 @@ Peer::Peer(std::string ipaddr, uint16_t port, bool incoming):
origPort_(port), origPort_(port),
cuid_(0), cuid_(0),
firstContactTime_(global::wallclock()), firstContactTime_(global::wallclock()),
badConditionStartTime_(0), dropStartTime_(0),
seeder_(false), seeder_(false),
res_(0), res_(0),
incoming_(incoming), incoming_(incoming),
@ -317,9 +317,9 @@ void Peer::setAllBitfield() {
updateSeeder(); updateSeeder();
} }
void Peer::startBadCondition() void Peer::startDrop()
{ {
badConditionStartTime_ = global::wallclock(); dropStartTime_ = global::wallclock();
} }
uint8_t Peer::getExtensionMessageID(int key) const uint8_t Peer::getExtensionMessageID(int key) const

8
src/Peer.h
View File

@ -71,7 +71,7 @@ private:
Timer firstContactTime_; Timer firstContactTime_;
Timer badConditionStartTime_; Timer dropStartTime_;
bool seeder_; bool seeder_;
@ -145,7 +145,7 @@ public:
return seeder_; return seeder_;
} }
void startBadCondition(); void startDrop();
void allocateSessionResource(int32_t pieceLength, int64_t totalLength); void allocateSessionResource(int32_t pieceLength, int64_t totalLength);
@ -160,9 +160,9 @@ public:
void setFirstContactTime(const Timer& time); void setFirstContactTime(const Timer& time);
const Timer& getBadConditionStartTime() const const Timer& getDropStartTime() const
{ {
return badConditionStartTime_; return dropStartTime_;
} }
// Before calling following member functions, make sure that // Before calling following member functions, make sure that

3
src/UTPexExtensionMessage.cc
View File

@ -151,8 +151,7 @@ bool UTPexExtensionMessage::freshPeersAreFull() const
bool UTPexExtensionMessage::addDroppedPeer(const SharedHandle<Peer>& peer) bool UTPexExtensionMessage::addDroppedPeer(const SharedHandle<Peer>& peer)
{ {
if(!peer->isIncomingPeer() && if(!peer->isIncomingPeer() &&
peer->getBadConditionStartTime(). peer->getDropStartTime().difference(global::wallclock()) < interval_) {
difference(global::wallclock()) < interval_) {
droppedPeers_.push_back(peer); droppedPeers_.push_back(peer);
return true; return true;
} else { } else {

24
test/UTPexExtensionMessageTest.cc
View File

@ -77,17 +77,17 @@ void UTPexExtensionMessageTest::testGetBencodedData()
SharedHandle<Peer> p2(new Peer("10.1.1.2", 9999)); SharedHandle<Peer> p2(new Peer("10.1.1.2", 9999));
CPPUNIT_ASSERT(msg.addFreshPeer(p2)); CPPUNIT_ASSERT(msg.addFreshPeer(p2));
SharedHandle<Peer> p3(new Peer("192.168.0.2", 6882)); SharedHandle<Peer> p3(new Peer("192.168.0.2", 6882));
p3->startBadCondition(); p3->startDrop();
CPPUNIT_ASSERT(msg.addDroppedPeer(p3)); CPPUNIT_ASSERT(msg.addDroppedPeer(p3));
SharedHandle<Peer> p4(new Peer("10.1.1.3", 10000)); SharedHandle<Peer> p4(new Peer("10.1.1.3", 10000));
p4->startBadCondition(); p4->startDrop();
CPPUNIT_ASSERT(msg.addDroppedPeer(p4)); CPPUNIT_ASSERT(msg.addDroppedPeer(p4));
SharedHandle<Peer> p5(new Peer("1002:1035:4527:3546:7854:1237:3247:3217", SharedHandle<Peer> p5(new Peer("1002:1035:4527:3546:7854:1237:3247:3217",
6881)); 6881));
CPPUNIT_ASSERT(msg.addFreshPeer(p5)); CPPUNIT_ASSERT(msg.addFreshPeer(p5));
SharedHandle<Peer> p6(new Peer("2001:db8:bd05:1d2:288a:1fc0:1:10ee", 6882)); SharedHandle<Peer> p6(new Peer("2001:db8:bd05:1d2:288a:1fc0:1:10ee", 6882));
p6->startBadCondition(); p6->startDrop();
CPPUNIT_ASSERT(msg.addDroppedPeer(p6)); CPPUNIT_ASSERT(msg.addDroppedPeer(p6));
unsigned char c1[COMPACT_LEN_IPV6]; unsigned char c1[COMPACT_LEN_IPV6];
@ -126,10 +126,10 @@ void UTPexExtensionMessageTest::testToString()
SharedHandle<Peer> p2(new Peer("10.1.1.2", 9999)); SharedHandle<Peer> p2(new Peer("10.1.1.2", 9999));
msg.addFreshPeer(p2); msg.addFreshPeer(p2);
SharedHandle<Peer> p3(new Peer("192.168.0.2", 6882)); SharedHandle<Peer> p3(new Peer("192.168.0.2", 6882));
p3->startBadCondition(); p3->startDrop();
msg.addDroppedPeer(p3); msg.addDroppedPeer(p3);
SharedHandle<Peer> p4(new Peer("10.1.1.3", 10000)); SharedHandle<Peer> p4(new Peer("10.1.1.3", 10000));
p4->startBadCondition(); p4->startDrop();
msg.addDroppedPeer(p4); msg.addDroppedPeer(p4);
CPPUNIT_ASSERT_EQUAL(std::string("ut_pex added=2, dropped=2"), msg.toString()); CPPUNIT_ASSERT_EQUAL(std::string("ut_pex added=2, dropped=2"), msg.toString());
} }
@ -145,10 +145,10 @@ void UTPexExtensionMessageTest::testDoReceivedAction()
9999)); 9999));
msg.addFreshPeer(p2); msg.addFreshPeer(p2);
SharedHandle<Peer> p3(new Peer("192.168.0.2", 6882)); SharedHandle<Peer> p3(new Peer("192.168.0.2", 6882));
p3->startBadCondition(); p3->startDrop();
msg.addDroppedPeer(p3); msg.addDroppedPeer(p3);
SharedHandle<Peer> p4(new Peer("2001:db8:bd05:1d2:288a:1fc0:1:10ee", 10000)); SharedHandle<Peer> p4(new Peer("2001:db8:bd05:1d2:288a:1fc0:1:10ee", 10000));
p4->startBadCondition(); p4->startDrop();
msg.addDroppedPeer(p4); msg.addDroppedPeer(p4);
msg.setPeerStorage(peerStorage_); msg.setPeerStorage(peerStorage_);
@ -259,10 +259,10 @@ void UTPexExtensionMessageTest::testAddDroppedPeer()
SharedHandle<Peer> p1(new Peer("192.168.0.1", 6881)); SharedHandle<Peer> p1(new Peer("192.168.0.1", 6881));
CPPUNIT_ASSERT(!msg.addDroppedPeer(p1)); CPPUNIT_ASSERT(!msg.addDroppedPeer(p1));
SharedHandle<Peer> p2(new Peer("10.1.1.2", 9999)); SharedHandle<Peer> p2(new Peer("10.1.1.2", 9999));
p2->startBadCondition(); p2->startDrop();
CPPUNIT_ASSERT(msg.addFreshPeer(p2)); CPPUNIT_ASSERT(msg.addFreshPeer(p2));
SharedHandle<Peer> p3(new Peer("10.1.1.3", 9999, true)); SharedHandle<Peer> p3(new Peer("10.1.1.3", 9999, true));
p3->startBadCondition(); p3->startDrop();
CPPUNIT_ASSERT(!msg.addDroppedPeer(p3)); CPPUNIT_ASSERT(!msg.addDroppedPeer(p3));
} }
@ -288,15 +288,15 @@ void UTPexExtensionMessageTest::testDroppedPeersAreFull()
CPPUNIT_ASSERT_EQUAL((size_t)50, msg.getMaxDroppedPeer()); CPPUNIT_ASSERT_EQUAL((size_t)50, msg.getMaxDroppedPeer());
msg.setMaxDroppedPeer(2); msg.setMaxDroppedPeer(2);
SharedHandle<Peer> p1(new Peer("192.168.0.1", 6881)); SharedHandle<Peer> p1(new Peer("192.168.0.1", 6881));
p1->startBadCondition(); p1->startDrop();
CPPUNIT_ASSERT(msg.addDroppedPeer(p1)); CPPUNIT_ASSERT(msg.addDroppedPeer(p1));
CPPUNIT_ASSERT(!msg.droppedPeersAreFull()); CPPUNIT_ASSERT(!msg.droppedPeersAreFull());
SharedHandle<Peer> p2(new Peer("10.1.1.2", 9999)); SharedHandle<Peer> p2(new Peer("10.1.1.2", 9999));
p2->startBadCondition(); p2->startDrop();
CPPUNIT_ASSERT(msg.addDroppedPeer(p2)); CPPUNIT_ASSERT(msg.addDroppedPeer(p2));
CPPUNIT_ASSERT(msg.droppedPeersAreFull()); CPPUNIT_ASSERT(msg.droppedPeersAreFull());
SharedHandle<Peer> p3(new Peer("10.1.1.3", 9999)); SharedHandle<Peer> p3(new Peer("10.1.1.3", 9999));
p3->startBadCondition(); p3->startDrop();
CPPUNIT_ASSERT(msg.addDroppedPeer(p3)); CPPUNIT_ASSERT(msg.addDroppedPeer(p3));
CPPUNIT_ASSERT(msg.droppedPeersAreFull()); CPPUNIT_ASSERT(msg.droppedPeersAreFull());
} }