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

1 files changed, 254 insertions, 0 deletions

diff --git a/test/PeerSessionResourceTest.cc b/test/PeerSessionResourceTest.cc
new file mode 100644
index 00000000..15a33b32
--- /dev/null
+++ b/test/PeerSessionResourceTest.cc
@@ -0,0 +1,254 @@
+#include "PeerSessionResource.h"
+#include "Exception.h"
+#include "Util.h"
+#include <cppunit/extensions/HelperMacros.h>
+
+namespace aria2 {
+
+class PeerSessionResourceTest:public CppUnit::TestFixture {
+
+  CPPUNIT_TEST_SUITE(PeerSessionResourceTest);
+  CPPUNIT_TEST(testPeerAllowedIndexSetContains);
+  CPPUNIT_TEST(testAmAllowedIndexSetContains);
+  CPPUNIT_TEST(testHasAllPieces);
+  CPPUNIT_TEST(testHasPiece);
+  CPPUNIT_TEST(testUpdateUploadLength);
+  CPPUNIT_TEST(testUpdateDownloadLength);
+  CPPUNIT_TEST(testUpdateLatency);
+  CPPUNIT_TEST(testExtendedMessageEnabled);
+  CPPUNIT_TEST(testGetExtensionMessageID);
+  CPPUNIT_TEST(testFastExtensionEnabled);
+  CPPUNIT_TEST(testSnubbing);
+  CPPUNIT_TEST(testAmChoking);
+  CPPUNIT_TEST(testAmInterested);
+  CPPUNIT_TEST(testPeerChoking);
+  CPPUNIT_TEST(testPeerInterested);
+  CPPUNIT_TEST(testChokingRequired);
+  CPPUNIT_TEST(testOptUnchoking);
+  CPPUNIT_TEST(testShouldBeChoking);
+  CPPUNIT_TEST_SUITE_END();
+public:
+  void setUp() {}
+
+  void tearDown() {}
+
+  void testPeerAllowedIndexSetContains();
+  void testAmAllowedIndexSetContains();
+  void testHasAllPieces();
+  void testHasPiece();
+  void testUpdateUploadLength();
+  void testUpdateDownloadLength();
+  void testUpdateLatency();
+  void testExtendedMessageEnabled();
+  void testGetExtensionMessageID();
+  void testFastExtensionEnabled();
+  void testSnubbing();
+  void testAmChoking();
+  void testAmInterested();
+  void testPeerChoking();
+  void testPeerInterested();
+  void testChokingRequired();
+  void testOptUnchoking();
+  void testShouldBeChoking();
+};
+
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PeerSessionResourceTest);
+
+void PeerSessionResourceTest::testPeerAllowedIndexSetContains()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  res.addPeerAllowedIndex(567);
+  res.addPeerAllowedIndex(789);
+
+  CPPUNIT_ASSERT(res.peerAllowedIndexSetContains(567));
+  CPPUNIT_ASSERT(res.peerAllowedIndexSetContains(789));
+  CPPUNIT_ASSERT(!res.peerAllowedIndexSetContains(123));
+}
+
+void PeerSessionResourceTest::testAmAllowedIndexSetContains()
+{
+  PeerSessionResource res(1024, 1024*1024);
+  
+  res.addAmAllowedIndex(567);
+  res.addAmAllowedIndex(789);
+
+  CPPUNIT_ASSERT(res.amAllowedIndexSetContains(567));
+  CPPUNIT_ASSERT(res.amAllowedIndexSetContains(789));
+  CPPUNIT_ASSERT(!res.amAllowedIndexSetContains(123));
+}
+
+void PeerSessionResourceTest::testHasAllPieces()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(!res.hasAllPieces());
+  res.markSeeder();
+  CPPUNIT_ASSERT(res.hasAllPieces());
+}
+
+void PeerSessionResourceTest::testHasPiece()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(!res.hasPiece(300));
+  res.updateBitfield(300, 1);
+  CPPUNIT_ASSERT(res.hasPiece(300));
+  res.updateBitfield(300, 0);
+  CPPUNIT_ASSERT(!res.hasPiece(300));
+}  
+
+void PeerSessionResourceTest::testUpdateUploadLength()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT_EQUAL((int64_t)0, res.uploadLength());
+  res.updateUploadLength(100);
+  res.updateUploadLength(200);
+  CPPUNIT_ASSERT_EQUAL((int64_t)300, res.uploadLength());
+}
+
+void PeerSessionResourceTest::testUpdateDownloadLength()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT_EQUAL((int64_t)0, res.downloadLength());
+  res.updateDownloadLength(100);
+  res.updateDownloadLength(200);
+  CPPUNIT_ASSERT_EQUAL((int64_t)300, res.downloadLength());
+}
+
+void PeerSessionResourceTest::testUpdateLatency()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT_EQUAL(1500, res.latency());
+  res.updateLatency(1000);
+  CPPUNIT_ASSERT_EQUAL(1100, res.latency());
+}
+
+void PeerSessionResourceTest::testExtendedMessageEnabled()
+{ 
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(!res.extendedMessagingEnabled());
+  res.extendedMessagingEnabled(true);
+  CPPUNIT_ASSERT(res.extendedMessagingEnabled());
+  res.extendedMessagingEnabled(false);
+  CPPUNIT_ASSERT(!res.extendedMessagingEnabled());
+}
+
+void PeerSessionResourceTest::testGetExtensionMessageID()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  res.addExtension("a2", 9);
+  CPPUNIT_ASSERT_EQUAL((uint8_t)9, res.getExtensionMessageID("a2"));
+  CPPUNIT_ASSERT_EQUAL((uint8_t)0, res.getExtensionMessageID("non"));
+
+  CPPUNIT_ASSERT_EQUAL(std::string("a2"), res.getExtensionName(9));
+  CPPUNIT_ASSERT_EQUAL(std::string(""), res.getExtensionName(10));
+}
+
+void PeerSessionResourceTest::testFastExtensionEnabled()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(!res.fastExtensionEnabled());
+  res.fastExtensionEnabled(true);
+  CPPUNIT_ASSERT(res.fastExtensionEnabled());
+  res.fastExtensionEnabled(false);
+  CPPUNIT_ASSERT(!res.fastExtensionEnabled());
+}
+
+void PeerSessionResourceTest::testSnubbing()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(!res.snubbing());
+  res.snubbing(true);
+  CPPUNIT_ASSERT(res.snubbing());
+  res.snubbing(false);
+  CPPUNIT_ASSERT(!res.snubbing());
+}
+
+void PeerSessionResourceTest::testAmChoking()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(res.amChoking());
+  res.amChoking(false);
+  CPPUNIT_ASSERT(!res.amChoking());
+  res.amChoking(true);
+  CPPUNIT_ASSERT(res.amChoking());
+}
+
+void PeerSessionResourceTest::testAmInterested()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(!res.amInterested());
+  res.amInterested(true);
+  CPPUNIT_ASSERT(res.amInterested());
+  res.amInterested(false);
+  CPPUNIT_ASSERT(!res.amInterested());
+}
+
+void PeerSessionResourceTest::testPeerChoking()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(res.peerChoking());
+  res.peerChoking(false);
+  CPPUNIT_ASSERT(!res.peerChoking());
+  res.peerChoking(true);
+  CPPUNIT_ASSERT(res.peerChoking());
+}
+
+void PeerSessionResourceTest::testPeerInterested()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(!res.peerInterested());
+  res.peerInterested(true);
+  CPPUNIT_ASSERT(res.peerInterested());
+  res.peerInterested(false);
+  CPPUNIT_ASSERT(!res.peerInterested());
+}
+
+void PeerSessionResourceTest::testChokingRequired()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(res.chokingRequired());
+  res.chokingRequired(false);
+  CPPUNIT_ASSERT(!res.chokingRequired());
+  res.chokingRequired(true);
+  CPPUNIT_ASSERT(res.chokingRequired());
+}
+
+void PeerSessionResourceTest::testOptUnchoking()
+{
+  PeerSessionResource res(1024, 1024*1024);
+
+  CPPUNIT_ASSERT(!res.optUnchoking());
+  res.optUnchoking(true);
+  CPPUNIT_ASSERT(res.optUnchoking());
+  res.optUnchoking(false);
+  CPPUNIT_ASSERT(!res.optUnchoking());
+}
+
+void PeerSessionResourceTest::testShouldBeChoking()
+{
+  PeerSessionResource res(1024, 1024*1024);
+  
+  CPPUNIT_ASSERT(res.shouldBeChoking());
+  res.chokingRequired(false);
+  CPPUNIT_ASSERT(!res.shouldBeChoking());
+  res.chokingRequired(true);
+  res.optUnchoking(true);
+  CPPUNIT_ASSERT(!res.shouldBeChoking());
+}
+
+} // namespace aria2