* syscalls.cc (getpagesize): Save pagesize in global variable to

        avoid calling GetSystemInfo too often.
        * heap.cc (getpagesize): Eliminate.
        (heap_init): Use getpagesize function from syscalls.cc.

1 files changed, 9 insertions, 0 deletions

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 0e6b631fa..df5103809 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1353,10 +1353,19 @@ getdtablesize ()
   return fdtab.size;
 }
 
+static DWORD sys_page_size = 0;
+
 extern "C" size_t
 getpagesize ()
 {
   return sysconf (_SC_PAGESIZE);
+  if (!sys_page_size)
+    {
+      SYSTEM_INFO si;
+      GetSystemInfo(&si);
+      sys_page_size = si.dwPageSize;
+    }
+  return (int)sys_page_size;
 }
 
 /* FIXME: not all values are correct... */