Enable Windows build

Author: KFilipek

src/CMakeLists.txt

@@ -26,12 +26,8 @@ add_subdirectory(coarse)
 
 set(UMF_LIBS $<BUILD_INTERFACE:umf_utils> $<BUILD_INTERFACE:coarse>)
 
-if(LINUX OR MACOSX)
-    set(CTL_SOURCES
-        ${CMAKE_CURRENT_SOURCE_DIR}/ctl/alloc.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/ctl/ctl.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/ctl/ctl_debug.c)
-endif()
+set(CTL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ctl/ctl.c
+                ${CMAKE_CURRENT_SOURCE_DIR}/ctl/ctl_debug.c)
 
 if(LINUX)
     set(BA_SOURCES ${BA_SOURCES}

src/ctl/alloc.c

@@ -6,13 +6,20 @@
  *	the library's internal state
  */
 #include "ctl.h"
-#include "alloc.h"
-#include "os.h"
+#include "base_alloc/base_alloc_global.h"
+#include "utils/utils_common.h"
+
 #include <ctype.h>
 #include <limits.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
+#ifdef _WIN32
+#define strtok_r strtok_s
+#endif
+
 #define CTL_MAX_ENTRIES 100
 
 #define MAX_CONFIG_FILE_LEN (1 << 20) /* 1 megabyte */
@@ -40,6 +47,27 @@ struct ctl {
     int first_free;
 };
 
+void *Malloc(size_t sz) { return umf_ba_global_alloc(sz); }
+
+void *Zalloc(size_t sz) {
+    void *ptr = umf_ba_global_alloc(sz);
+    if (ptr) {
+        memset(ptr, 0, sz);
+    }
+    return ptr;
+}
+
+void Free(void *ptr) { umf_ba_global_free(ptr); }
+
+char *Strdup(const char *s) {
+    size_t len = strlen(s) + 1;
+    char *p = umf_ba_global_alloc(len);
+    if (p) {
+        memcpy(p, s, len);
+    }
+    return p;
+}
+
 /*
  * ctl_find_node -- (internal) searches for a matching entry point in the
  *	provided nodes
@@ -315,7 +343,7 @@ static int ctl_parse_query(char *qbuf, char **name, char **value) {
         return -1;
     }
 
-    char *sptr;
+    char *sptr = NULL;
     *name = strtok_r(qbuf, CTL_NAME_VALUE_SEPARATOR, &sptr);
     if (*name == NULL) {
         return -1;
@@ -389,13 +417,14 @@ int ctl_load_config_from_string(struct ctl *ctl, void *ctx,
  * This function opens up the config file, allocates a buffer of size equal to
  * the size of the file, reads its content and sanitizes it for ctl_load_config.
  */
+#ifdef WINDOWS_API_NEEDED
 int ctl_load_config_from_file(struct ctl *ctl, void *ctx,
                               const char *cfg_file) {
     int ret = -1;
     long fsize = 0;
     char *buf = NULL;
 
-    FILE *fp = os_fopen(cfg_file, "r");
+    FILE *fp = utils_file_open(cfg_file, "r");
     if (fp == NULL) {
         return ret;
     }
@@ -446,6 +475,7 @@ int ctl_load_config_from_file(struct ctl *ctl, void *ctx,
     (void)fclose(fp);
     return ret;
 }
+#endif
 
 /*
  * ctl_new -- allocates and initializes ctl data structures

src/ctl/alloc.h

@@ -4,8 +4,8 @@
 /*
  * ctl_debug.h -- definitions for CTL test
  */
-#ifndef LIBPMEMOBJ_CTL_DEBUG_H
-#define LIBPMEMOBJ_CTL_DEBUG_H 1
+#ifndef CTL_DEBUG_H
+#define CTL_DEBUG_H 1
 
 #include "ctl.h"
 

src/ctl/ctl.c

@@ -114,4 +114,10 @@ EXPORTS
     umfScalablePoolParamsCreate
     umfScalablePoolParamsDestroy
     umfScalablePoolParamsSetGranularity
-    umfScalablePoolParamsSetKeepAllMemory
+    umfScalablePoolParamsSetKeepAllMemory
+    initialize_debug_ctl
+    get_debug_ctl
+    ctl_load_config_from_string
+    ctl_query
+    debug_ctl_register
+    deinitialize_debug_ctl

src/ctl/ctl_debug.h

@@ -192,12 +192,12 @@ add_umf_test(
     SRCS utils/utils_log.cpp ${UMF_UTILS_SOURCES}
     LIBS ${UMF_LOGGER_LIBS})
 
-if(LINUX OR MACOSX)
-    add_umf_test(
-        NAME ctl
-        SRCS ctl/test.cpp
-        LIBS ${UMF_UTILS_FOR_TEST})
-endif()
+# if(LINUX OR MACOSX)
+add_umf_test(
+    NAME ctl
+    SRCS ctl/test.cpp
+    LIBS ${UMF_UTILS_FOR_TEST})
+# endif()
 
 add_umf_test(
     NAME utils_common