Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/config/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ First, let's create a memory provider object for coarse-grained allocations.
You have to include the `provider_os_memory.h`_ header with
the OS Memory Provider API::

#include "umf/providers/provider_os_memory.h"
#include <umf/providers/provider_os_memory.h>

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

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

#include "umf/pools/pool_scalable.h"
#include <umf/pools/pool_scalable.h>

Use the default set of operations for the Scalable memory pool
by retrieving an address of the default ops struct::
Expand Down
2 changes: 1 addition & 1 deletion src/memory_provider.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#include <stdio.h>
#include <stdlib.h>

#include <umf/base.h>
#include <umf/memory_provider.h>

#include "base_alloc.h"
#include "base_alloc_global.h"
#include "libumf.h"
#include "memory_provider_internal.h"
#include "umf/base.h"
#include "utils_assert.h"

static umf_result_t CTL_SUBTREE_HANDLER(by_handle_provider)(
Expand Down
4 changes: 2 additions & 2 deletions src/pool/pool_scalable.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
#include <stdio.h>
#include <string.h>

#include <ctl/ctl.h>
#include <memory_pool_internal.h>
#include <umf/memory_pool.h>
#include <umf/memory_pool_ops.h>
#include <umf/memory_provider.h>
#include <umf/pools/pool_scalable.h>

#include "base_alloc_global.h"
#include "ctl/ctl.h"
#include "libumf.h"
#include "memory_pool_internal.h"
#include "pool_scalable_internal.h"
#include "utils_common.h"
#include "utils_concurrency.h"
Expand Down
2 changes: 1 addition & 1 deletion src/provider/provider_os_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/

#include <assert.h>
#include <ctl/ctl.h>
#include <errno.h>
#include <limits.h>

Expand All @@ -20,6 +19,7 @@
#include <umf/memory_provider_ops.h>
#include <umf/providers/provider_os_memory.h>

#include "ctl/ctl.h"
#include "utils_assert.h"
// OS Memory Provider requires HWLOC
#if defined(UMF_NO_HWLOC)
Expand Down
4 changes: 2 additions & 2 deletions src/utils/utils_log.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (C) 2024 Intel Corporation
* Copyright (C) 2024-2025 Intel Corporation
*
* Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
Expand All @@ -26,7 +26,7 @@
#include <string.h>
#include <time.h>

#include "umf.h"
#include <umf.h>

#include "utils_assert.h"
#include "utils_common.h"
Expand Down
5 changes: 3 additions & 2 deletions test/common/test_helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
#include <stdlib.h>
#include <string.h>

#include <umf/memory_pool.h>
#include <umf/memory_provider.h>

#include "pool_null.h"
#include "pool_trace.h"
#include "provider_null.h"
#include "umf/memory_pool.h"
#include "umf/memory_provider.h"

#include "test_helpers.h"

Expand Down
7 changes: 4 additions & 3 deletions test/fuzz/utils.hpp
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
// Copyright (C) 2024 Intel Corporation
// Copyright (C) 2024-2025 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_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>
#include <iostream>
#include <map>
#include <memory>
#include <vector>

#include <umf/pools/pool_scalable.h>
#include <umf/providers/provider_os_memory.h>

namespace fuzz {

enum FuzzerAPICall : uint8_t {
Expand Down
3 changes: 2 additions & 1 deletion test/malloc_compliance_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
#include <stdlib.h>
#include <string.h>

#include <umf/memory_pool.h>

#include "malloc_compliance_tests.hpp"
#include "test_helpers.h"
#include "umf/memory_pool.h"

#include "base.hpp"
using umf_test::test;
Expand Down
4 changes: 2 additions & 2 deletions test/malloc_compliance_tests.hpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright (C) 2023 Intel Corporation
// Copyright (C) 2023-2025 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_TEST_MALLOC_COMPLIANCE_TESTS_H
#define UMF_TEST_MALLOC_COMPLIANCE_TESTS_H

#include "umf/memory_pool.h"
#include <umf/memory_pool.h>

void malloc_compliance_test(umf_memory_pool_handle_t hPool);
void calloc_compliance_test(umf_memory_pool_handle_t hPool);
Expand Down
4 changes: 2 additions & 2 deletions test/pools/jemalloc_coarse_devdax.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

#include "umf/pools/pool_jemalloc.h"
#include "umf/providers/provider_devdax_memory.h"
#include <umf/pools/pool_jemalloc.h>
#include <umf/providers/provider_devdax_memory.h>

#include "pool_coarse.hpp"

Expand Down
4 changes: 2 additions & 2 deletions test/pools/jemalloc_coarse_file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

#include "umf/pools/pool_jemalloc.h"
#include "umf/providers/provider_file_memory.h"
#include <umf/pools/pool_jemalloc.h>
#include <umf/providers/provider_file_memory.h>

#include "pool_coarse.hpp"

Expand Down
4 changes: 2 additions & 2 deletions test/pools/jemalloc_pool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

#include "umf/pools/pool_jemalloc.h"
#include "umf/providers/provider_os_memory.h"
#include <umf/pools/pool_jemalloc.h>
#include <umf/providers/provider_os_memory.h>

#include "pool.hpp"
#include "poolFixtures.hpp"
Expand Down
4 changes: 2 additions & 2 deletions test/pools/pool_base_alloc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include <unordered_map>

#include "umf/pools/pool_scalable.h"
#include "umf/providers/provider_os_memory.h"
#include <umf/pools/pool_scalable.h>
#include <umf/providers/provider_os_memory.h>

#include "pool.hpp"
#include "poolFixtures.hpp"
Expand Down
4 changes: 2 additions & 2 deletions test/pools/scalable_coarse_devdax.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

#include "umf/pools/pool_scalable.h"
#include "umf/providers/provider_devdax_memory.h"
#include <umf/pools/pool_scalable.h>
#include <umf/providers/provider_devdax_memory.h>

#include "pool_coarse.hpp"

Expand Down
4 changes: 2 additions & 2 deletions test/pools/scalable_coarse_file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

#include "umf/pools/pool_scalable.h"
#include "umf/providers/provider_file_memory.h"
#include <umf/pools/pool_scalable.h>
#include <umf/providers/provider_file_memory.h>

#include "pool_coarse.hpp"

Expand Down
4 changes: 2 additions & 2 deletions test/pools/scalable_pool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

#include "umf/pools/pool_scalable.h"
#include "umf/providers/provider_os_memory.h"
#include <umf/pools/pool_scalable.h>
#include <umf/providers/provider_os_memory.h>

#include "pool.hpp"
#include "poolFixtures.hpp"
Expand Down
Loading