Skip to content

Commit 7d4e12b

Browse files
authored
Merge pull request #1413 from lplewa/bracket
use correct includes brackets
2 parents c88938a + fa64645 commit 7d4e12b

16 files changed

+33
-30
lines changed

docs/config/examples.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ First, let's create a memory provider object for coarse-grained allocations.
2929
You have to include the `provider_os_memory.h`_ header with
3030
the OS Memory Provider API::
3131

32-
#include "umf/providers/provider_os_memory.h"
32+
#include <umf/providers/provider_os_memory.h>
3333

3434
Get a pointer to the OS memory provider operations struct::
3535

@@ -74,7 +74,7 @@ Having created a memory ``provider``, you can create a Scalable Memory ``pool``
7474
to be used for fine-grained allocations. You have to include
7575
the `pool_scalable.h`_ header with the Scalable Memory Pool API::
7676

77-
#include "umf/pools/pool_scalable.h"
77+
#include <umf/pools/pool_scalable.h>
7878

7979
Use the default set of operations for the Scalable memory pool
8080
by retrieving an address of the default ops struct::

src/memory_provider.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
#include <stdio.h>
1313
#include <stdlib.h>
1414

15+
#include <umf/base.h>
1516
#include <umf/memory_provider.h>
1617

1718
#include "base_alloc.h"
1819
#include "base_alloc_global.h"
1920
#include "libumf.h"
2021
#include "memory_provider_internal.h"
21-
#include "umf/base.h"
2222
#include "utils_assert.h"
2323

2424
static umf_result_t CTL_SUBTREE_HANDLER(by_handle_provider)(

src/pool/pool_scalable.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
#include <stdio.h>
1414
#include <string.h>
1515

16-
#include <ctl/ctl.h>
17-
#include <memory_pool_internal.h>
1816
#include <umf/memory_pool.h>
1917
#include <umf/memory_pool_ops.h>
2018
#include <umf/memory_provider.h>
2119
#include <umf/pools/pool_scalable.h>
2220

2321
#include "base_alloc_global.h"
22+
#include "ctl/ctl.h"
2423
#include "libumf.h"
24+
#include "memory_pool_internal.h"
2525
#include "pool_scalable_internal.h"
2626
#include "utils_common.h"
2727
#include "utils_concurrency.h"

src/provider/provider_os_memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
#include <assert.h>
9-
#include <ctl/ctl.h>
109
#include <errno.h>
1110
#include <limits.h>
1211

@@ -20,6 +19,7 @@
2019
#include <umf/memory_provider_ops.h>
2120
#include <umf/providers/provider_os_memory.h>
2221

22+
#include "ctl/ctl.h"
2323
#include "utils_assert.h"
2424
// OS Memory Provider requires HWLOC
2525
#if defined(UMF_NO_HWLOC)

src/utils/utils_log.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
*
3-
* Copyright (C) 2024 Intel Corporation
3+
* Copyright (C) 2024-2025 Intel Corporation
44
*
55
* Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
66
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -26,7 +26,7 @@
2626
#include <string.h>
2727
#include <time.h>
2828

29-
#include "umf.h"
29+
#include <umf.h>
3030

3131
#include "utils_assert.h"
3232
#include "utils_common.h"

test/common/test_helpers.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
#include <stdlib.h>
99
#include <string.h>
1010

11+
#include <umf/memory_pool.h>
12+
#include <umf/memory_provider.h>
13+
1114
#include "pool_null.h"
1215
#include "pool_trace.h"
1316
#include "provider_null.h"
14-
#include "umf/memory_pool.h"
15-
#include "umf/memory_provider.h"
1617

1718
#include "test_helpers.h"
1819

test/fuzz/utils.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
// Copyright (C) 2024 Intel Corporation
1+
// Copyright (C) 2024-2025 Intel Corporation
22
// Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

55
#ifndef UMF_TEST_FUZZ_UTILS_HPP
66
#define UMF_TEST_FUZZ_UTILS_HPP
77

8-
#include "umf/pools/pool_scalable.h"
9-
#include "umf/providers/provider_os_memory.h"
108
#include <fuzzer/FuzzedDataProvider.h>
119
#include <iostream>
1210
#include <map>
1311
#include <memory>
1412
#include <vector>
1513

14+
#include <umf/pools/pool_scalable.h>
15+
#include <umf/providers/provider_os_memory.h>
16+
1617
namespace fuzz {
1718

1819
enum FuzzerAPICall : uint8_t {

test/malloc_compliance_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
#include <stdlib.h>
1212
#include <string.h>
1313

14+
#include <umf/memory_pool.h>
15+
1416
#include "malloc_compliance_tests.hpp"
1517
#include "test_helpers.h"
16-
#include "umf/memory_pool.h"
1718

1819
#include "base.hpp"
1920
using umf_test::test;

test/malloc_compliance_tests.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// Copyright (C) 2023 Intel Corporation
1+
// Copyright (C) 2023-2025 Intel Corporation
22
// Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

55
#ifndef UMF_TEST_MALLOC_COMPLIANCE_TESTS_H
66
#define UMF_TEST_MALLOC_COMPLIANCE_TESTS_H
77

8-
#include "umf/memory_pool.h"
8+
#include <umf/memory_pool.h>
99

1010
void malloc_compliance_test(umf_memory_pool_handle_t hPool);
1111
void calloc_compliance_test(umf_memory_pool_handle_t hPool);

test/pools/jemalloc_coarse_devdax.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

5-
#include "umf/pools/pool_jemalloc.h"
6-
#include "umf/providers/provider_devdax_memory.h"
5+
#include <umf/pools/pool_jemalloc.h>
6+
#include <umf/providers/provider_devdax_memory.h>
77

88
#include "pool_coarse.hpp"
99

0 commit comments

Comments
 (0)