mirror of
https://github.com/aria2/aria2.git
synced 2025-04-05 21:47:37 +03:00
2008-02-10 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Extract the Peer class's member variables, which are only needed after PeerInteractionCommand, into PeerSessionResource class. This class is instantiated in PeerInteractionCommand class's ctor and released in its dtor. This will make Peer class lightweight and uses less memory for peers which are not connected and wait in the queue. * src/PeerChokeCommand.cc * src/PeerSessionResource.{h, cc} * src/PeerInteractionCommand.cc * src/PeerAbstractCommand.cc: Note: 0 is given to onAbort() function. * src/DefaultBtInteractive.cc * src/BtPieceMessage.cc * src/BtInterestedMessage.cc * src/BtUnchokeMessage.cc * src/DefaultPeerStorage.{h, cc} * src/PeerInitiateConnectionCommand.cc * src/ActivePeerConnectionCommand.cc * src/BtNotInterestedMessage.cc * src/DefaultBtMessageDispatcher.cc * src/BtChokeMessage.cc * src/BtRequestMessage.cc * src/Peer.{h, cc} * src/BtRegistry.h * src/TrackerWatcherCommand.cc * src/PeerReceiveHandshakeCommand.cc * test/BtExtendedMessageTest.cc * test/BtAllowedFastMessageTest.cc * test/BtCancelMessageTest.cc * test/DefaultPieceStorageTest.cc * test/BtBitfieldMessageTest.cc * test/BtHaveMessageTest.cc * test/BtNotInterestedMessageTest.cc * test/BtRequestMessageTest.cc * test/PeerSessionResourceTest.cc * test/DefaultBtMessageDispatcherTest.cc * test/PeerTest.cc * test/BtInterestedMessageTest.cc * test/BtRejectMessageTest.cc * test/BtChokeMessageTest.cc * test/DefaultPeerStorageTest.cc * test/BtHaveNoneMessageTest.cc * test/BtHaveAllMessageTest.cc * test/DefaultExtensionMessageFactoryTest.cc * test/BtUnchokeMessageTest.cc * test/DefaultBtMessageFactoryTest.cc * test/HandshakeExtensionMessageTest.cc * test/UTPexExtensionMessageTest.cc * test/DefaultBtRequestFactoryTest.cc * test/BtPieceMessageTest.cc Removed typedef PeerStats. * src/PeerStat.h * src/SegmentMan.cc
This commit is contained in:
parent
04a7052013
commit
c064a2cd9e
53 changed files with 1332 additions and 354 deletions
|
@ -84,7 +84,7 @@ void DefaultPeerStorageTest::testDeleteUnusedPeer() {
|
|||
ps.addPeer(peer1);
|
||||
ps.addPeer(peer2);
|
||||
|
||||
peer2->cuid = 1;
|
||||
peer2->usedBy(1);
|
||||
|
||||
ps.deleteUnusedPeer(3);
|
||||
|
||||
|
@ -117,7 +117,7 @@ void DefaultPeerStorageTest::testAddPeer() {
|
|||
|
||||
SharedHandle<Peer> peer4(new Peer("192.168.0.4", 6889));
|
||||
|
||||
peer1->cuid = 1;
|
||||
peer1->usedBy(1);
|
||||
CPPUNIT_ASSERT(ps.addPeer(peer4));
|
||||
// peer2 was deleted. While peer1 is oldest, its cuid is not 0.
|
||||
CPPUNIT_ASSERT_EQUAL((int32_t)3, ps.countPeer());
|
||||
|
@ -142,7 +142,7 @@ void DefaultPeerStorageTest::testGetUnusedPeer() {
|
|||
CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"),
|
||||
ps.getUnusedPeer()->ipaddr);
|
||||
|
||||
peer1->cuid = 1;
|
||||
peer1->usedBy(1);
|
||||
|
||||
CPPUNIT_ASSERT(ps.getUnusedPeer().isNull());
|
||||
|
||||
|
@ -164,7 +164,7 @@ void DefaultPeerStorageTest::testIsPeerAvailable() {
|
|||
|
||||
CPPUNIT_ASSERT_EQUAL(true, ps.isPeerAvailable());
|
||||
|
||||
peer1->cuid = 1;
|
||||
peer1->usedBy(1);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL(false, ps.isPeerAvailable());
|
||||
|
||||
|
@ -188,7 +188,8 @@ void DefaultPeerStorageTest::testActivatePeer() {
|
|||
|
||||
CPPUNIT_ASSERT_EQUAL((size_t)0, ps.getActivePeers().size());
|
||||
|
||||
peer1->activate();
|
||||
peer1->allocateSessionResource(btContext->getPieceLength(),
|
||||
btContext->getTotalLength());
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL((size_t)1, ps.getActivePeers().size());
|
||||
}
|
||||
|
@ -201,7 +202,11 @@ void DefaultPeerStorageTest::testReturnPeer()
|
|||
DefaultPeerStorage ps(btContext, option);
|
||||
|
||||
SharedHandle<Peer> peer1(new Peer("192.168.0.1", 0));
|
||||
peer1->allocateSessionResource(btContext->getPieceLength(),
|
||||
btContext->getTotalLength());
|
||||
SharedHandle<Peer> peer2(new Peer("192.168.0.2", 6889));
|
||||
peer2->allocateSessionResource(btContext->getPieceLength(),
|
||||
btContext->getTotalLength());
|
||||
SharedHandle<Peer> peer3(new Peer("192.168.0.1", 6889));
|
||||
ps.addPeer(peer1);
|
||||
ps.addPeer(peer2);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue