diff options
| author | Stefan Boberg <[email protected]> | 2024-04-26 14:43:40 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2024-04-26 14:43:40 +0200 |
| commit | eedb2cfbbe928b99a8283fea16f0d22b41cf80d0 (patch) | |
| tree | b0d50b7b7a07b347c246d6fee4a0ed311f13eb37 /src/zenserver | |
| parent | oplog iterate chunks content type (#65) (diff) | |
| download | zen-eedb2cfbbe928b99a8283fea16f0d22b41cf80d0.tar.xz zen-eedb2cfbbe928b99a8283fea16f0d22b41cf80d0.zip | |
miscellaneous minor bugfixes (#66)v5.5.0
this change addresses some TSAN warnings for improved robustness and less TSAN noise
- Added dedicated timer for EnqueueStateExitFlagTimer
- Made log formatter `fullformatter` output consistent time stamps across threads
- Made Linux/Mac event implementation TSAN clean
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/zenserver.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver/zenserver.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index 86dbc9617..3fd5d53c7 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -809,8 +809,8 @@ ZenServer::EnqueueSigIntTimer() void ZenServer::EnqueueStateExitFlagTimer() { - m_SigIntTimer.expires_after(std::chrono::milliseconds(500)); - m_SigIntTimer.async_wait([this](const asio::error_code&) { CheckStateExitFlag(); }); + m_StateExitFlagTimer.expires_after(std::chrono::milliseconds(500)); + m_StateExitFlagTimer.async_wait([this](const asio::error_code&) { CheckStateExitFlag(); }); EnsureIoRunner(); } diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h index 550047a5d..0bab4e0a7 100644 --- a/src/zenserver/zenserver.h +++ b/src/zenserver/zenserver.h @@ -98,6 +98,7 @@ private: asio::io_context m_IoContext; asio::steady_timer m_PidCheckTimer{m_IoContext}; asio::steady_timer m_StateMakerTimer{m_IoContext}; + asio::steady_timer m_StateExitFlagTimer{m_IoContext}; asio::steady_timer m_SigIntTimer{m_IoContext}; asio::steady_timer m_StatsReportingTimer{m_IoContext}; ProcessMonitor m_ProcessMonitor; |