weaselab/weaseldb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move PerThreadState to per-thread arenas

Browse Source
This commit is contained in:
Andrew Noyes
2025-09-03 13:16:35 -04:00
parent f067f4e85b
commit 54d06c654f
1 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/metric.cpp
View File

@@ -244,7 +244,16 @@ template <> struct Family<Counter>::State {
std::string_view help; std::string_view help;
struct PerThreadState { struct PerThreadState {
std::unordered_map<LabelsKey, Counter::State *> instances; std::unordered_map<
LabelsKey, Counter::State *, std::hash<LabelsKey>,
std::equal_to<LabelsKey>,
ArenaStlAllocator<std::pair<const LabelsKey, Counter::State *>>>
instances;
explicit PerThreadState(ArenaAllocator &arena)
: instances(
ArenaStlAllocator<std::pair<const LabelsKey, Counter::State *>>(
&arena)) {}
}; };
std::unordered_map<std::thread::id, PerThreadState> per_thread_state; std::unordered_map<std::thread::id, PerThreadState> per_thread_state;
@@ -296,7 +305,16 @@ template <> struct Family<Histogram>::State {
ArenaVector<double> buckets; ArenaVector<double> buckets;
struct PerThreadState { struct PerThreadState {
std::unordered_map<LabelsKey, Histogram::State *> instances; std::unordered_map<
LabelsKey, Histogram::State *, std::hash<LabelsKey>,
std::equal_to<LabelsKey>,
ArenaStlAllocator<std::pair<const LabelsKey, Histogram::State *>>>
instances;
explicit PerThreadState(ArenaAllocator &arena)
: instances(
ArenaStlAllocator<std::pair<const LabelsKey, Histogram::State *>>(
&arena)) {}
}; };
std::unordered_map<std::thread::id, PerThreadState> per_thread_state; std::unordered_map<std::thread::id, PerThreadState> per_thread_state;
@@ -588,9 +606,16 @@ struct Metric {
// Ensure thread state exists // Ensure thread state exists
auto thread_id = std::this_thread::get_id(); auto thread_id = std::this_thread::get_id();
// Thread state is automatically created by operator[] auto per_thread_it = family->p->per_thread_state.find(thread_id);
if (per_thread_it == family->p->per_thread_state.end()) {
// Create new PerThreadState with thread-local arena
auto result = family->p->per_thread_state.emplace(
thread_id,
Family<Counter>::State::PerThreadState(get_thread_local_arena()));
per_thread_it = result.first;
}
auto &ptr = family->p->per_thread_state[thread_id].instances[key]; auto &ptr = per_thread_it->second.instances[key];
if (!ptr) { if (!ptr) {
ptr = get_thread_local_arena().construct<Counter::State>(); ptr = get_thread_local_arena().construct<Counter::State>();
ptr->value = 0.0; ptr->value = 0.0;
@@ -642,9 +667,16 @@ struct Metric {
// Ensure thread state exists // Ensure thread state exists
auto thread_id = std::this_thread::get_id(); auto thread_id = std::this_thread::get_id();
// Thread state is automatically created by operator[] auto per_thread_it = family->p->per_thread_state.find(thread_id);
if (per_thread_it == family->p->per_thread_state.end()) {
// Create new PerThreadState with thread-local arena
auto result = family->p->per_thread_state.emplace(
thread_id,
Family<Histogram>::State::PerThreadState(get_thread_local_arena()));
per_thread_it = result.first;
}
auto &ptr = family->p->per_thread_state[thread_id].instances[key]; auto &ptr = per_thread_it->second.instances[key];
if (!ptr) { if (!ptr) {
ptr = get_thread_local_arena().construct<Histogram::State>(); ptr = get_thread_local_arena().construct<Histogram::State>();