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/HttpServerCommand.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/HttpServerCommand.cc')
| -rw-r--r-- | src/HttpServerCommand.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/HttpServerCommand.cc b/src/HttpServerCommand.cc index 4a6bec49..f005fc61 100644 --- a/src/HttpServerCommand.cc +++ b/src/HttpServerCommand.cc @@ -47,6 +47,7 @@ #include "Option.h" #include "util.h" #include "DownloadContext.h" +#include "wallclock.h" namespace aria2 { @@ -92,7 +93,7 @@ bool HttpServerCommand::execute() } try { if(_socket->isReadable(0)) { - _timeout.reset(); + _timeout = global::wallclock; SharedHandle<HttpHeader> header; header = _httpServer->receiveRequest(); @@ -127,7 +128,7 @@ bool HttpServerCommand::execute() _e->setNoWait(true); return true; } else { - if(_timeout.elapsed(30)) { + if(_timeout.difference(global::wallclock) >= 30) { logger->info("HTTP request timeout."); return true; } else { |