From 4b2d1deff652f0c7e605655e2c3241f928eb4ef9 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 29 Aug 2010 09:22:06 +0000 Subject: [PATCH] 2010-08-29 Tatsuhiro Tsujikawa Pass excludedIndexes when getting metadata piece. * src/UTMetadataRequestFactory.cc * test/UTMetadataRequestFactoryTest.cc --- ChangeLog | 6 ++++++ src/UTMetadataRequestFactory.cc | 4 +++- test/UTMetadataRequestFactoryTest.cc | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1585c29ff..47e200bca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-29 Tatsuhiro Tsujikawa + + Pass excludedIndexes when getting metadata piece. + * src/UTMetadataRequestFactory.cc + * test/UTMetadataRequestFactoryTest.cc + 2010-08-29 Tatsuhiro Tsujikawa Added a sets of overloaded functions for diff --git a/src/UTMetadataRequestFactory.cc b/src/UTMetadataRequestFactory.cc index 6ebc0e9cb..59e2e94d2 100644 --- a/src/UTMetadataRequestFactory.cc +++ b/src/UTMetadataRequestFactory.cc @@ -53,7 +53,9 @@ void UTMetadataRequestFactory::create const SharedHandle& pieceStorage) { while(num) { - SharedHandle p = pieceStorage->getMissingPiece(peer_); + std::vector metadataRequests = tracker_->getAllTrackedIndex(); + SharedHandle p = + pieceStorage->getMissingPiece(peer_, metadataRequests); if(p.isNull()) { if(logger_->debug()) { logger_->debug("No ut_metadata piece is available to download."); diff --git a/test/UTMetadataRequestFactoryTest.cc b/test/UTMetadataRequestFactoryTest.cc index a304524fb..d141d0b5e 100644 --- a/test/UTMetadataRequestFactoryTest.cc +++ b/test/UTMetadataRequestFactoryTest.cc @@ -29,7 +29,8 @@ public: std::deque missingIndexes; virtual SharedHandle getMissingPiece - (const SharedHandle& peer) + (const SharedHandle& peer, + const std::vector& exlucdedIndexes) { if(missingIndexes.empty()) { return SharedHandle();