Merge pull request #104 from igchor/utils_lib

Create static lib for utils

Author: ldorau

src/CMakeLists.txt

@@ -4,6 +4,8 @@
 
 include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
 
+add_subdirectory(utils)
+
 set(UMF_SOURCES
     memory_pool.c
     memory_provider.c
@@ -15,34 +17,23 @@ set(UMF_SOURCES
 
 set(UMF_SOURCES_LINUX
     provider/provider_os_memory_linux.c
-    utils/utils_posix_concurrency.c
-    utils/utils_posix_math.c
 )
 
 set(UMF_SOURCES_WINDOWS
     provider/provider_os_memory_windows.c
     provider/provider_tracking_windows.cpp
-    utils/utils_windows_concurrency.c
-    utils/utils_windows_math.c
-)
-
-set(UMF_SOURCES_MACOSX
-    utils/utils_posix_concurrency.c
-    utils/utils_posix_math.c
 )
 
-if(LINUX)
-    set(UMF_LIBS numa)
-else()
-    set(UMF_LIBS)
-endif()
-
 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(LINUX)
+    set(UMF_LIBS umf_utils numa)
+else()
+    set(UMF_LIBS umf_utils)
 endif()
 
 if(UMF_BUILD_SHARED_LIBRARY)
@@ -70,10 +61,8 @@ add_library(${PROJECT_NAME}::umf ALIAS umf)
 
 target_include_directories(umf PUBLIC 
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/critnib>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/provider>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 

src/common/umf_helpers.hpp renamed to src/cpp_helpers.hpp

@@ -7,8 +7,8 @@
  *
  */
 
-#include "common.h"
 #include "memory_provider_internal.h"
+#include "utils_common.h"
 
 static __TLS umf_memory_provider_handle_t lastFailedProvider = NULL;
 

src/memory_provider_get_last_failed.c

@@ -6,7 +6,8 @@
 if(UMF_BUILD_LIBUMF_POOL_DISJOINT)
     add_umf_library(NAME disjoint_pool
                     TYPE STATIC
-                    SRCS pool_disjoint.cpp)
+                    SRCS pool_disjoint.cpp
+                    LIBS umf_utils)
 
     add_library(${PROJECT_NAME}::disjoint_pool ALIAS disjoint_pool)
 
@@ -32,7 +33,7 @@ if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
         add_umf_library(NAME jemalloc_pool
                         TYPE STATIC
                         SRCS pool_jemalloc.c
-                        LIBS jemalloc)
+                        LIBS jemalloc umf_utils)
         add_library(${PROJECT_NAME}::jemalloc_pool ALIAS jemalloc_pool)
         install(TARGETS jemalloc_pool
             EXPORT ${PROJECT_NAME}-targets
@@ -48,7 +49,7 @@ if(UMF_BUILD_LIBUMF_POOL_SCALABLE)
         add_umf_library(NAME scalable_pool
                         TYPE STATIC
                         SRCS pool_scalable.c
-                        LIBS dl)
+                        LIBS dl umf_utils)
         add_library(${PROJECT_NAME}::scalable_pool ALIAS scalable_pool)
         install(TARGETS scalable_pool
             EXPORT ${PROJECT_NAME}-targets

src/pool/CMakeLists.txt

@@ -22,9 +22,9 @@
 // TODO: replace with logger?
 #include <iostream>
 
+#include "../cpp_helpers.hpp"
 #include "pool_disjoint.h"
 #include "umf.h"
-#include "umf_helpers.hpp"
 #include "utils_math.h"
 
 typedef struct umf_disjoint_pool_shared_limits_t {

src/pool/pool_disjoint.cpp

@@ -13,7 +13,7 @@
 
 #include <jemalloc/jemalloc.h>
 
-#include "common.h"
+#include "utils_common.h"
 #include <umf/memory_pool.h>
 #include <umf/memory_pool_ops.h>
 #include <umf/pools/pool_jemalloc.h>

src/pool/pool_jemalloc.c

@@ -23,7 +23,7 @@
 
 #include <tbb/scalable_allocator.h>
 
-#include "common.h"
+#include "utils_common.h"
 
 typedef void *(*raw_alloc_tbb_type)(intptr_t, size_t *);
 typedef void (*raw_free_tbb_type)(intptr_t, void *, size_t);

src/pool/pool_scalable.c

@@ -8,7 +8,7 @@
 #ifndef UMF_OS_MEMORY_PROVIDER_INTERNAL_H
 #define UMF_OS_MEMORY_PROVIDER_INTERNAL_H
 
-#include "common.h"
+#include "utils_common.h"
 #include <umf/providers/provider_os_memory.h>
 
 #ifdef __cplusplus

src/provider/provider_os_memory_internal.h

@@ -0,0 +1,36 @@
+# Copyright (C) 2023 Intel Corporation
+# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
+
+set(UMF_UTILS_SOURCES_POSIX
+    utils_posix_concurrency.c
+    utils_posix_math.c
+)
+
+set(UMF_UTILS_SOURCES_WINDOWS
+    utils_windows_concurrency.c
+    utils_windows_math.c
+)
+
+if(LINUX OR MACOSX)
+    set(UMF_UTILS_SOURCES ${UMF_UTILS_SOURCES_POSIX})
+elseif(WINDOWS)
+    set(UMF_UTILS_SOURCES ${UMF_UTILS_SOURCES_WINDOWS})
+endif()
+
+add_umf_library(NAME umf_utils
+                TYPE STATIC
+                SRCS ${UMF_UTILS_SOURCES})
+
+add_library(${PROJECT_NAME}::utils ALIAS umf_utils)
+
+target_include_directories(umf_utils PUBLIC 
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+install(TARGETS umf_utils
+        EXPORT ${PROJECT_NAME}-targets)

src/utils/CMakeLists.txt

@@ -91,5 +91,6 @@ endif()
 
 if(LINUX) # OS-specific functions are implemented only for Linux now
     add_umf_test(NAME provider_os_memory
-                 SRCS provider_os_memory.cpp)
+                 SRCS provider_os_memory.cpp
+                 LIBS umf_utils)
 endif()

src/common/common.h renamed to src/utils/utils_common.h

@@ -22,8 +22,8 @@
 #include <stdlib.h>
 
 #include "base.hpp"
+#include "cpp_helpers.hpp"
 #include "provider.hpp"
-#include "umf_helpers.hpp"
 
 namespace umf_test {
 

test/CMakeLists.txt

@@ -16,7 +16,7 @@
 #include <gtest/gtest.h>
 
 #include "base.hpp"
-#include "umf_helpers.hpp"
+#include "cpp_helpers.hpp"
 
 namespace umf_test {
 

test/common/pool.hpp

@@ -4,9 +4,9 @@
 
 #include "base.hpp"
 
+#include "cpp_helpers.hpp"
 #include "provider_os_memory_internal.h"
 #include "umf/providers/provider_os_memory.h"
-#include "umf_helpers.hpp"
 #include <umf/memory_provider.h>
 
 using umf_test::test;