Skip to content

Replace enum umf_result_t with the umf_result_t type #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2024
Merged

Replace enum umf_result_t with the umf_result_t type #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions benchmark/ubench.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static umf_os_memory_provider_params_t UMF_OS_MEMORY_PROVIDER_PARAMS = {
static void *w_umfMemoryProviderAlloc(void *provider, size_t size,
size_t alignment) {
void *ptr = NULL;
enum umf_result_t umf_result;
umf_result_t umf_result;
umf_memory_provider_handle_t hProvider =
(umf_memory_provider_handle_t)provider;
umf_result = umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
Expand All @@ -133,7 +133,7 @@ static void *w_umfMemoryProviderAlloc(void *provider, size_t size,
}

static void w_umfMemoryProviderFree(void *provider, void *ptr, size_t size) {
enum umf_result_t umf_result;
umf_result_t umf_result;
umf_memory_provider_handle_t hProvider =
(umf_memory_provider_handle_t)provider;
umf_result = umfMemoryProviderFree(hProvider, ptr, size);
Expand All @@ -146,7 +146,7 @@ static void w_umfMemoryProviderFree(void *provider, void *ptr, size_t size) {
UBENCH_EX(simple, os_memory_provider) {
alloc_t *array = alloc_array(N_ITERATIONS);

enum umf_result_t umf_result;
umf_result_t umf_result;
umf_memory_provider_handle_t os_memory_provider = NULL;
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
&UMF_OS_MEMORY_PROVIDER_PARAMS,
Expand Down Expand Up @@ -176,7 +176,7 @@ static void *w_umfPoolMalloc(void *provider, size_t size, size_t alignment) {

static void w_umfPoolFree(void *provider, void *ptr, size_t size) {
(void)size; // unused
enum umf_result_t umf_result;
umf_result_t umf_result;
umf_memory_pool_handle_t hPool = (umf_memory_pool_handle_t)provider;
umf_result = umfPoolFree(hPool, ptr);
if (umf_result != UMF_RESULT_SUCCESS) {
Expand All @@ -190,7 +190,7 @@ static void w_umfPoolFree(void *provider, void *ptr, size_t size) {
UBENCH_EX(simple, proxy_pool_with_os_memory_provider) {
alloc_t *array = alloc_array(N_ITERATIONS);

enum umf_result_t umf_result;
umf_result_t umf_result;
umf_memory_provider_handle_t os_memory_provider = NULL;
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
&UMF_OS_MEMORY_PROVIDER_PARAMS,
Expand Down Expand Up @@ -227,7 +227,7 @@ UBENCH_EX(simple, proxy_pool_with_os_memory_provider) {
UBENCH_EX(simple, disjoint_pool_with_os_memory_provider) {
alloc_t *array = alloc_array(N_ITERATIONS);

enum umf_result_t umf_result;
umf_result_t umf_result;
umf_memory_provider_handle_t os_memory_provider = NULL;
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
&UMF_OS_MEMORY_PROVIDER_PARAMS,
Expand Down Expand Up @@ -272,7 +272,7 @@ UBENCH_EX(simple, disjoint_pool_with_os_memory_provider) {
UBENCH_EX(simple, jemalloc_pool_with_os_memory_provider) {
alloc_t *array = alloc_array(N_ITERATIONS);

enum umf_result_t umf_result;
umf_result_t umf_result;
umf_memory_provider_handle_t os_memory_provider = NULL;
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
&UMF_OS_MEMORY_PROVIDER_PARAMS,
Expand Down Expand Up @@ -310,7 +310,7 @@ UBENCH_EX(simple, jemalloc_pool_with_os_memory_provider) {
UBENCH_EX(simple, scalable_pool_with_os_memory_provider) {
alloc_t *array = alloc_array(N_ITERATIONS);

enum umf_result_t umf_result;
umf_result_t umf_result;
umf_memory_provider_handle_t os_memory_provider = NULL;
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
&UMF_OS_MEMORY_PROVIDER_PARAMS,
Expand Down
6 changes: 3 additions & 3 deletions src/memspace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ void umfMemspaceDestroy(umf_memspace_handle_t memspace) {
umf_ba_global_free(memspace);
}

enum umf_result_t umfMemspaceClone(umf_memspace_handle_t hMemspace,
umf_memspace_handle_t *outHandle) {
umf_result_t umfMemspaceClone(umf_memspace_handle_t hMemspace,
umf_memspace_handle_t *outHandle) {
if (!hMemspace || !outHandle) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
Expand Down Expand Up @@ -171,7 +171,7 @@ static int propertyCmp(const void *a, const void *b) {
}
}

enum umf_result_t
umf_result_t
umfMemspaceSortDesc(umf_memspace_handle_t hMemspace,
umf_result_t (*getProperty)(umf_memory_target_handle_t node,
uint64_t *property)) {
Expand Down
8 changes: 4 additions & 4 deletions src/memspace_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ struct umf_memspace_t {
///
/// \brief Clones memspace
///
enum umf_result_t umfMemspaceClone(umf_memspace_handle_t hMemspace,
umf_memspace_handle_t *outHandle);
umf_result_t umfMemspaceClone(umf_memspace_handle_t hMemspace,
umf_memspace_handle_t *outHandle);

typedef umf_result_t (*umfGetPropertyFn)(umf_memory_target_handle_t,
uint64_t *);

///
/// \brief Sorts memspace by getProperty() in descending order
///
enum umf_result_t umfMemspaceSortDesc(umf_memspace_handle_t hMemspace,
umfGetPropertyFn getProperty);
umf_result_t umfMemspaceSortDesc(umf_memspace_handle_t hMemspace,
umfGetPropertyFn getProperty);

///
/// \brief Destroys memspace
Expand Down
7 changes: 3 additions & 4 deletions src/memspaces/memspace_numa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
#include "base_alloc_global.h"
#include "memspace_numa.h"

enum umf_result_t
umfMemspaceCreateFromNumaArray(unsigned *nodeIds, size_t numIds,
umf_memspace_handle_t *hMemspace) {
umf_result_t umfMemspaceCreateFromNumaArray(unsigned *nodeIds, size_t numIds,
umf_memspace_handle_t *hMemspace) {
if (!nodeIds || numIds == 0 || !hMemspace) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

enum umf_result_t ret = UMF_RESULT_SUCCESS;
umf_result_t ret = UMF_RESULT_SUCCESS;
umf_memspace_handle_t memspace =
umf_ba_global_alloc(sizeof(struct umf_memspace_t));
if (!memspace) {
Expand Down
28 changes: 14 additions & 14 deletions src/provider/provider_level_zero.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static void init_ze_global_state(void) {
}
}

enum umf_result_t ze_memory_provider_initialize(void *params, void **provider) {
umf_result_t ze_memory_provider_initialize(void *params, void **provider) {
if (provider == NULL || params == NULL) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}
Expand Down Expand Up @@ -128,9 +128,9 @@ void ze_memory_provider_finalize(void *provider) {
umf_ba_global_free(provider);
}

static enum umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
size_t alignment,
void **resultPtr) {
static umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
size_t alignment,
void **resultPtr) {
assert(provider);
assert(resultPtr);

Expand Down Expand Up @@ -185,8 +185,8 @@ static enum umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
: UMF_RESULT_ERROR_MEMORY_PROVIDER_SPECIFIC;
}

static enum umf_result_t ze_memory_provider_free(void *provider, void *ptr,
size_t bytes) {
static umf_result_t ze_memory_provider_free(void *provider, void *ptr,
size_t bytes) {
(void)bytes;

assert(provider);
Expand All @@ -210,9 +210,9 @@ void ze_memory_provider_get_last_native_error(void *provider,
*pError = 0;
}

static enum umf_result_t
ze_memory_provider_get_min_page_size(void *provider, void *ptr,
size_t *pageSize) {
static umf_result_t ze_memory_provider_get_min_page_size(void *provider,
void *ptr,
size_t *pageSize) {
(void)provider;
(void)ptr;

Expand Down Expand Up @@ -241,7 +241,7 @@ static umf_result_t ze_memory_provider_purge_force(void *provider, void *ptr,
return UMF_RESULT_ERROR_NOT_SUPPORTED;
}

static enum umf_result_t
static umf_result_t
ze_memory_provider_get_recommended_page_size(void *provider, size_t size,
size_t *pageSize) {
(void)provider;
Expand All @@ -257,10 +257,10 @@ const char *ze_memory_provider_get_name(void *provider) {
return "LEVEL_ZERO";
}

static enum umf_result_t ze_memory_provider_allocation_merge(void *hProvider,
void *lowPtr,
void *highPtr,
size_t totalSize) {
static umf_result_t ze_memory_provider_allocation_merge(void *hProvider,
void *lowPtr,
void *highPtr,
size_t totalSize) {
(void)hProvider;
(void)lowPtr;
(void)highPtr;
Expand Down
2 changes: 1 addition & 1 deletion src/proxy_lib/proxy_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static __TLS int was_called_from_umfPool = 0;
void proxy_lib_create_common(void) {
umf_os_memory_provider_params_t os_params =
umfOsMemoryProviderParamsDefault();
enum umf_result_t umf_result;
umf_result_t umf_result;

#ifndef _WIN32
if (util_env_var_has_str("UMF_PROXY", "page.disposition=shared")) {
Expand Down
17 changes: 8 additions & 9 deletions test/ipcAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct provider_mock_ipc : public umf_test::provider_base_t {
allocations_mutex_type alloc_mutex;
allocations_map_type allocations;

enum umf_result_t alloc(size_t size, size_t align, void **ptr) noexcept {
umf_result_t alloc(size_t size, size_t align, void **ptr) noexcept {
auto ret = helper_prov.alloc(size, align, ptr);
if (ret == UMF_RESULT_SUCCESS) {
allocations_write_lock_type lock(alloc_mutex);
Expand All @@ -38,20 +38,20 @@ struct provider_mock_ipc : public umf_test::provider_base_t {
}
return ret;
}
enum umf_result_t free(void *ptr, size_t size) noexcept {
umf_result_t free(void *ptr, size_t size) noexcept {
allocations_write_lock_type lock(alloc_mutex);
allocations.erase(ptr);
lock.unlock();
auto ret = helper_prov.free(ptr, size);
return ret;
}
const char *get_name() noexcept { return "mock_ipc"; }
enum umf_result_t get_ipc_handle_size(size_t *size) noexcept {
umf_result_t get_ipc_handle_size(size_t *size) noexcept {
*size = sizeof(provider_ipc_data_t);
return UMF_RESULT_SUCCESS;
}
enum umf_result_t get_ipc_handle(const void *ptr, size_t size,
void *providerIpcData) noexcept {
umf_result_t get_ipc_handle(const void *ptr, size_t size,
void *providerIpcData) noexcept {
provider_ipc_data_t *ipcData =
static_cast<provider_ipc_data_t *>(providerIpcData);
// we do not need lock for allocations map here, because we just read
Expand All @@ -69,12 +69,11 @@ struct provider_mock_ipc : public umf_test::provider_base_t {
ipcData->size = size; // size of the base allocation
return UMF_RESULT_SUCCESS;
}
enum umf_result_t put_ipc_handle(void *providerIpcData) noexcept {
umf_result_t put_ipc_handle(void *providerIpcData) noexcept {
(void)providerIpcData;
return UMF_RESULT_SUCCESS;
}
enum umf_result_t open_ipc_handle(void *providerIpcData,
void **ptr) noexcept {
umf_result_t open_ipc_handle(void *providerIpcData, void **ptr) noexcept {
provider_ipc_data_t *ipcData =
static_cast<provider_ipc_data_t *>(providerIpcData);

Expand All @@ -99,7 +98,7 @@ struct provider_mock_ipc : public umf_test::provider_base_t {

return UMF_RESULT_SUCCESS;
}
enum umf_result_t close_ipc_handle(void *ptr, size_t size) noexcept {
umf_result_t close_ipc_handle(void *ptr, size_t size) noexcept {
(void)size;
std::free(ptr);
return UMF_RESULT_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion test/memspaces/memspace_helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct memspaceNumaTest : ::numaNodesTest {
void SetUp() override {
::numaNodesTest::SetUp();

enum umf_result_t ret = umfMemspaceCreateFromNumaArray(
umf_result_t ret = umfMemspaceCreateFromNumaArray(
nodeIds.data(), nodeIds.size(), &hMemspace);
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
ASSERT_NE(hMemspace, nullptr);
Expand Down
5 changes: 2 additions & 3 deletions test/memspaces/memspace_host_all.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ TEST_F(numaNodesTest, memspaceGet) {

TEST_F(memspaceHostAllTest, providerFromHostAllMemspace) {
umf_memory_provider_handle_t hProvider = nullptr;
enum umf_result_t ret =
umf_result_t ret =
umfMemoryProviderCreateFromMemspace(hMemspace, nullptr, &hProvider);
UT_ASSERTeq(ret, UMF_RESULT_SUCCESS);
UT_ASSERTne(hProvider, nullptr);
Expand All @@ -47,8 +47,7 @@ TEST_F(memspaceHostAllProviderTest, allocFree) {
size_t size = SIZE_4K;
size_t alignment = 0;

enum umf_result_t ret =
umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
umf_result_t ret = umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
UT_ASSERTeq(ret, UMF_RESULT_SUCCESS);
UT_ASSERTne(ptr, nullptr);

Expand Down
13 changes: 6 additions & 7 deletions test/memspaces/memspace_numa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

TEST_F(numaNodesTest, createDestroy) {
umf_memspace_handle_t hMemspace = nullptr;
enum umf_result_t ret = umfMemspaceCreateFromNumaArray(
umf_result_t ret = umfMemspaceCreateFromNumaArray(
nodeIds.data(), nodeIds.size(), &hMemspace);
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
ASSERT_NE(hMemspace, nullptr);
Expand All @@ -21,28 +21,28 @@ TEST_F(numaNodesTest, createDestroy) {

TEST_F(numaNodesTest, createInvalidNullArray) {
umf_memspace_handle_t hMemspace = nullptr;
enum umf_result_t ret = umfMemspaceCreateFromNumaArray(NULL, 0, &hMemspace);
umf_result_t ret = umfMemspaceCreateFromNumaArray(NULL, 0, &hMemspace);
ASSERT_EQ(ret, UMF_RESULT_ERROR_INVALID_ARGUMENT);
ASSERT_EQ(hMemspace, nullptr);
}

TEST_F(numaNodesTest, createInvalidZeroSize) {
umf_memspace_handle_t hMemspace = nullptr;
enum umf_result_t ret =
umf_result_t ret =
umfMemspaceCreateFromNumaArray(nodeIds.data(), 0, &hMemspace);
ASSERT_EQ(ret, UMF_RESULT_ERROR_INVALID_ARGUMENT);
ASSERT_EQ(hMemspace, nullptr);
}

TEST_F(numaNodesTest, createInvalidNullHandle) {
enum umf_result_t ret =
umf_result_t ret =
umfMemspaceCreateFromNumaArray(nodeIds.data(), nodeIds.size(), nullptr);
ASSERT_EQ(ret, UMF_RESULT_ERROR_INVALID_ARGUMENT);
}

TEST_F(memspaceNumaTest, providerFromNumaMemspace) {
umf_memory_provider_handle_t hProvider = nullptr;
enum umf_result_t ret =
umf_result_t ret =
umfMemoryProviderCreateFromMemspace(hMemspace, nullptr, &hProvider);
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
ASSERT_NE(hProvider, nullptr);
Expand All @@ -55,8 +55,7 @@ TEST_F(memspaceNumaProviderTest, allocFree) {
size_t size = SIZE_4K;
size_t alignment = 0;

enum umf_result_t ret =
umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
umf_result_t ret = umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
ASSERT_NE(ptr, nullptr);

Expand Down