2007-10-24 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

* src/Piece.{h, cc}: Added SubPiece infrastructure to track down
	the data smaller than block length.
	A block length can be specified by constructor's argument.
	* src/DefaultPieceStorage.{h, cc} (getMissingPiece):
	Get a missing piece in the range of given FileEntry. This 
function is
	not used in the program yet.
	* src/Util.h: Added some macros.

test/DefaultPieceStorageTest.cc

@@ -7,6 +7,7 @@
 #include "Piece.h"
 #include "Peer.h"
 #include "Option.h"
+#include "MockBtContext.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
@@ -22,6 +23,8 @@ class DefaultPieceStorageTest:public CppUnit::TestFixture {
   CPPUNIT_TEST(testGetPiece);
   CPPUNIT_TEST(testGetPieceInUsedPieces);
   CPPUNIT_TEST(testGetPieceCompletedPiece);
+  CPPUNIT_TEST(testGetMissingPiece_fileEntry);
+  CPPUNIT_TEST(testCancelPiece);
   CPPUNIT_TEST_SUITE_END();
 private:
   BtContextHandle btContext;
@@ -43,6 +46,12 @@ public:
     option = new Option();
   }
 
+  void tearDown()
+  {
+    delete option;
+    option = 0;
+  }
+
   void testGetTotalLength();
   void testGetMissingPiece();
   void testGetMissingFastPiece();
@@ -51,6 +60,8 @@ public:
   void testGetPiece();
   void testGetPieceInUsedPieces();
   void testGetPieceCompletedPiece();
+  void testGetMissingPiece_fileEntry();
+  void testCancelPiece();
 };
 
 
@@ -153,3 +164,102 @@ void DefaultPieceStorageTest::testGetPieceCompletedPiece() {
   CPPUNIT_ASSERT_EQUAL((int32_t)128, pieceGot->getLength());
   CPPUNIT_ASSERT_EQUAL(true, pieceGot->pieceComplete());
 }
+
+void DefaultPieceStorageTest::testGetMissingPiece_fileEntry()
+{
+  // - 32KB
+  // +--------+
+  // |11111222|
+  int32_t pieceLength = 256*1024;
+  int64_t totalLength = 1*pieceLength;
+  int32_t blockLength = 16*1024;
+  Strings uris1;
+  uris1.push_back("http://localhost/src/file1.txt");
+  Strings uris2;
+  uris2.push_back("http://localhost/src/file2.txt");
+  FileEntryHandle file1 = new FileEntry("src/file1.txt", 150*1024, 0/*, uris1*/);
+  FileEntryHandle file2 = new FileEntry("src/file2.txt", 106*1024, file1->getLength() /*, uris2*/);
+
+  MockBtContextHandle dctx = new MockBtContext();
+  dctx->setPieceLength(pieceLength);
+  dctx->setTotalLength(totalLength);
+  dctx->addFileEntry(file1);
+  dctx->addFileEntry(file2);
+
+  DefaultPieceStorageHandle ps = new DefaultPieceStorage(dctx, option);
+
+  PieceHandle p = ps->getMissingPiece(file1);
+  CPPUNIT_ASSERT(!p.isNull());
+  CPPUNIT_ASSERT_EQUAL((int32_t)0, p->getIndex());
+
+  for(int32_t i = 0; i < 9; ++i) {
+    p->completeBlock(i);
+  }
+  PieceHandle subPiece = new Piece(9, blockLength, 1);
+  p->addSubPiece(subPiece);
+
+  ps->cancelPiece(p);
+
+  // Piece index = 0 should be retrieved again because the part of file1 is
+  // not complete
+  PieceHandle p2 = ps->getMissingPiece(file1);
+  CPPUNIT_ASSERT(!p2.isNull());
+  CPPUNIT_ASSERT_EQUAL((int32_t)0, p2->getIndex());
+ 
+  // Make the part of file1 complete
+  for(int32_t i = 0; i < 6*1024; ++i) {
+    p2->getSubPiece(9)->completeBlock(i);
+  }
+  ps->cancelPiece(p2);
+
+  // Null Piece should be retrieved
+  CPPUNIT_ASSERT(ps->getMissingPiece(file1).isNull());
+
+  // Next, I retrive the piece giving file2
+  PieceHandle p3 = ps->getMissingPiece(file2);
+  CPPUNIT_ASSERT(!p3.isNull());
+  CPPUNIT_ASSERT_EQUAL((int32_t)0, p3->getIndex());
+
+  // Make the part of file2 complete
+  for(int32_t i = 6*1024; i < 16*1024; ++i) {
+    p3->getSubPiece(9)->completeBlock(i);
+  }
+  for(int32_t i = 10; i < 16; ++i) {
+    p3->completeBlock(i);
+  }
+  ps->cancelPiece(p3);
+  
+  // Null Piece should be retrieved
+  CPPUNIT_ASSERT(ps->getMissingPiece(file2).isNull());
+}
+
+void DefaultPieceStorageTest::testCancelPiece()
+{
+  int32_t pieceLength = 256*1024;
+  int64_t totalLength = 32*pieceLength; // <-- make the number of piece greater than END_GAME_PIECE_NUM
+  int32_t blockLength = 16*1024;
+  Strings uris1;
+  uris1.push_back("http://localhost/src/file1.txt");
+  FileEntryHandle file1 = new FileEntry("src/file1.txt", totalLength, 0 /*, uris1*/);
+
+  MockBtContextHandle dctx = new MockBtContext();
+  dctx->setPieceLength(pieceLength);
+  dctx->setTotalLength(totalLength);
+  dctx->addFileEntry(file1);
+
+  DefaultPieceStorageHandle ps = new DefaultPieceStorage(dctx, option);
+
+  PieceHandle p = ps->getMissingPiece(file1);
+  
+  PieceHandle subPiece = new Piece(0, blockLength, 1);
+  subPiece->completeBlock(0);
+  p->addSubPiece(subPiece);
+
+  ps->cancelPiece(p);
+
+  // See the sub piece is also hibernated...
+  PieceHandle p2 = ps->getMissingPiece(file1);
+
+  CPPUNIT_ASSERT(!p2->getSubPiece(0).isNull());
+  
+}