2009-03-13 Tatsuhiro Tsujikawa <[email protected]>

	Renamed ServerStatURISelector as FeedbackURISelector.
	* src/FeedbackURISelector.cc
	* src/FeedbackURISelector.h
	* src/Makefile.am
	* src/RequestGroupMan.cc
	* src/ServerStatURISelector.cc
	* src/ServerStatURISelector.h
	* test/FeedbackURISelectorTest.cc
	* test/Makefile.am
	* test/ServerStatURISelectorTest.cc

ChangeLog

@@ -1,3 +1,16 @@
+2009-03-13  Tatsuhiro Tsujikawa  <[email protected]>
+
+	Renamed ServerStatURISelector as FeedbackURISelector.
+	* src/FeedbackURISelector.cc
+	* src/FeedbackURISelector.h
+	* src/Makefile.am
+	* src/RequestGroupMan.cc
+	* src/ServerStatURISelector.cc
+	* src/ServerStatURISelector.h
+	* test/FeedbackURISelectorTest.cc
+	* test/Makefile.am
+	* test/ServerStatURISelectorTest.cc
+	
 2009-03-13  Tatsuhiro Tsujikawa  <[email protected]>
 
 	Fixed the bug that AdaptiveURISelector doesn't select any URI when

src/ServerStatURISelector.cc → src/FeedbackURISelector.cc

@@ -32,20 +32,22 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#include "ServerStatURISelector.h"
+#include "FeedbackURISelector.h"
+
+#include <algorithm>
+
 #include "ServerStatMan.h"
 #include "ServerStat.h"
 #include "Request.h"
 #include "A2STR.h"
-#include <algorithm>
 
 namespace aria2 {
 
-ServerStatURISelector::ServerStatURISelector
+FeedbackURISelector::FeedbackURISelector
 (const SharedHandle<ServerStatMan>& serverStatMan):
   _serverStatMan(serverStatMan) {}
 
-ServerStatURISelector::~ServerStatURISelector() {}
+FeedbackURISelector::~FeedbackURISelector() {}
 
 class ServerStatFaster {
 public:
@@ -57,7 +59,7 @@ public:
   }
 };
 
-std::string ServerStatURISelector::select(std::deque<std::string>& uris)
+std::string FeedbackURISelector::select(std::deque<std::string>& uris)
 {
   if(uris.empty()) {
     return A2STR::NIL;

src/ServerStatURISelector.h → src/FeedbackURISelector.h

@@ -32,8 +32,8 @@
  * files in the program, then also delete it here.
  */
 /* copyright --> */
-#ifndef _D_SERVER_STAT_URI_SELECTOR_H_
-#define _D_SERVER_STAT_URI_SELECTOR_H_
+#ifndef _D_FEEDBACK_URI_SELECTOR_H_
+#define _D_FEEDBACK_URI_SELECTOR_H_
 #include "URISelector.h"
 #include "SharedHandle.h"
 
@@ -41,18 +41,18 @@ namespace aria2 {
 
 class ServerStatMan;
 
-class ServerStatURISelector:public URISelector {
+class FeedbackURISelector:public URISelector {
 private:
   SharedHandle<ServerStatMan> _serverStatMan;
 
 public:
-  ServerStatURISelector(const SharedHandle<ServerStatMan>& serverStatMan);
+  FeedbackURISelector(const SharedHandle<ServerStatMan>& serverStatMan);
 
-  virtual ~ServerStatURISelector();
+  virtual ~FeedbackURISelector();
 
   virtual std::string select(std::deque<std::string>& uris);
 };
 
 } // namespace aria2
 
-#endif // _D_SERVER_STAT_URI_SELECTOR_H_
+#endif // _D_FEEDBACK_URI_SELECTOR_H_

src/Makefile.am

@@ -189,7 +189,7 @@ SRCS =  Socket.h\
 	URISelector.h\
 	AdaptiveURISelector.cc AdaptiveURISelector.h\
 	InOrderURISelector.cc InOrderURISelector.h\
-	ServerStatURISelector.cc ServerStatURISelector.h\
+	FeedbackURISelector.cc FeedbackURISelector.h\
 	NsCookieParser.cc NsCookieParser.h\
 	CookieStorage.cc CookieStorage.h\
 	SocketBuffer.cc SocketBuffer.h\

src/Makefile.in

@@ -404,8 +404,8 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	Signature.h ServerStat.cc ServerStat.h ServerStatMan.cc \
 	ServerStatMan.h URISelector.h AdaptiveURISelector.cc \
 	AdaptiveURISelector.h InOrderURISelector.cc \
-	InOrderURISelector.h ServerStatURISelector.cc \
-	ServerStatURISelector.h NsCookieParser.cc NsCookieParser.h \
+	InOrderURISelector.h FeedbackURISelector.cc \
+	FeedbackURISelector.h NsCookieParser.cc NsCookieParser.h \
 	CookieStorage.cc CookieStorage.h SocketBuffer.cc \
 	SocketBuffer.h OptionHandlerException.cc \
 	OptionHandlerException.h bencode.cc bencode.h URIResult.cc \
@@ -809,7 +809,7 @@ am__objects_22 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
 	RarestPieceSelector.$(OBJEXT) ChunkedDecoder.$(OBJEXT) \
 	Signature.$(OBJEXT) ServerStat.$(OBJEXT) \
 	ServerStatMan.$(OBJEXT) AdaptiveURISelector.$(OBJEXT) \
-	InOrderURISelector.$(OBJEXT) ServerStatURISelector.$(OBJEXT) \
+	InOrderURISelector.$(OBJEXT) FeedbackURISelector.$(OBJEXT) \
 	NsCookieParser.$(OBJEXT) CookieStorage.$(OBJEXT) \
 	SocketBuffer.$(OBJEXT) OptionHandlerException.$(OBJEXT) \
 	bencode.$(OBJEXT) URIResult.$(OBJEXT) \
@@ -1141,8 +1141,8 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 	Signature.h ServerStat.cc ServerStat.h ServerStatMan.cc \
 	ServerStatMan.h URISelector.h AdaptiveURISelector.cc \
 	AdaptiveURISelector.h InOrderURISelector.cc \
-	InOrderURISelector.h ServerStatURISelector.cc \
-	ServerStatURISelector.h NsCookieParser.cc NsCookieParser.h \
+	InOrderURISelector.h FeedbackURISelector.cc \
+	FeedbackURISelector.h NsCookieParser.cc NsCookieParser.h \
 	CookieStorage.cc CookieStorage.h SocketBuffer.cc \
 	SocketBuffer.h OptionHandlerException.cc \
 	OptionHandlerException.h bencode.cc bencode.h URIResult.cc \
@@ -1389,6 +1389,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exception.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExpatMetalinkProcessor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FeatureConfig.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FeedbackURISelector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/File.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileAllocationCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileAllocationDispatcherCommand.Po@am__quote@
@@ -1502,7 +1503,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerHost.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerStat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerStatMan.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerStatURISelector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Signature.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SignatureMetalinkParserState.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SimpleBtMessage.Po@am__quote@

src/RequestGroupMan.cc

@@ -55,7 +55,7 @@
 #include "ServerStat.h"
 #include "PeerStat.h"
 #include "SegmentMan.h"
-#include "ServerStatURISelector.h"
+#include "FeedbackURISelector.h"
 #include "InOrderURISelector.h"
 #include "AdaptiveURISelector.h"
 #include "Option.h"
@@ -279,7 +279,7 @@ void RequestGroupMan::configureRequestGroup
   const std::string& uriSelectorValue = _option->get(PREF_URI_SELECTOR);
   if(uriSelectorValue == V_FEEDBACK) {
     requestGroup->setURISelector
-      (SharedHandle<URISelector>(new ServerStatURISelector(_serverStatMan)));
+      (SharedHandle<URISelector>(new FeedbackURISelector(_serverStatMan)));
   } else if(uriSelectorValue == V_INORDER) {
     requestGroup->setURISelector
       (SharedHandle<URISelector>(new InOrderURISelector()));

test/ServerStatURISelectorTest.cc → test/FeedbackURISelectorTest.cc

@@ -1,17 +1,20 @@
-#include "ServerStatURISelector.h"
+#include "FeedbackURISelector.h"
+
+#include <iostream>
+
+#include <cppunit/extensions/HelperMacros.h>
+
 #include "Exception.h"
 #include "Util.h"
 #include "array_fun.h"
 #include "ServerStatMan.h"
 #include "ServerStat.h"
-#include <iostream>
-#include <cppunit/extensions/HelperMacros.h>
 
 namespace aria2 {
 
-class ServerStatURISelectorTest:public CppUnit::TestFixture {
+class FeedbackURISelectorTest:public CppUnit::TestFixture {
 
-  CPPUNIT_TEST_SUITE(ServerStatURISelectorTest);
+  CPPUNIT_TEST_SUITE(FeedbackURISelectorTest);
   CPPUNIT_TEST(testSelect_withoutServerStat);
   CPPUNIT_TEST(testSelect);
   CPPUNIT_TEST(testSelect_skipErrorHost);
@@ -22,7 +25,7 @@ private:
 
   SharedHandle<ServerStatMan> ssm;
 
-  SharedHandle<ServerStatURISelector> sel;
+  SharedHandle<FeedbackURISelector> sel;
   
 public:
   void setUp()
@@ -35,7 +38,7 @@ public:
     uris.assign(&urisSrc[0], &urisSrc[arrayLength(urisSrc)]);
     
     ssm.reset(new ServerStatMan());
-    sel.reset(new ServerStatURISelector(ssm));
+    sel.reset(new FeedbackURISelector(ssm));
   }
 
   void tearDown() {}
@@ -48,9 +51,9 @@ public:
 };
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ServerStatURISelectorTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(FeedbackURISelectorTest);
 
-void ServerStatURISelectorTest::testSelect_withoutServerStat()
+void FeedbackURISelectorTest::testSelect_withoutServerStat()
 {
   // Without ServerStat, selector returns first URI
   std::string uri = sel->select(uris);
@@ -58,7 +61,7 @@ void ServerStatURISelectorTest::testSelect_withoutServerStat()
   CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size());
 }
 
-void ServerStatURISelectorTest::testSelect()
+void FeedbackURISelectorTest::testSelect()
 {
   SharedHandle<ServerStat> bravo(new ServerStat("bravo", "http"));
   bravo->updateDownloadSpeed(100000);
@@ -79,7 +82,7 @@ void ServerStatURISelectorTest::testSelect()
   CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size());
 }
 
-void ServerStatURISelectorTest::testSelect_skipErrorHost()
+void FeedbackURISelectorTest::testSelect_skipErrorHost()
 {
   SharedHandle<ServerStat> alphaHTTP(new ServerStat("alpha", "http"));
   alphaHTTP->setError();

test/Makefile.am

@@ -51,7 +51,7 @@ aria2c_SOURCES = AllTest.cc\
 	ChunkedDecoderTest.cc\
 	SignatureTest.cc\
 	ServerStatManTest.cc\
-	ServerStatURISelectorTest.cc\
+	FeedbackURISelectorTest.cc\
 	InOrderURISelectorTest.cc\
 	ServerStatTest.cc\
 	NsCookieParserTest.cc\

test/Makefile.in

@@ -186,7 +186,7 @@ am__aria2c_SOURCES_DIST = AllTest.cc TestUtil.cc TestUtil.h \
 	StringFormatTest.cc ExceptionTest.cc \
 	DownloadHandlerFactoryTest.cc ChunkedDecoderTest.cc \
 	SignatureTest.cc ServerStatManTest.cc \
-	ServerStatURISelectorTest.cc InOrderURISelectorTest.cc \
+	FeedbackURISelectorTest.cc InOrderURISelectorTest.cc \
 	ServerStatTest.cc NsCookieParserTest.cc \
 	DirectDiskAdaptorTest.cc CookieTest.cc CookieStorageTest.cc \
 	TimeTest.cc FtpConnectionTest.cc OptionParserTest.cc \
@@ -352,8 +352,7 @@ am_aria2c_OBJECTS = AllTest.$(OBJEXT) TestUtil.$(OBJEXT) \
 	ProtocolDetectorTest.$(OBJEXT) StringFormatTest.$(OBJEXT) \
 	ExceptionTest.$(OBJEXT) DownloadHandlerFactoryTest.$(OBJEXT) \
 	ChunkedDecoderTest.$(OBJEXT) SignatureTest.$(OBJEXT) \
-	ServerStatManTest.$(OBJEXT) \
-	ServerStatURISelectorTest.$(OBJEXT) \
+	ServerStatManTest.$(OBJEXT) FeedbackURISelectorTest.$(OBJEXT) \
 	InOrderURISelectorTest.$(OBJEXT) ServerStatTest.$(OBJEXT) \
 	NsCookieParserTest.$(OBJEXT) DirectDiskAdaptorTest.$(OBJEXT) \
 	CookieTest.$(OBJEXT) CookieStorageTest.$(OBJEXT) \
@@ -582,7 +581,7 @@ aria2c_SOURCES = AllTest.cc TestUtil.cc TestUtil.h SocketCoreTest.cc \
 	StringFormatTest.cc ExceptionTest.cc \
 	DownloadHandlerFactoryTest.cc ChunkedDecoderTest.cc \
 	SignatureTest.cc ServerStatManTest.cc \
-	ServerStatURISelectorTest.cc InOrderURISelectorTest.cc \
+	FeedbackURISelectorTest.cc InOrderURISelectorTest.cc \
 	ServerStatTest.cc NsCookieParserTest.cc \
 	DirectDiskAdaptorTest.cc CookieTest.cc CookieStorageTest.cc \
 	TimeTest.cc FtpConnectionTest.cc OptionParserTest.cc \
@@ -755,6 +754,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DownloadHelperTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExceptionTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FeatureConfigTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FeedbackURISelectorTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileEntryTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FtpConnectionTest.Po@am__quote@
@@ -803,7 +803,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SequentialPickerTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerStatManTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerStatTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerStatURISelectorTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShareRatioSeedCriteriaTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SharedHandleTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SignatureTest.Po@am__quote@