diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-03-06 08:29:53 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-03-06 08:29:53 +0000 |
| commit | 8d09b069e2b709d8657f5fdbcf2a933515545f39 (patch) | |
| tree | 431bf39e4ce0a90c7fb4804297562c0c4c93c478 /src/PeerAbstractCommand.cc | |
| parent | 7637fd76a27d8a97cd32d7597d5afb3361fe0d28 (diff) | |
2010-03-06 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added Time global::wallclock to cache "current time" to reduce the
call gettimeofday(). Global variables are now in namespace global.
* src/AbstractCommand.cc
* src/ActivePeerConnectionCommand.cc
* src/AdaptiveURISelector.cc
* src/BtLeecherStateChoke.cc
* src/BtLeecherStateChoke.h
* src/BtSeederStateChoke.cc
* src/BtSeederStateChoke.h
* src/BtStopDownloadCommand.cc
* src/ConsoleStatCalc.cc
* src/DHTBucket.cc
* src/DHTGetPeersCommand.cc
* src/DHTMessageTrackerEntry.cc
* src/DHTNode.cc
* src/DHTPeerAnnounceEntry.cc
* src/DHTPeerAnnounceStorage.cc
* src/DHTSetup.cc
* src/DefaultBtAnnounce.cc
* src/DefaultBtInteractive.cc
* src/DefaultBtMessageDispatcher.cc
* src/DefaultPeerStorage.cc
* src/DefaultPieceStorage.cc
* src/DownloadCommand.cc
* src/DownloadEngine.cc
* src/FileEntry.cc
* src/HttpServerBodyCommand.cc
* src/HttpServerCommand.cc
* src/HttpServerResponseCommand.cc
* src/LpdMessageDispatcher.cc
* src/MultiUrlRequestInfo.cc
* src/Peer.cc
* src/Peer.h
* src/PeerAbstractCommand.cc
* src/PeerStat.h
* src/RequestSlot.cc
* src/RequestSlot.h
* src/SegmentMan.cc
* src/ServerStatMan.cc
* src/SleepCommand.cc
* src/SpeedCalc.cc
* src/SpeedCalc.h
* src/TimeA2.cc
* src/TimeA2.h
* src/TimeBasedCommand.cc
* src/TimeSeedCriteria.h
* src/UTMetadataRequestTracker.h
* src/UTPexExtensionMessage.cc
* src/wallclock.h
Diffstat (limited to 'src/PeerAbstractCommand.cc')
| -rw-r--r-- | src/PeerAbstractCommand.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/PeerAbstractCommand.cc b/src/PeerAbstractCommand.cc index f26cec59..0d3c8413 100644 --- a/src/PeerAbstractCommand.cc +++ b/src/PeerAbstractCommand.cc @@ -43,6 +43,7 @@ #include "prefs.h" #include "DownloadFailureException.h" #include "StringFormat.h" +#include "wallclock.h" namespace aria2 { @@ -88,13 +89,13 @@ bool PeerAbstractCommand::execute() (checkSocketIsReadable && _readEvent) || (checkSocketIsWritable && _writeEvent) || _hupEvent) { - checkPoint.reset(); + checkPoint = global::wallclock; } else if(_errorEvent) { throw DL_ABORT_EX (StringFormat(MSG_NETWORK_PROBLEM, socket->getSocketError().c_str()).str()); } - if(checkPoint.elapsed(timeout)) { + if(checkPoint.difference(global::wallclock) >= timeout) { throw DL_ABORT_EX(EX_TIME_OUT); } return executeInternal(); @@ -183,7 +184,7 @@ void PeerAbstractCommand::setNoCheck(bool check) void PeerAbstractCommand::updateKeepAlive() { - checkPoint.reset(); + checkPoint = global::wallclock; } } // namespace aria2 |