2010-04-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Use global::wallclock
	* src/DHTBucket.cc
	* src/DHTMessageTrackerEntry.cc
	* src/DHTMessageTrackerEntry.h
	* src/DefaultBtInteractive.cc
	* src/Peer.cc
	* src/PeerAbstractCommand.cc
	* src/PeerStat.h
	* src/RequestSlot.h
	* src/TimeBasedCommand.cc

ChangeLog

@@ -1,3 +1,16 @@
+2010-04-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Use global::wallclock
+	* src/DHTBucket.cc
+	* src/DHTMessageTrackerEntry.cc
+	* src/DHTMessageTrackerEntry.h
+	* src/DefaultBtInteractive.cc
+	* src/Peer.cc
+	* src/PeerAbstractCommand.cc
+	* src/PeerStat.h
+	* src/RequestSlot.h
+	* src/TimeBasedCommand.cc
+
 2010-04-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Use clock_gettime(CLOCK_MONOTONIC, ...) if it is available and

src/DHTBucket.cc

@@ -55,6 +55,7 @@ DHTBucket::DHTBucket(size_t prefixLength,
                      const SharedHandle<DHTNode>& localNode):
   _prefixLength(prefixLength),
   _localNode(localNode),
+  _lastUpdated(global::wallclock),
   _logger(LogFactory::getInstance())
 {
   memcpy(_max, max, DHT_ID_LENGTH);
@@ -64,6 +65,7 @@ DHTBucket::DHTBucket(size_t prefixLength,
 DHTBucket::DHTBucket(const SharedHandle<DHTNode>& localNode):
   _prefixLength(0),
   _localNode(localNode),
+  _lastUpdated(global::wallclock),
   _logger(LogFactory::getInstance())
 {
   memset(_max, 0xff, DHT_ID_LENGTH);

src/DHTMessageTrackerEntry.cc

@@ -49,6 +49,7 @@ DHTMessageTrackerEntry::DHTMessageTrackerEntry(const SharedHandle<DHTMessage>& s
   _transactionID(sentMessage->getTransactionID()),
   _messageType(sentMessage->getMessageType()),
   _callback(callback),
+  _dispatchedTime(global::wallclock),
   _timeout(timeout)
 {}
 

src/DHTMessageTrackerEntry.h

@@ -36,10 +36,13 @@
 #define _D_DHT_MESSAGE_TRACKER_ENTRY_H_
 
 #include "common.h"
+
+#include <string>
+
 #include "SharedHandle.h"
 #include "DHTConstants.h"
 #include "TimerA2.h"
-#include <string>
+#include "wallclock.h"
 
 namespace aria2 {
 
@@ -89,7 +92,7 @@ public:
 
   int64_t getElapsedMillis() const
   {
-    return _dispatchedTime.differenceInMillis();
+    return _dispatchedTime.differenceInMillis(global::wallclock);
   }
 };
 

src/DefaultBtInteractive.cc

@@ -85,6 +85,12 @@ DefaultBtInteractive::DefaultBtInteractive
   _metadataGetMode(false),
   logger(LogFactory::getInstance()),
   allowedFastSetSize(10),
+  haveTimer(global::wallclock),
+  keepAliveTimer(global::wallclock),
+  floodingTimer(global::wallclock),
+  inactiveTimer(global::wallclock),
+  _pexTimer(global::wallclock),
+  _perSecTimer(global::wallclock),
   keepAliveInterval(120),
   _utPexEnabled(false),
   _dhtEnabled(false),

src/Peer.cc

@@ -50,6 +50,7 @@ namespace aria2 {
 Peer::Peer(std::string ipaddr, uint16_t port, bool incoming):
   ipaddr(ipaddr),
   port(port),
+  _firstContactTime(global::wallclock),
   _badConditionStartTime(0),
   _seeder(false),
   _res(0),

src/PeerAbstractCommand.cc

@@ -53,6 +53,7 @@ PeerAbstractCommand::PeerAbstractCommand(cuid_t cuid,
                                          DownloadEngine* e,
                                          const SocketHandle& s):
   Command(cuid),
+  checkPoint(global::wallclock),
   e(e),
   socket(s),
   peer(peer),

src/PeerStat.h

@@ -42,6 +42,7 @@
 #include "SpeedCalc.h"
 #include "SharedHandle.h"
 #include "Command.h"
+#include "wallclock.h"
 
 namespace aria2 {
 
@@ -70,6 +71,7 @@ public:
     cuid(cuid),
     _hostname(hostname),
     _protocol(protocol),
+    downloadStartTime(global::wallclock),
     status(PeerStat::IDLE),
     _avgDownloadSpeed(0),
     _avgUploadSpeed(0),
@@ -132,7 +134,7 @@ public:
   void reset() {
     downloadSpeed.reset();
     uploadSpeed.reset();
-    downloadStartTime.reset();
+    downloadStartTime = global::wallclock;
     status = PeerStat::IDLE;
   }
 

src/RequestSlot.h

@@ -83,7 +83,8 @@ public:
     blockIndex(requestSlot.blockIndex),
     _piece(requestSlot._piece) {}
 
-  RequestSlot():index(0), begin(0), length(0), blockIndex(0) {}
+  RequestSlot():dispatchedTime(0), index(0), begin(0), length(0), blockIndex(0)
+  {}
 
   ~RequestSlot() {}
 

src/TimeBasedCommand.cc

@@ -42,7 +42,7 @@ TimeBasedCommand::TimeBasedCommand(cuid_t cuid, DownloadEngine* e,
                                    time_t interval,
                                    bool routineCommand):
   Command(cuid), _e(e),_exit(false), _interval(interval),
-  _routineCommand(routineCommand) {}
+  _routineCommand(routineCommand), _checkPoint(global::wallclock) {}
 
 TimeBasedCommand::~TimeBasedCommand() {}