From d16321686eeda23eed53fa83d40099c2607c5c2c Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Tue, 28 Feb 2023 15:23:48 +0100
Subject: [PATCH] Misc allocator fixes

---
 sysdep/unix/alloc.c | 4 ++++
 sysdep/unix/main.c  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/sysdep/unix/alloc.c b/sysdep/unix/alloc.c
index 8bd3770d..cafcc8dd 100644
--- a/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@ -118,6 +118,8 @@ alloc_page(void)
     return fp;
   }
 
+  ASSERT_DIE(pages_kept_here == 0);
+
   /* If there is any free page kept hot in global storage, we use it. */
   rcu_read_lock();
   fp = atomic_load_explicit(&page_stack, memory_order_acquire);
@@ -176,6 +178,8 @@ free_page(void *ptr)
   if (shutting_down || (pages_kept_here < KEEP_PAGES_MAX_LOCAL))
   {
     atomic_store_explicit(&fp->next, local_page_stack, memory_order_relaxed);
+    local_page_stack = fp;
+
     atomic_fetch_add_explicit(&pages_kept_locally, 1, memory_order_relaxed);
     pages_kept_here++;
     return;
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 1ed57a99..ab076af6 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -935,6 +935,8 @@ main(int argc, char **argv)
   if (parse_and_exit)
     exit(0);
 
+  flush_local_pages();
+
   if (!run_in_foreground)
     {
       pid_t pid = fork();