2009-03-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	BitfieldMan::getMissingIndexes family functions now takes
	unsigned char* bitfield instead of stl container for efficiency.
	PieceSelector::select now takes this
	bitfield. RarestPieceSelector::select now also performs
	efficiently for this change.  bitfield namespace is introduced
	and it has several helper functions to handle basic bitfield
	operations such as test, count set bits, etc.
	* src/BitfieldMan.cc
	* src/BitfieldMan.h
	* src/DefaultBtRequestFactory.cc
	* src/DefaultPieceStorage.cc
	* src/DefaultPieceStorage.h
	* src/LongestSequencePieceSelector.cc
	* src/LongestSequencePieceSelector.h
	* src/Makefile.am
	* src/Piece.cc
	* src/Piece.h
	* src/PieceSelector.h
	* src/RarestPieceSelector.cc
	* src/RarestPieceSelector.h
	* src/Util.cc
	* src/Util.h
	* src/bitfield.h
	* test/BitfieldManTest.cc
	* test/LongestSequencePieceSelectorTest.cc
	* test/Makefile.am
	* test/RarestPieceSelectorTest.cc
	* test/UtilTest.cc
	* test/bitfieldTest.cc

1 files changed, 22 insertions, 0 deletions

diff --git a/test/RarestPieceSelectorTest.cc b/test/RarestPieceSelectorTest.cc
index c8d22ccc..0549aca9 100644
--- a/test/RarestPieceSelectorTest.cc
+++ b/test/RarestPieceSelectorTest.cc
@@ -7,6 +7,7 @@
 
 #include "Exception.h"
 #include "Util.h"
+#include "BitfieldMan.h"
 
 namespace aria2 {
 
@@ -17,6 +18,7 @@ class RarestPieceSelectorTest:public CppUnit::TestFixture {
   CPPUNIT_TEST(testAddPieceStats_bitfield);
   CPPUNIT_TEST(testUpdatePieceStats);
   CPPUNIT_TEST(testSubtractPieceStats);
+  CPPUNIT_TEST(testSelect);
   CPPUNIT_TEST_SUITE_END();
 public:
   void setUp() {}
@@ -27,6 +29,7 @@ public:
   void testAddPieceStats_bitfield();
   void testUpdatePieceStats();
   void testSubtractPieceStats();
+  void testSelect();
 };
 
 
@@ -189,5 +192,24 @@ void RarestPieceSelectorTest::testSubtractPieceStats()
   }
 }
 
+void RarestPieceSelectorTest::testSelect()
+{
+  RarestPieceSelector selector(10, false);
+  BitfieldMan bf(1024, 10*1024);
+  bf.setBitRange(0, 2);
+  size_t index;
+
+  selector.addPieceStats(0);
+
+  CPPUNIT_ASSERT(selector.select(index, bf.getBitfield(),
+				 bf.countBlock()));
+  CPPUNIT_ASSERT_EQUAL((size_t)1, index);
+
+  selector.addPieceStats(1);
+
+  CPPUNIT_ASSERT(selector.select(index, bf.getBitfield(),
+				 bf.countBlock()));
+  CPPUNIT_ASSERT_EQUAL((size_t)2, index);
+}
 
 } // namespace aria2