diff options
| -rw-r--r-- | fnet/src/vespa/fnet/transport_thread.cpp | 7 | ||||
| -rw-r--r-- | fnet/src/vespa/fnet/transport_thread.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/fnet/src/vespa/fnet/transport_thread.cpp b/fnet/src/vespa/fnet/transport_thread.cpp index 1200d2ad6f9..d61eaffa24f 100644 --- a/fnet/src/vespa/fnet/transport_thread.cpp +++ b/fnet/src/vespa/fnet/transport_thread.cpp @@ -398,9 +398,8 @@ FNET_TransportThread::InitEventLoop() return true; } - void -FNET_TransportThread::handle_wakeup() +FNET_TransportThread::handle_wakeup_events() { { std::lock_guard<std::mutex> guard(_lock); @@ -481,11 +480,11 @@ FNET_TransportThread::EventLoopIteration() // sample current time (performed once per event loop iteration) _now = clock::now(); + handle_wakeup_events(); + // handle io-events _selector.dispatch(*this); - handle_wakeup(); - // handle IOC time-outs if (_config._iocTimeOut > 0) { time_point oldest = (_now - std::chrono::milliseconds(_config._iocTimeOut)); diff --git a/fnet/src/vespa/fnet/transport_thread.h b/fnet/src/vespa/fnet/transport_thread.h index 966ffb849e0..b4319d4e2bc 100644 --- a/fnet/src/vespa/fnet/transport_thread.h +++ b/fnet/src/vespa/fnet/transport_thread.h @@ -172,6 +172,8 @@ private: return _shutdown.load(std::memory_order_relaxed); } + void handle_wakeup_events(); + public: FNET_TransportThread(const FNET_TransportThread &) = delete; FNET_TransportThread &operator=(const FNET_TransportThread &) = delete; @@ -456,8 +458,8 @@ public: void WaitFinished(); - // selector call-back for selector wakeup - void handle_wakeup(); + // Empty selector call-back for selector wakeup + void handle_wakeup() { } // selector call-back for io-events void handle_event(FNET_IOComponent &ctx, bool read, bool write); |