diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-18 14:30:35 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-18 14:30:35 +0000 |
| commit | a65c5f165553d4b954151e671b770706a749b727 (patch) | |
| tree | 6429f124ff8b109289fdb911d74cc2128a4c8393 /fnet | |
| parent | 24be87327ebbff702d113084b0ef87fd194c0ef4 (diff) | |
Specify UTC explicit
Diffstat (limited to 'fnet')
| -rw-r--r-- | fnet/src/vespa/fnet/iocomponent.h | 2 | ||||
| -rw-r--r-- | fnet/src/vespa/fnet/transport_thread.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fnet/src/vespa/fnet/iocomponent.h b/fnet/src/vespa/fnet/iocomponent.h index 1a50ccbca73..a6a9e77ec99 100644 --- a/fnet/src/vespa/fnet/iocomponent.h +++ b/fnet/src/vespa/fnet/iocomponent.h @@ -47,7 +47,7 @@ protected: Selector *_ioc_selector; // attached event selector char *_ioc_spec; // connect/listen spec Flags _flags; // Compressed representation of boolean flags; - fastos::TimeStamp _ioc_timestamp; // last I/O activity + fastos::UTCTimeStamp _ioc_timestamp; // last I/O activity std::mutex _ioc_lock; // synchronization std::condition_variable _ioc_cond; // synchronization uint32_t _ioc_refcnt; // reference counter diff --git a/fnet/src/vespa/fnet/transport_thread.cpp b/fnet/src/vespa/fnet/transport_thread.cpp index f350d7c96b4..b850bd6a8c2 100644 --- a/fnet/src/vespa/fnet/transport_thread.cpp +++ b/fnet/src/vespa/fnet/transport_thread.cpp @@ -80,7 +80,7 @@ FNET_TransportThread::RemoveComponent(FNET_IOComponent *comp) void FNET_TransportThread::UpdateTimeOut(FNET_IOComponent *comp) { - comp->_ioc_timestamp = _now; + comp->_ioc_timestamp = fastos::UTCTimeStamp(_now); RemoveComponent(comp); AddComponent(comp); } @@ -520,9 +520,9 @@ FNET_TransportThread::EventLoopIteration() FastOS_Time t = _now; t.SubtractMilliSecs((double)_config._iocTimeOut); - fastos::TimeStamp oldest(t); + fastos::UTCTimeStamp oldest(t); while (_timeOutHead != nullptr && - oldest >= _timeOutHead->_ioc_timestamp) { + oldest > _timeOutHead->_ioc_timestamp) { component = _timeOutHead; RemoveComponent(component); |