Skip to content

Wait for spdlog sink to drain before completing tokens #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LimiNode merged 2 commits into from
Dec 4, 2025
Merged

Wait for spdlog sink to drain before completing tokens #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
414dfe5
fix(bench): wait for spdlog sink completion
LimiNode Dec 4, 2025
ba2bfca
Merge branch 'codex/-odr' into codex/investigate-ci-linux-test-failur…
LimiNode Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions bench/adapters/SpdlogAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#ifdef LOGIT_BENCH_HAVE_SPDLOG

#include <algorithm>
#include <chrono>
#include <condition_variable>
#include <filesystem>
#include <fstream>
#include <memory>
Expand Down Expand Up @@ -38,6 +40,7 @@ class SpdlogAdapter::MeasuringSink : public spdlog::sinks::sink {
std::lock_guard<std::mutex> lock(m_pending_mx);
m_pending.clear();
m_retired.clear();
m_pending_count = 0;
}
if (m_sink == SinkKind::File) {
std::filesystem::create_directories("bench/results");
Expand All @@ -53,6 +56,7 @@ class SpdlogAdapter::MeasuringSink : public spdlog::sinks::sink {
void track_token(const LatencyRecorder::Token& token, std::unique_ptr<MessagePayload> payload) {
std::lock_guard<std::mutex> lock(m_pending_mx);
m_pending.push_back(Pending{std::move(payload), token});
++m_pending_count;
}

void log(const spdlog::details::log_msg& msg) override {
Expand Down Expand Up @@ -80,8 +84,10 @@ class SpdlogAdapter::MeasuringSink : public spdlog::sinks::sink {
void complete_pending() {
std::vector<Pending> pending;
{
std::lock_guard<std::mutex> lock(m_pending_mx);
std::unique_lock<std::mutex> lock(m_pending_mx);
m_pending_cv.wait_for(lock, std::chrono::milliseconds(100), [&]{ return m_pending_count == 0; });
pending.swap(m_pending);
m_pending_count = 0;
}

std::vector<std::unique_ptr<MessagePayload>> retired;
Expand Down Expand Up @@ -110,6 +116,8 @@ class SpdlogAdapter::MeasuringSink : public spdlog::sinks::sink {
token = it->token;
owned = std::move(it->payload);
m_pending.erase(it);
--m_pending_count;
if (m_pending_count == 0) m_pending_cv.notify_all();
}
}

Expand All @@ -118,6 +126,10 @@ class SpdlogAdapter::MeasuringSink : public spdlog::sinks::sink {
if (token.active && m_recorder) {
m_recorder->complete(token);
}
if (owned) {
std::lock_guard<std::mutex> lock(m_pending_mx);
m_retired.push_back(std::move(owned));
}
if (m_sink == SinkKind::File) {
std::lock_guard<std::mutex> lock(m_mutex);
if (m_file.is_open()) {
Expand All @@ -136,7 +148,8 @@ class SpdlogAdapter::MeasuringSink : public spdlog::sinks::sink {
};
std::vector<Pending> m_pending;
std::vector<std::unique_ptr<MessagePayload>> m_retired;

std::size_t m_pending_count = 0;
std::condition_variable m_pending_cv;
std::mutex m_pending_mx;
};

Expand Down