Move getPageSize in common

base/common/CMakeLists.txt

@@ -6,6 +6,7 @@ set (SRCS
     demangle.cpp
     getFQDNOrHostName.cpp
     getMemoryAmount.cpp
+    getPageSize.cpp
     getThreadId.cpp
     JSON.cpp
     LineReader.cpp

base/common/getMemoryAmount.cpp

@@ -1,5 +1,6 @@
 #include <stdexcept>
 #include "common/getMemoryAmount.h"
+#include "common/getPageSize.h"
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -18,7 +19,7 @@ uint64_t getMemoryAmountOrZero()
     if (num_pages <= 0)
         return 0;
 
-    int64_t page_size = sysconf(_SC_PAGESIZE);
+    int64_t page_size = getPageSize();
     if (page_size <= 0)
         return 0;
 

base/common/getPageSize.cpp

@@ -1,8 +1,8 @@
-#include "getPageSize.h"
+#include "common/getPageSize.h"
 
 #include <unistd.h>
 
-long getPageSize()
+Int64 getPageSize()
 {
     return sysconf(_SC_PAGESIZE);
 }

base/common/getPageSize.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include "common/types.h"
+
+/// Get memory page size
+Int64 getPageSize();

base/common/ya.make

@@ -44,6 +44,7 @@ SRCS(
     argsToConfig.cpp
     coverage.cpp
     demangle.cpp
+    getPageSize.cpp
     errnoToString.cpp
     getFQDNOrHostName.cpp
     getMemoryAmount.cpp

src/Common/Allocator.h

@@ -26,11 +26,11 @@
     #define DISABLE_MREMAP 1
 #endif
 #include <common/mremap.h>
+#include <common/getPageSize.h>
 
 #include <Common/MemoryTracker.h>
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
-#include <Common/getPageSize.h>
 
 #include <Common/Allocator_fwd.h>
 

src/Common/ArrayCache.h

@@ -13,10 +13,11 @@
 #include <boost/noncopyable.hpp>
 #include <ext/scope_guard.h>
 
+#include <common/getPageSize.h>
+
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
 #include <Common/formatReadable.h>
-#include <Common/getPageSize.h>
 
 /// Required for older Darwin builds, that lack definition of MAP_ANONYMOUS
 #ifndef MAP_ANONYMOUS

src/Common/MemoryStatisticsOS.cpp

@@ -8,11 +8,11 @@
 
 #include "MemoryStatisticsOS.h"
 
+#include <common/logger_useful.h>
+#include <common/getPageSize.h>
 #include <Common/Exception.h>
-#include <Common/getPageSize.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
-#include <common/logger_useful.h>
 
 
 namespace DB

src/Common/StringSearcher.h

@@ -1,9 +1,9 @@
 #pragma once
 
+#include <common/getPageSize.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/UTF8Helpers.h>
-#include <Common/getPageSize.h>
 #include <Core/Defines.h>
 #include <ext/range.h>
 #include <Poco/Unicode.h>

src/Common/getPageSize.h

@@ -1,4 +0,0 @@
-#pragma once
-
-/// Get memory page size
-long getPageSize();

src/Common/ya.make

@@ -99,7 +99,6 @@ SRCS(
     getMappedArea.cpp
     getMultipleKeysFromConfig.cpp
     getNumberOfPhysicalCPUCores.cpp
-    getPageSize.cpp
     hasLinuxCapability.cpp
     hex.cpp
     isLocalAddress.cpp

src/IO/MMapReadBufferFromFileDescriptor.cpp

@@ -6,7 +6,7 @@
 #include <Common/ProfileEvents.h>
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
-#include <Common/getPageSize.h>
+#include <common/getPageSize.h>
 #include <IO/WriteHelpers.h>
 #include <IO/MMapReadBufferFromFileDescriptor.h>
 

src/IO/tests/o_direct_and_dirty_pages.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 
 #include <common/types.h>
-#include <Common/getPageSize.h>
+#include <common/getPageSize.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>

src/Interpreters/tests/internal_iotop.cpp

@@ -5,7 +5,7 @@
 #include <Common/TaskStatsInfoGetter.h>
 #include <Poco/File.h>
 #include <Common/Stopwatch.h>
-#include <Common/getPageSize.h>
+#include <common/getPageSize.h>
 #include <common/getThreadId.h>
 #include <IO/WriteBufferFromString.h>
 #include <linux/taskstats.h>

utils/iotest/iotest.cpp

@@ -6,7 +6,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
 #include <Common/randomSeed.h>
-#include <Common/getPageSize.h>
+#include <common/getPageSize.h>
 
 #include <cstdlib>
 #include <iomanip>

utils/iotest/iotest_aio.cpp

@@ -14,7 +14,7 @@ int main(int, char **) { return 0; }
 #include <Common/ThreadPool.h>
 #include <Common/Stopwatch.h>
 #include <Common/randomSeed.h>
-#include <Common/getPageSize.h>
+#include <common/getPageSize.h>
 #include <pcg_random.hpp>
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadHelpers.h>