Merge pull request #273 from ldorau/Implement_all_get_page_size_functions_on_Windows

Implement all *_get_page_size() functions on Windows

Author: bratpiorka

src/base_alloc/base_alloc_windows.c

@@ -7,15 +7,24 @@
 
 #include <windows.h>
 
+#include "utils_concurrency.h"
+
+static UTIL_ONCE_FLAG Page_size_is_initialized = UTIL_ONCE_FLAG_INIT;
+static size_t Page_size;
+
 void *ba_os_alloc(size_t size) {
     return VirtualAlloc(NULL, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
 }
 
 void ba_os_free(void *ptr, size_t size) { VirtualFree(ptr, 0, MEM_RELEASE); }
 
-size_t ba_os_get_page_size(void) { return 4096; /* TODO */ }
+static void _ba_os_init_page_size(void) {
+    SYSTEM_INFO SystemInfo;
+    GetSystemInfo(&SystemInfo);
+    Page_size = SystemInfo.dwPageSize;
+}
 
-//
-// TODO:
-// 1) implement ba_os_get_page_size()
-//
+size_t ba_os_get_page_size(void) {
+    util_init_once(&Page_size_is_initialized, _ba_os_init_page_size);
+    return Page_size;
+}

src/utils/utils_common.h

@@ -14,11 +14,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifndef _WIN32
-#include <sys/syscall.h>
-#include <unistd.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -35,15 +30,10 @@ extern "C" {
 
 #define __TLS __declspec(thread)
 
-// TODO: implement util_get_page_size() for Windows
-static inline size_t util_get_page_size(void) { return 4096; }
-
 #else /* Linux */
 
 #define __TLS __thread
 
-static inline size_t util_get_page_size(void) { return sysconf(_SC_PAGE_SIZE); }
-
 #endif /* _WIN32 */
 
 // util_env_var - populate the given buffer with the value
@@ -69,6 +59,8 @@ static inline int is_running_in_proxy_lib(void) {
     return util_env_var_has_str("LD_PRELOAD", "libumf_proxy.so");
 }
 
+size_t util_get_page_size(void);
+
 #define NOFUNCTION                                                             \
     do {                                                                       \
     } while (0)

src/utils/utils_posix_common.c

@@ -9,6 +9,13 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+#include "utils_concurrency.h"
+
+static UTIL_ONCE_FLAG Page_size_is_initialized = UTIL_ONCE_FLAG_INIT;
+static size_t Page_size;
 
 int util_env_var(const char *envvar, char *buffer, size_t buffer_size) {
     char *value = getenv(envvar);
@@ -36,3 +43,10 @@ int util_env_var_has_str(const char *envvar, const char *str) {
 
     return 0;
 }
+
+static void _util_get_page_size(void) { Page_size = sysconf(_SC_PAGE_SIZE); }
+
+size_t util_get_page_size(void) {
+    util_init_once(&Page_size_is_initialized, _util_get_page_size);
+    return Page_size;
+}

src/utils/utils_windows_common.c

@@ -11,8 +11,13 @@
 
 #include <processenv.h>
 
+#include "utils_concurrency.h"
+
 #define BUFFER_SIZE 1024
 
+static UTIL_ONCE_FLAG Page_size_is_initialized = UTIL_ONCE_FLAG_INIT;
+static size_t Page_size;
+
 int util_env_var(const char *envvar, char *buffer, size_t buffer_size) {
     int ret = GetEnvironmentVariableA(envvar, buffer, (DWORD)buffer_size);
     if (ret >= buffer_size) {
@@ -30,3 +35,14 @@ int util_env_var_has_str(const char *envvar, const char *str) {
 
     return 0;
 }
+
+static void _util_get_page_size(void) {
+    SYSTEM_INFO SystemInfo;
+    GetSystemInfo(&SystemInfo);
+    Page_size = SystemInfo.dwPageSize;
+}
+
+size_t util_get_page_size(void) {
+    util_init_once(&Page_size_is_initialized, _util_get_page_size);
+    return Page_size;
+}