From 8ca9db9f3ee007d40b85339f81a39ea3c1a22616 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 24 Jan 2009 09:00:36 +0000
Subject: 2009-01-24  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>

	Replaced FileAllocationMan with
	SequentialPicker<FileAllocationEntry>.
	* src/BtCheckIntegrityEntry.cc
	* src/ConsoleStatCalc.cc
	* src/DownloadEngine.cc
	* src/DownloadEngine.h
	* src/DownloadEngineFactory.cc
	* src/FileAllocationCommand.cc
	* src/FileAllocationDispatcherCommand.cc
	* src/FileAllocationMan.h
	* src/Makefile.am
	* src/SequentialPicker.h
	* src/StatCalc.h
	* src/StreamCheckIntegrityEntry.cc
	* test/Makefile.am
	* test/SequentialPickerTest.cc
---
 src/FileAllocationDispatcherCommand.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/FileAllocationDispatcherCommand.cc')

diff --git a/src/FileAllocationDispatcherCommand.cc b/src/FileAllocationDispatcherCommand.cc
index 72622dfe..b6ee18fa 100644
--- a/src/FileAllocationDispatcherCommand.cc
+++ b/src/FileAllocationDispatcherCommand.cc
@@ -56,9 +56,8 @@ bool FileAllocationDispatcherCommand::execute()
   if(_e->_requestGroupMan->downloadFinished() || _e->isHaltRequested()) {
     return true;
   }
-  if(_e->_fileAllocationMan->nextFileAllocationEntryExists() &&
-     !_e->_fileAllocationMan->isFileAllocationBeingExecuted()) {
-    FileAllocationEntryHandle entry = _e->_fileAllocationMan->popNextFileAllocationEntry();
+  if(_e->_fileAllocationMan->hasNext() && !_e->_fileAllocationMan->isPicked()) {
+    FileAllocationEntryHandle entry = _e->_fileAllocationMan->pickNext();
     int32_t newCUID = _e->newCUID();
     logger->info(MSG_FILE_ALLOCATION_DISPATCH, newCUID);
     FileAllocationCommand* command =
-- 
cgit