From 5217fd795226c651343998ad98ff208aaecc2be7 Mon Sep 17 00:00:00 2001 From: Andrey Skobtsov Date: Thu, 21 May 2020 23:27:33 +0300 Subject: [PATCH] Renamed `counters_id` to `latest_counters_id` to be more specific about what this variable holds --- src/Common/ThreadProfileEvents.cpp | 4 ++-- src/Common/ThreadProfileEvents.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Common/ThreadProfileEvents.cpp b/src/Common/ThreadProfileEvents.cpp index dd00d3b9eb7..01a0e9f70e7 100644 --- a/src/Common/ThreadProfileEvents.cpp +++ b/src/Common/ThreadProfileEvents.cpp @@ -169,7 +169,7 @@ const PerfEventInfo PerfEventsCounters::raw_events_info[] = { #undef HARDWARE_EVENT -std::atomic PerfEventsCounters::counters_id = 0; +std::atomic PerfEventsCounters::latest_counters_id = 0; thread_local PerfDescriptorsHolder PerfEventsCounters::thread_events_descriptors_holder{}; thread_local std::optional PerfEventsCounters::current_thread_counters_id = std::nullopt; @@ -546,7 +546,7 @@ void PerfEventsCounters::closeEventDescriptors() thread_events_descriptors_holder.releaseResources(); } -PerfEventsCounters::PerfEventsCounters(): id(counters_id++) {} +PerfEventsCounters::PerfEventsCounters(): id(latest_counters_id++) {} PerfDescriptorsHolder::PerfDescriptorsHolder() { diff --git a/src/Common/ThreadProfileEvents.h b/src/Common/ThreadProfileEvents.h index c9ee7076cb6..931f2113ffd 100644 --- a/src/Common/ThreadProfileEvents.h +++ b/src/Common/ThreadProfileEvents.h @@ -200,7 +200,7 @@ private: using Id = UInt64; using ParsedEvents = std::pair>; - static std::atomic counters_id; + static std::atomic latest_counters_id; static thread_local PerfDescriptorsHolder thread_events_descriptors_holder; static thread_local std::optional current_thread_counters_id;