From f02e08629eb293f4ee895435c466cf04d8a95c7c Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 11 Apr 2010 08:57:16 +0000 Subject: [PATCH] 2010-04-11 Tatsuhiro Tsujikawa 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 | 13 +++++++++++++ src/DHTBucket.cc | 2 ++ src/DHTMessageTrackerEntry.cc | 1 + src/DHTMessageTrackerEntry.h | 7 +++++-- src/DefaultBtInteractive.cc | 6 ++++++ src/Peer.cc | 1 + src/PeerAbstractCommand.cc | 1 + src/PeerStat.h | 4 +++- src/RequestSlot.h | 3 ++- src/TimeBasedCommand.cc | 2 +- 10 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f756a2ed..7ff4f945 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2010-04-11 Tatsuhiro Tsujikawa + + 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 Use clock_gettime(CLOCK_MONOTONIC, ...) if it is available and diff --git a/src/DHTBucket.cc b/src/DHTBucket.cc index 643f919b..1f31e4cf 100644 --- a/src/DHTBucket.cc +++ b/src/DHTBucket.cc @@ -55,6 +55,7 @@ DHTBucket::DHTBucket(size_t prefixLength, const SharedHandle& 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& localNode): _prefixLength(0), _localNode(localNode), + _lastUpdated(global::wallclock), _logger(LogFactory::getInstance()) { memset(_max, 0xff, DHT_ID_LENGTH); diff --git a/src/DHTMessageTrackerEntry.cc b/src/DHTMessageTrackerEntry.cc index cdbe7f62..97a1608c 100644 --- a/src/DHTMessageTrackerEntry.cc +++ b/src/DHTMessageTrackerEntry.cc @@ -49,6 +49,7 @@ DHTMessageTrackerEntry::DHTMessageTrackerEntry(const SharedHandle& s _transactionID(sentMessage->getTransactionID()), _messageType(sentMessage->getMessageType()), _callback(callback), + _dispatchedTime(global::wallclock), _timeout(timeout) {} diff --git a/src/DHTMessageTrackerEntry.h b/src/DHTMessageTrackerEntry.h index 1cf979be..9a0b5d6b 100644 --- a/src/DHTMessageTrackerEntry.h +++ b/src/DHTMessageTrackerEntry.h @@ -36,10 +36,13 @@ #define _D_DHT_MESSAGE_TRACKER_ENTRY_H_ #include "common.h" + +#include + #include "SharedHandle.h" #include "DHTConstants.h" #include "TimerA2.h" -#include +#include "wallclock.h" namespace aria2 { @@ -89,7 +92,7 @@ public: int64_t getElapsedMillis() const { - return _dispatchedTime.differenceInMillis(); + return _dispatchedTime.differenceInMillis(global::wallclock); } }; diff --git a/src/DefaultBtInteractive.cc b/src/DefaultBtInteractive.cc index a17e6dca..b89728cf 100644 --- a/src/DefaultBtInteractive.cc +++ b/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), diff --git a/src/Peer.cc b/src/Peer.cc index 8913d254..9a06a9af 100644 --- a/src/Peer.cc +++ b/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), diff --git a/src/PeerAbstractCommand.cc b/src/PeerAbstractCommand.cc index 7d828583..b794447a 100644 --- a/src/PeerAbstractCommand.cc +++ b/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), diff --git a/src/PeerStat.h b/src/PeerStat.h index 087a4f17..beeea024 100644 --- a/src/PeerStat.h +++ b/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; } diff --git a/src/RequestSlot.h b/src/RequestSlot.h index 6d3d75a8..c92dbf9b 100644 --- a/src/RequestSlot.h +++ b/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() {} diff --git a/src/TimeBasedCommand.cc b/src/TimeBasedCommand.cc index cfd7f2d2..01c165ff 100644 --- a/src/TimeBasedCommand.cc +++ b/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() {}