From de6bf577fafabb2930ecc6b7a98eb8ad461bd49d Mon Sep 17 00:00:00 2001
From: Bob Chen <beef9999@qq.com>
Date: Wed, 25 Sep 2024 13:34:22 +0800
Subject: [PATCH] Fix getpagesize() when first used

---
 include/photon/thread/arch.h |  1 +
 thread/arch.cpp              | 23 +++++++++++++++++++++++
 thread/arch.h                | 26 ++++++++++++++++++++++++++
 thread/stack-allocator.cpp   |  3 +--
 thread/thread.cpp            | 11 +++++++----
 5 files changed, 58 insertions(+), 6 deletions(-)
 create mode 120000 include/photon/thread/arch.h
 create mode 100644 thread/arch.cpp
 create mode 100644 thread/arch.h

diff --git a/include/photon/thread/arch.h b/include/photon/thread/arch.h
new file mode 120000
index 00000000..657ef9aa
--- /dev/null
+++ b/include/photon/thread/arch.h
@@ -0,0 +1 @@
+../../../thread/arch.h
\ No newline at end of file
diff --git a/thread/arch.cpp b/thread/arch.cpp
new file mode 100644
index 00000000..10c4faaf
--- /dev/null
+++ b/thread/arch.cpp
@@ -0,0 +1,23 @@
+/*
+Copyright 2022 The Photon Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include "arch.h"
+
+namespace photon {
+
+uint32_t PAGE_SIZE = 0;
+
+}
\ No newline at end of file
diff --git a/thread/arch.h b/thread/arch.h
new file mode 100644
index 00000000..67a8bb0d
--- /dev/null
+++ b/thread/arch.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2022 The Photon Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#pragma once
+
+#include <cstdint>
+
+namespace photon {
+
+// Only available after photon::init() or photon::vcpu_init()
+extern uint32_t PAGE_SIZE;
+
+}
\ No newline at end of file
diff --git a/thread/stack-allocator.cpp b/thread/stack-allocator.cpp
index ccc07d5a..6992e97f 100644
--- a/thread/stack-allocator.cpp
+++ b/thread/stack-allocator.cpp
@@ -20,6 +20,7 @@ limitations under the License.
 #include <errno.h>
 #include <photon/common/alog.h>
 #include <photon/common/utility.h>
+#include <photon/thread/arch.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
@@ -28,8 +29,6 @@ limitations under the License.
 
 namespace photon {
 
-const static size_t PAGE_SIZE = getpagesize();
-
 template <size_t MIN_ALLOCATION_SIZE = 4UL * 1024,
           size_t MAX_ALLOCATION_SIZE = 64UL * 1024 * 1024>
 class PooledStackAllocator {
diff --git a/thread/thread.cpp b/thread/thread.cpp
index 67fd3e53..5541e496 100644
--- a/thread/thread.cpp
+++ b/thread/thread.cpp
@@ -51,6 +51,7 @@ inline int posix_memalign(void** memptr, size_t alignment, size_t size) {
 #include <photon/common/alog.h>
 #include <photon/common/alog-functionptr.h>
 #include <photon/thread/thread-key.h>
+#include <photon/thread/arch.h>
 
 /* notes on the scheduler:
 
@@ -86,8 +87,6 @@ inline int posix_memalign(void** memptr, size_t alignment, size_t size) {
                            #name": "
 #endif
 
-static const size_t PAGE_SIZE = getpagesize();
-
 namespace photon
 {
     inline uint64_t min(uint64_t a, uint64_t b) { return (a<b) ? a : b; }
@@ -929,6 +928,8 @@ R"(
             stack_size = least_stack_size;
         }
         char* ptr = (char*)photon_thread_alloc(stack_size);
+        if (unlikely(!ptr))
+            return nullptr;
         uint64_t p = (uint64_t)ptr + stack_size - sizeof(thread) - randomizer;
         p = align_down(p, 64);
         auto th = new ((char*)p) thread;
@@ -1660,8 +1661,8 @@ R"(
         int ret = thread_usleep_defer(timeout, q, unlock, m);
         auto en = ret < 0 ? errno : 0;
         while (true) {
-            int ret = lock(m);
-            if (ret == 0) break;
+            int lock_ret = lock(m);
+            if (lock_ret == 0) break;
             LOG_ERROR("failed to get mutex lock, ` `, try again", VALUE(ret), ERRNO());
             thread_usleep(1000, nullptr);
         }
@@ -1884,6 +1885,8 @@ R"(
     }
 
     int vcpu_init() {
+        if (unlikely(PAGE_SIZE == 0))
+            PAGE_SIZE = getpagesize();
         RunQ rq;
         if (rq.current) return -1;      // re-init has no side-effect
         char* ptr = nullptr;