base: never-destroy tls_queues to fix an exit-time mutex crash#213
Merged
Conversation
A static `MonitoredTimer` (and similar globals) calls
DeleteThreadOutOfDutyCallback in its destructor during static destruction, which
locks the `tls_queues` ThreadLocal's internal mutex. `tls_queues` was a plain
namespace static, so on macOS it could already be destroyed by then, and
std::mutex::lock() throws std::system_error EINVAL ("mutex lock failed") ->
std::terminate at process exit. monitoring_test reproduced this reliably
(all cases pass, then SIGABRT on shutdown).
Wrap it in NeverDestroyed, exactly as GetGlobalQueue() already does in the same
file, so the lock stays valid for the whole process lifetime. Leaking it is
harmless (the OS reclaims it at exit).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A static
MonitoredTimer(and similar globals) callsDeleteThreadOutOfDutyCallbackin its destructor during static destruction, which locks thetls_queuesThreadLocal's internal mutex.tls_queueswas a plain namespace static, so on macOS it could already be destroyed by then —std::mutex::lock()then throwsstd::system_errorEINVAL ("mutex lock failed") →std::terminateat process exit.monitoring_testreproduced this reliably (all cases pass, then SIGABRT on shutdown).Wrap it in
NeverDestroyed, exactly asGetGlobalQueue()already does in the same file, so the lock stays valid for the whole process lifetime. Leaking it is harmless (the OS reclaims it at exit).Verified: monitoring_test, monitoring_with_global_tags_test, out_of_duty_callback_test all pass; the shutdown SIGABRT is gone.