diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2011-08-10 01:17:28 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2011-08-10 01:17:28 +0900 |
| commit | e8e3a6f259ab74c486aec9b5ea95d3e1f5068f6c (patch) | |
| tree | 81530df222473d79cf39e007729b0d882441ebfb /src/PeerAbstractCommand.cc | |
| parent | 97f34ab6682d83d9a0265a4291b44eaf45703493 (diff) | |
wallclock is now retrieved using global::wallclock() call.
This is necessary to avoid global variable initialization order
problem.
Diffstat (limited to 'src/PeerAbstractCommand.cc')
| -rw-r--r-- | src/PeerAbstractCommand.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/PeerAbstractCommand.cc b/src/PeerAbstractCommand.cc index 63ec031e..e1541d68 100644 --- a/src/PeerAbstractCommand.cc +++ b/src/PeerAbstractCommand.cc @@ -55,7 +55,7 @@ PeerAbstractCommand::PeerAbstractCommand DownloadEngine* e, const SocketHandle& s) : Command(cuid), - checkPoint_(global::wallclock), + checkPoint_(global::wallclock()), // TODO referring global option timeout_(e->getOption()->getAsInt(PREF_BT_TIMEOUT)), e_(e), @@ -93,13 +93,13 @@ bool PeerAbstractCommand::execute() (checkSocketIsReadable_ && readEventEnabled()) || (checkSocketIsWritable_ && writeEventEnabled()) || hupEventEnabled()) { - checkPoint_ = global::wallclock; + checkPoint_ = global::wallclock(); } else if(errorEventEnabled()) { throw DL_ABORT_EX (fmt(MSG_NETWORK_PROBLEM, socket_->getSocketError().c_str())); } - if(checkPoint_.difference(global::wallclock) >= timeout_) { + if(checkPoint_.difference(global::wallclock()) >= timeout_) { throw DL_ABORT_EX(EX_TIME_OUT); } return executeInternal(); @@ -190,7 +190,7 @@ void PeerAbstractCommand::setNoCheck(bool check) void PeerAbstractCommand::updateKeepAlive() { - checkPoint_ = global::wallclock; + checkPoint_ = global::wallclock(); } void PeerAbstractCommand::createSocket() |