2008-08-05 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Implemented download speed based URI selection algorithm.
	Introduced new option --uri-selector.
	If --uri-selector=feedback is given, aria2 uses download speed 
observed
	in the previous downloads and chooses fastest server in the URI 
list.
	Currently at most 10 URIs are considered to introduce 
randomeness for
	finding better servers. The speed is average download speed in 
the
	downloads.
	On the other hand, if --uri-selector=inorder is given, which is 
default,
	URI is tried in order in URI list.
	The usage text for the new option has not been written yet.
	* src/AbstractCommand.cc
	* src/DownloadCommand.cc
	* src/DownloadEngine.cc
	* src/DownloadEngineFactory.cc
	* src/InOrderURISelector.cc
	* src/InOrderURISelector.h
	* src/OptionHandlerFactory.cc
	* src/PeerStat.h
	* src/RequestGroup.cc
	* src/RequestGroup.h
	* src/RequestGroupMan.cc
	* src/RequestGroupMan.h
	* src/SegmentMan.cc
	* src/SegmentMan.h
	* src/ServerStat.cc
	* src/ServerStat.h
	* src/ServerStatMan.cc
	* src/ServerStatMan.h
	* src/ServerStatURISelector.cc
	* src/ServerStatURISelector.h
	* src/URISelector.h
	* src/option_processing.cc
	* src/prefs.cc
	* src/prefs.h
	* test/InOrderURISelectorTest.cc
	* test/RequestGroupManTest.cc
	* test/ServerStatManTest.cc
	* test/ServerStatURISelectorTest.cc

1 files changed, 133 insertions, 0 deletions

diff --git a/src/ServerStat.cc b/src/ServerStat.cc
new file mode 100644
index 00000000..d1782c61
--- /dev/null
+++ b/src/ServerStat.cc
@@ -0,0 +1,133 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2006 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "ServerStat.h"
+#include <ostream>
+
+namespace aria2 {
+
+ServerStat::ServerStat(const std::string& hostname, const std::string& protocol)
+  :
+  _hostname(hostname),
+  _protocol(protocol),
+  _downloadSpeed(0),
+  _status(OK) {}
+
+ServerStat::~ServerStat() {}
+
+const std::string& ServerStat::getHostname() const
+{
+  return _hostname;
+}
+
+const std::string& ServerStat::getProtocol() const
+{
+  return _protocol;
+}
+
+Time ServerStat::getLastUpdated() const
+{
+  return _lastUpdated;
+}
+
+unsigned int ServerStat::getDownloadSpeed() const
+{
+  return _downloadSpeed;
+}
+
+void ServerStat::updateDownloadSpeed(unsigned int downloadSpeed)
+{
+  _downloadSpeed = downloadSpeed;
+  if(downloadSpeed > 0) {
+    _status = OK;
+  }
+  _lastUpdated.reset();
+}
+
+void ServerStat::setStatus(STATUS status)
+{
+  _status = status;
+  _lastUpdated.reset();
+}
+
+ServerStat::STATUS ServerStat::getStatus() const
+{
+  return _status;
+}
+
+bool ServerStat::isOK() const
+{
+  return _status == OK;
+}
+
+void ServerStat::setOK()
+{
+  setStatus(OK);
+}
+
+bool ServerStat::isError() const
+{
+  return _status == ERROR;
+}
+
+void ServerStat::setError()
+{
+  setStatus(ERROR);
+}
+
+bool ServerStat::operator<(const ServerStat& serverStat) const
+{
+  int c = _hostname.compare(serverStat._hostname);
+  if(c == 0) {
+    return _protocol < serverStat._protocol;
+  } else {
+    return c < 0;
+  }
+}
+
+bool ServerStat::operator==(const ServerStat& serverStat) const
+{
+  return _hostname == serverStat._hostname && _protocol == serverStat._protocol;
+}
+
+std::ostream& operator<<(std::ostream& o, const ServerStat& serverStat)
+{
+  o << "host=" << serverStat.getHostname() << ", "
+    << "protocol=" << serverStat.getProtocol() << ", "
+    << "dl_speed=" << serverStat.getDownloadSpeed() << ", "
+    << "status=" << serverStat.getStatus() << "\n";
+  return o;
+}
+
+} // namespace aria2