File 0001-Fix-compilation-with-glibc-2.34-MINSIGSTKS... of Package clickhouse

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-compilation-with-glibc-2.34-MINSIGSTKSZ-defined-.patch of Package clickhouse

From 95154305177f77d245d33493258e28e5df443fbc Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 7 Oct 2021 00:17:14 +0300
Subject: [PATCH] Fix compilation with glibc 2.34 (MINSIGSTKSZ defined as
 sysconf(_SC_SIGSTKSZ))

In glibc 2.34 MINSIGSTKSZ had been defined to sysconf(_SC_SIGSTKSZ) [1].

[1]: https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53
---
 src/Common/ThreadStatus.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index b1d76c4660..c0190cac58 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -44,7 +44,7 @@ namespace
 struct ThreadStack
 {
     ThreadStack()
-        : data(aligned_alloc(getPageSize(), size))
+        : data(aligned_alloc(getPageSize(), getSize()))
     {
         /// Add a guard page
         /// (and since the stack grows downward, we need to protect the first page).
@@ -56,12 +56,11 @@ struct ThreadStack
         free(data);
     }
 
-    static size_t getSize() { return size; }
+    static size_t getSize() { return std::max<size_t>(16 << 10, MINSIGSTKSZ); }
     void * getData() const { return data; }
 
 private:
     /// 16 KiB - not too big but enough to handle error.
-    static constexpr size_t size = std::max<size_t>(16 << 10, MINSIGSTKSZ);
     void * data;
 };
 
-- 
2.26.2

Places

File 0001-Fix-compilation-with-glibc-2.34-MINSIGSTKSZ-defined-.patch of Package clickhouse

Places