Fix or add missing include guards

Add UMF_ prefix, where missing.
In bench, tests, and examples use UMF_X_ prefix.

Author: lukaszstolarczuk

benchmark/multithread.hpp

@@ -7,6 +7,9 @@
  *
  */
 
+#ifndef UMF_BENCH_MULTITHREAD_HPP
+#define UMF_BENCH_MULTITHREAD_HPP
+
 #include <algorithm>
 #include <chrono>
 #include <cmath>
@@ -87,3 +90,5 @@ template <typename T> double std_dev(const std::vector<T> &values) {
 }
 
 } // namespace umf_bench
+
+#endif /* UMF_BENCH_MULTITHREAD_HPP */

examples/common/utils_level_zero.h

@@ -7,6 +7,9 @@
  *
  */
 
+#ifndef UMF_EXAMPLE_UTILS_LEVEL_ZERO_H
+#define UMF_EXAMPLE_UTILS_LEVEL_ZERO_H
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -412,3 +415,5 @@ int destroy_context(ze_context_handle_t context) {
 
     return 0;
 }
+
+#endif // UMF_EXAMPLE_UTILS_LEVEL_ZERO_H

src/cpp_helpers.hpp

@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef UMF_HELPERS_H
-#define UMF_HELPERS_H 1
+#ifndef UMF_HELPERS_HPP
+#define UMF_HELPERS_HPP 1
 
 #include <umf/memory_pool.h>
 #include <umf/memory_pool_ops.h>
@@ -164,4 +164,4 @@ template <typename Type> umf_result_t &getPoolLastStatusRef() {
 
 } // namespace umf
 
-#endif /* UMF_HELPERS_H */
+#endif /* UMF_HELPERS_HPP */

src/critnib/critnib.h

@@ -1,14 +1,14 @@
 /*
  *
- * 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
  *
  */
 
-#ifndef CRITNIB_H
-#define CRITNIB_H 1
+#ifndef UMF_CRITNIB_H
+#define UMF_CRITNIB_H 1
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@ void critnib_iter(critnib *c, uintptr_t min, uintptr_t max,
 }
 #endif
 
-#endif
+#endif // UMF_CRITNIB_H

src/utils/utils_math.h

@@ -1,12 +1,15 @@
 /*
  *
- * 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
  *
  */
 
+#ifndef UMF_MATH_H
+#define UMF_MATH_H 1
+
 #include <assert.h>
 #include <stddef.h>
 
@@ -22,3 +25,5 @@ static inline size_t log2Utils(size_t num) { return getLeftmostSetBitPos(num); }
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* UMF_MATH_H */

test/common/base.hpp

@@ -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

test/common/ipc_common.h

@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#ifndef IPC_COMMON_H
-#define IPC_COMMON_H
+#ifndef UMF_TEST_IPC_COMMON_H
+#define UMF_TEST_IPC_COMMON_H
 
 #include <umf/memory_provider.h>
 
@@ -24,4 +24,4 @@ int run_consumer(int port, umf_memory_provider_ops_t *provider_ops,
                  void *provider_params, memcopy_callback_t memcopy_callback,
                  void *memcopy_ctx);
 
-#endif // IPC_COMMON_H
+#endif // UMF_TEST_IPC_COMMON_H

test/common/ipc_os_prov_common.h

@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#ifndef IPC_OS_PROV_COMMON_H
-#define IPC_OS_PROV_COMMON_H
+#ifndef UMF_TEST_IPC_OS_PROV_COMMON_H
+#define UMF_TEST_IPC_OS_PROV_COMMON_H
 
 #include <stdlib.h>
 
 void memcopy(void *dst, const void *src, size_t size, void *context);
 
-#endif // IPC_OS_PROV_COMMON_H
+#endif // UMF_TEST_IPC_OS_PROV_COMMON_H

test/common/multithread_helpers.hpp

@@ -7,6 +7,9 @@
  *
  */
 
+#ifndef UMF_TEST_MULTITHREAD_HELPERS_HPP
+#define UMF_TEST_MULTITHREAD_HELPERS_HPP
+
 #include <condition_variable>
 #include <memory>
 #include <mutex>
@@ -84,3 +87,5 @@ struct syncthreads_barrier {
 };
 
 } // namespace umf_test
+
+#endif /* UMF_TEST_MULTITHREAD_HELPERS_HPP */

test/common/numa_helpers.h

@@ -2,8 +2,8 @@
 // Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef UMF_NUMA_HELPERS_H
-#define UMF_NUMA_HELPERS_H 1
+#ifndef UMF_TEST_NUMA_HELPERS_H
+#define UMF_TEST_NUMA_HELPERS_H 1
 
 #include <numa.h>
 #include <numaif.h>
@@ -31,4 +31,4 @@ int getNumaNodeByPtr(void *ptr) {
 }
 #endif
 
-#endif /* UMF_NUMA_HELPERS_H */
+#endif /* UMF_TEST_NUMA_HELPERS_H */

test/common/pool.hpp

@@ -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

test/common/pool_null.h

@@ -1,9 +1,9 @@
-// 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
 
-#ifndef UMF_NULL_POOL_H
-#define UMF_NULL_POOL_H
+#ifndef UMF_TEST_NULL_POOL_H
+#define UMF_TEST_NULL_POOL_H
 
 #include <umf/memory_pool.h>
 
@@ -17,4 +17,4 @@ extern umf_memory_pool_ops_t UMF_NULL_POOL_OPS;
 }
 #endif
 
-#endif // UMF_NULL_POOL_H
+#endif // UMF_TEST_NULL_POOL_H

test/common/pool_trace.h

@@ -1,9 +1,9 @@
-// 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
 
-#ifndef UMF_TRACE_POOL_H
-#define UMF_TRACE_POOL_H
+#ifndef UMF_TEST_TRACE_POOL_H
+#define UMF_TEST_TRACE_POOL_H
 
 #include <umf/memory_pool.h>
 
@@ -24,4 +24,4 @@ extern umf_memory_pool_ops_t UMF_TRACE_POOL_OPS;
 }
 #endif
 
-#endif // UMF_TRACE_POOL_H
+#endif // UMF_TEST_TRACE_POOL_H

test/common/provider_null.h

@@ -1,9 +1,9 @@
-// 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
 
-#ifndef UMF_NULL_PROVIDER_H
-#define UMF_NULL_PROVIDER_H
+#ifndef UMF_TEST_NULL_PROVIDER_H
+#define UMF_TEST_NULL_PROVIDER_H
 
 #include <umf/memory_provider.h>
 
@@ -17,4 +17,4 @@ extern umf_memory_provider_ops_t UMF_NULL_PROVIDER_OPS;
 }
 #endif
 
-#endif // UMF_NULL_PROVIDER_H
+#endif // UMF_TEST_NULL_PROVIDER_H

test/common/provider_trace.h

@@ -1,9 +1,9 @@
-// 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
 
-#ifndef UMF_TRACE_PROVIDER_H
-#define UMF_TRACE_PROVIDER_H
+#ifndef UMF_TEST_TRACE_PROVIDER_H
+#define UMF_TEST_TRACE_PROVIDER_H
 
 #include <stdbool.h>
 
@@ -27,4 +27,4 @@ extern umf_memory_provider_ops_t UMF_TRACE_PROVIDER_OPS;
 }
 #endif
 
-#endif // UMF_TRACE_PROVIDER_H
+#endif // UMF_TEST_TRACE_PROVIDER_H

test/fuzz/utils.hpp

@@ -2,6 +2,9 @@
 // Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#ifndef UMF_TEST_FUZZ_UTILS_HPP
+#define UMF_TEST_FUZZ_UTILS_HPP
+
 #include "umf/pools/pool_scalable.h"
 #include "umf/providers/provider_os_memory.h"
 #include <fuzzer/FuzzedDataProvider.h>
@@ -75,3 +78,5 @@ struct TestState {
     }
 };
 } // namespace fuzz
+
+#endif /* UMF_TEST_FUZZ_UTILS_HPP */

test/memspaces/memspace_fixtures.hpp

@@ -2,8 +2,9 @@
 // Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef UMF_MEMSPACE_FIXTURES_HPP
-#define UMF_MEMSPACE_FIXTURES_HPP
+#ifndef UMF_TEST_MEMSPACE_FIXTURES_HPP
+#define UMF_TEST_MEMSPACE_FIXTURES_HPP
+
 #include <numa.h>
 #include <numaif.h>
 #include <thread>
@@ -218,4 +219,4 @@ TEST_P(memspaceProviderTest, allocLocalMt) {
     }
 }
 
-#endif /* UMF_MEMSPACE_FIXTURES_HPP */
+#endif /* UMF_TEST_MEMSPACE_FIXTURES_HPP */

test/memspaces/memspace_helpers.hpp

@@ -2,8 +2,8 @@
 // Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef UMF_MEMSPACE_HELPERS_HPP
-#define UMF_MEMSPACE_HELPERS_HPP
+#ifndef UMF_TEST_MEMSPACE_HELPERS_HPP
+#define UMF_TEST_MEMSPACE_HELPERS_HPP
 
 #include "base.hpp"
 #include "memspace_internal.h"
@@ -56,4 +56,4 @@ void getAllocationPolicy(void *ptr, unsigned long maxNodeId, int &mode,
     allocNodeId = static_cast<size_t>(nodeId);
 }
 
-#endif /* UMF_MEMSPACE_HELPERS_HPP */
+#endif /* UMF_TEST_MEMSPACE_HELPERS_HPP */

test/providers/ipc_level_zero_prov_common.h

@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#ifndef IPC_LEVEL_ZERO_PROV_COMMON_H
-#define IPC_LEVEL_ZERO_PROV_COMMON_H
+#ifndef UMF_TEST_IPC_LEVEL_ZERO_PROV_COMMON_H
+#define UMF_TEST_IPC_LEVEL_ZERO_PROV_COMMON_H
 
 #include <stddef.h>
 
 void memcopy(void *dst, const void *src, size_t size, void *context);
 
-#endif // IPC_LEVEL_ZERO_PROV_COMMON_H
+#endif // UMF_TEST_IPC_LEVEL_ZERO_PROV_COMMON_H

test/providers/level_zero_helpers.h

@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  */
 
-#ifndef TEST_COMMON_LEVEL_ZERO_HELPERS_HPP
-#define TEST_COMMON_LEVEL_ZERO_HELPERS_HPP
+#ifndef UMF_TEST_LEVEL_ZERO_HELPERS_H
+#define UMF_TEST_LEVEL_ZERO_HELPERS_H
 
 #include <umf/providers/provider_level_zero.h>
 
@@ -45,4 +45,4 @@ create_level_zero_prov_params(umf_usm_memory_type_t memory_type);
 }
 #endif
 
-#endif // TEST_COMMON_LEVEL_ZERO_HELPERS_HPP
+#endif // UMF_TEST_LEVEL_ZERO_HELPERS_H