Merge pull request #118 from PatKamin/pure-c-umf

Refactor the only .cpp file to pure C

Author: bratpiorka

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C) 2023 Intel Corporation
+# Copyright (C) 2023-2024 Intel Corporation
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
@@ -18,8 +18,16 @@ set(UMF_SOURCES
     critnib/critnib.c
 )
 
+set(UMF_SOURCES_LINUX
+    provider/provider_tracking_linux.c
+)
+
 set(UMF_SOURCES_WINDOWS
-    provider/provider_tracking_windows.cpp
+    provider/provider_tracking_windows.c
+)
+
+set(UMF_SOURCES_MACOSX
+    provider/provider_tracking_linux.c
 )
 
 if(UMF_BUILD_OS_MEMORY_PROVIDER)
@@ -38,6 +46,8 @@ if(LINUX)
     set(UMF_SOURCES ${UMF_SOURCES} ${UMF_SOURCES_LINUX})
 elseif(WINDOWS)
     set(UMF_SOURCES ${UMF_SOURCES} ${UMF_SOURCES_WINDOWS})
+elseif(MACOSX)
+    set(UMF_SOURCES ${UMF_SOURCES} ${UMF_SOURCES_MACOSX})
 endif()
 
 if(UMF_BUILD_SHARED_LIBRARY)

src/provider/provider_tracking.c

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2024 Intel Corporation
  *
  * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -18,20 +18,6 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#if !defined(_WIN32)
-critnib *TRACKER = NULL;
-void __attribute__((constructor)) createLibTracker(void) {
-    TRACKER = critnib_new();
-}
-void __attribute__((destructor)) deleteLibTracker(void) {
-    critnib_delete(TRACKER);
-}
-
-umf_memory_tracker_handle_t umfMemoryTrackerGet(void) {
-    return (umf_memory_tracker_handle_t)TRACKER;
-}
-#endif
-
 typedef struct tracker_value_t {
     umf_memory_pool_handle_t pool;
     size_t size;
@@ -233,9 +219,14 @@ umf_memory_provider_ops_t UMF_TRACKING_MEMORY_PROVIDER_OPS = {
 umf_result_t umfTrackingMemoryProviderCreate(
     umf_memory_provider_handle_t hUpstream, umf_memory_pool_handle_t hPool,
     umf_memory_provider_handle_t *hTrackingProvider) {
+    umfTrackingMemoryProviderInit();
+
     umf_tracking_memory_provider_t params;
     params.hUpstream = hUpstream;
     params.hTracker = umfMemoryTrackerGet();
+    if (!params.hTracker) {
+        return UMF_RESULT_ERROR_UNKNOWN;
+    }
     params.pool = hPool;
 
     return umfMemoryProviderCreate(&UMF_TRACKING_MEMORY_PROVIDER_OPS, &params,

src/provider/provider_tracking.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2024 Intel Corporation
  *
  * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -32,6 +32,9 @@ umf_result_t umfTrackingMemoryProviderCreate(
     umf_memory_provider_handle_t hUpstream, umf_memory_pool_handle_t hPool,
     umf_memory_provider_handle_t *hTrackingProvider);
 
+// Initialize critnib for a UMF static library build on Windows
+void umfTrackingMemoryProviderInit(void);
+
 void umfTrackingMemoryProviderGetUpstreamProvider(
     umf_memory_provider_handle_t hTrackingProvider,
     umf_memory_provider_handle_t *hUpstream);

src/provider/provider_tracking_linux.c

@@ -0,0 +1,30 @@
+/*
+ *
+ * Copyright (C) 2024 Intel Corporation
+ *
+ * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ */
+
+#include "critnib.h"
+#include "provider_tracking.h"
+
+#include <stddef.h>
+
+static critnib *TRACKER = NULL;
+
+void __attribute__((constructor)) createLibTracker(void) {
+    TRACKER = critnib_new();
+}
+void __attribute__((destructor)) deleteLibTracker(void) {
+    critnib_delete(TRACKER);
+}
+
+void umfTrackingMemoryProviderInit(void) {
+    // do nothing, additional initialization not needed
+}
+
+umf_memory_tracker_handle_t umfMemoryTrackerGet(void) {
+    return (umf_memory_tracker_handle_t)TRACKER;
+}

src/provider/provider_tracking_windows.c

@@ -0,0 +1,49 @@
+/*
+ *
+ * Copyright (C) 2024 Intel Corporation
+ *
+ * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ */
+
+#include "critnib.h"
+#include "provider_tracking.h"
+
+#include <windows.h>
+
+static critnib *TRACKER = NULL;
+
+#if defined(UMF_SHARED_LIBRARY)
+BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
+    if (fdwReason == DLL_PROCESS_DETACH) {
+        critnib_delete(TRACKER);
+    } else if (fdwReason == DLL_PROCESS_ATTACH) {
+        TRACKER = critnib_new();
+    }
+    return TRUE;
+}
+
+void umfTrackingMemoryProviderInit(void) {
+    // do nothing, additional initialization not needed
+}
+#else
+INIT_ONCE init_once_flag = INIT_ONCE_STATIC_INIT;
+
+static void providerFini(void) { critnib_delete(TRACKER); }
+
+BOOL CALLBACK providerInit(PINIT_ONCE InitOnce, PVOID Parameter,
+                           PVOID *lpContext) {
+    TRACKER = critnib_new();
+    atexit(providerFini);
+    return TRACKER ? TRUE : FALSE;
+}
+
+void umfTrackingMemoryProviderInit(void) {
+    InitOnceExecuteOnce(&init_once_flag, providerInit, NULL, NULL);
+}
+#endif
+
+umf_memory_tracker_handle_t umfMemoryTrackerGet(void) {
+    return (umf_memory_tracker_handle_t)TRACKER;
+}