From 0cf949f1b5f40bea93cb93baf9aa1b25c78b6997 Mon Sep 17 00:00:00 2001
From: Andrey Skobtsov <andrewskobcov@yandex.ru>
Date: Thu, 23 Apr 2020 21:46:19 +0300
Subject: [PATCH] A bit of reformatting code

---
 src/Common/ThreadProfileEvents.cpp | 11 ++++++-----
 src/Common/ThreadProfileEvents.h   | 24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/Common/ThreadProfileEvents.cpp b/src/Common/ThreadProfileEvents.cpp
index 97350905bf7..49ad13d751f 100644
--- a/src/Common/ThreadProfileEvents.cpp
+++ b/src/Common/ThreadProfileEvents.cpp
@@ -258,11 +258,6 @@ namespace DB
         current_thread_counters = nullptr;
     }
 
-    Logger * PerfDescriptorsHolder::getLogger()
-    {
-        return &Logger::get("PerfDescriptorsHolder");
-    }
-
     PerfDescriptorsHolder::PerfDescriptorsHolder()
     {
         for (int & descriptor : descriptors)
@@ -285,6 +280,12 @@ namespace DB
             descriptor = -1;
         }
     }
+
+    Logger * PerfDescriptorsHolder::getLogger()
+    {
+        return &Logger::get("PerfDescriptorsHolder");
+    }
+
 #else
 
     void PerfEventsCounters::initializeProfileEvents(PerfEventsCounters &) {}
diff --git a/src/Common/ThreadProfileEvents.h b/src/Common/ThreadProfileEvents.h
index 218969668cf..fb2a5ee4b2c 100644
--- a/src/Common/ThreadProfileEvents.h
+++ b/src/Common/ThreadProfileEvents.h
@@ -153,8 +153,6 @@ struct PerfEventInfo
     ProfileEvents::Event profile_event;
 };
 
-#endif
-
 struct PerfDescriptorsHolder;
 
 struct PerfEventsCounters
@@ -172,17 +170,14 @@ struct PerfEventsCounters
     // that restricts perf_event_open() to processes with the CAP_SYS_ADMIN capability
     // todo: check whether perf_event_open() is available with CAP_SYS_ADMIN
 
-#if defined(__linux__)
     static constexpr size_t NUMBER_OF_RAW_EVENTS = 18;
 
     static const PerfEventInfo raw_events_info[];
-#endif
 
     static void initializeProfileEvents(PerfEventsCounters & counters);
 
     static void finalizeProfileEvents(PerfEventsCounters & counters, ProfileEvents::Counters & profile_events);
 
-#if defined(__linux__)
 private:
     // used to write information about perf unavailability only once for all threads
     static std::atomic<bool> perf_unavailability_logged;
@@ -201,21 +196,30 @@ private:
     static bool initializeThreadLocalEvents(PerfEventsCounters & counters);
 
     [[nodiscard]] UInt64 getRawValue(int event_type, int event_config) const;
-#endif
 };
 
-#if defined(__linux__)
-
 struct PerfDescriptorsHolder {
-    static Logger * getLogger();
-
     int descriptors[PerfEventsCounters::NUMBER_OF_RAW_EVENTS]{};
 
     PerfDescriptorsHolder();
 
     ~PerfDescriptorsHolder();
+
+    static Logger * getLogger();
 };
 
+#else
+
+struct PerfEventsCounters
+{
+    static void initializeProfileEvents(PerfEventsCounters & counters);
+    static void finalizeProfileEvents(PerfEventsCounters & counters, ProfileEvents::Counters & profile_events);
+};
+
+#endif
+
+#if defined(__linux__)
+
 struct TasksStatsCounters
 {
     ::taskstats stat;