Skip to content

refactor: consolidate AsyncLogger log enqueue paths #3653

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
wwbmmm merged 1 commit into from
Oct 25, 2026
+18 −20
Merged

refactor: consolidate AsyncLogger log enqueue paths #3653

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 18 additions & 20 deletions src/butil/logging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,10 @@ friend struct DefaultSingletonTraits<AsyncLogger>;
}
}

template <typename T>
void LogInternal(T&& log_info);
void EnqueueLog(LogRequest* log_req, const LogInfo& log_info);
void EnqueueLog(LogRequest* log_req, LogInfo&& log_info);
void LogImpl(LogRequest* log_req);

void Run() override;
Expand Down Expand Up @@ -580,6 +584,15 @@ std::string LogInfo2LogStr(const LogInfo& log_info) {
}

void AsyncLogger::Log(const LogInfo& log_info) {
LogInternal(log_info);
}

void AsyncLogger::Log(LogInfo&& log_info) {
LogInternal(std::move(log_info));
}

template <typename T>
void AsyncLogger::LogInternal(T&& log_info) {
if (log_info.content.empty()) {
return;
}
Expand All @@ -599,30 +612,15 @@ void AsyncLogger::Log(const LogInfo& log_info) {
DoLog(log_info);
return;
}
EnqueueLog(log_req, std::forward<T>(log_info));
}

void AsyncLogger::EnqueueLog(LogRequest* log_req, const LogInfo& log_info) {
log_req->log_info = log_info;
LogImpl(log_req);
}

void AsyncLogger::Log(LogInfo&& log_info) {
if (log_info.content.empty()) {
return;
}

bool is_full = FLAGS_max_async_log_queue_size > 0 &&
_log_request_count.fetch_add(1, butil::memory_order_relaxed) >
FLAGS_max_async_log_queue_size;
if (is_full || _stop.load(butil::memory_order_relaxed)) {
// Async logger is full or stopped, fallback to sync log.
DoLog(log_info);
return;
}

auto log_req = butil::get_object<LogRequest>();
if (!log_req) {
// Async log failed, fallback to sync log.
DoLog(log_info);
return;
}
void AsyncLogger::EnqueueLog(LogRequest* log_req, LogInfo&& log_info) {
ANNOTATE_SCOPED_MEMORY_LEAK;
log_req->log_info = std::move(log_info);
LogImpl(log_req);
Expand Down
Loading