Skip to content

Commit 5df8800

Browse files
bratpiorkabratpiorka
authored
Merge pull request #498 from ldorau/Replace_enum_umf_result_t_with_the_umf_result_t_type
Replace enum umf_result_t with the umf_result_t type
2 parents d0c0635 + 67f4b4c commit 5df8800

File tree

10 files changed

+50
-54
lines changed

10 files changed

+50
-54
lines changed

‎benchmark/ubench.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static umf_os_memory_provider_params_t UMF_OS_MEMORY_PROVIDER_PARAMS = {
120120
static void *w_umfMemoryProviderAlloc(void *provider, size_t size,
121121
size_t alignment) {
122122
void *ptr = NULL;
123-
enum umf_result_t umf_result;
123+
umf_result_t umf_result;
124124
umf_memory_provider_handle_t hProvider =
125125
(umf_memory_provider_handle_t)provider;
126126
umf_result = umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
@@ -133,7 +133,7 @@ static void *w_umfMemoryProviderAlloc(void *provider, size_t size,
133133
}
134134

135135
static void w_umfMemoryProviderFree(void *provider, void *ptr, size_t size) {
136-
enum umf_result_t umf_result;
136+
umf_result_t umf_result;
137137
umf_memory_provider_handle_t hProvider =
138138
(umf_memory_provider_handle_t)provider;
139139
umf_result = umfMemoryProviderFree(hProvider, ptr, size);
@@ -146,7 +146,7 @@ static void w_umfMemoryProviderFree(void *provider, void *ptr, size_t size) {
146146
UBENCH_EX(simple, os_memory_provider) {
147147
alloc_t *array = alloc_array(N_ITERATIONS);
148148

149-
enum umf_result_t umf_result;
149+
umf_result_t umf_result;
150150
umf_memory_provider_handle_t os_memory_provider = NULL;
151151
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
152152
&UMF_OS_MEMORY_PROVIDER_PARAMS,
@@ -176,7 +176,7 @@ static void *w_umfPoolMalloc(void *provider, size_t size, size_t alignment) {
176176

177177
static void w_umfPoolFree(void *provider, void *ptr, size_t size) {
178178
(void)size; // unused
179-
enum umf_result_t umf_result;
179+
umf_result_t umf_result;
180180
umf_memory_pool_handle_t hPool = (umf_memory_pool_handle_t)provider;
181181
umf_result = umfPoolFree(hPool, ptr);
182182
if (umf_result != UMF_RESULT_SUCCESS) {
@@ -190,7 +190,7 @@ static void w_umfPoolFree(void *provider, void *ptr, size_t size) {
190190
UBENCH_EX(simple, proxy_pool_with_os_memory_provider) {
191191
alloc_t *array = alloc_array(N_ITERATIONS);
192192

193-
enum umf_result_t umf_result;
193+
umf_result_t umf_result;
194194
umf_memory_provider_handle_t os_memory_provider = NULL;
195195
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
196196
&UMF_OS_MEMORY_PROVIDER_PARAMS,
@@ -227,7 +227,7 @@ UBENCH_EX(simple, proxy_pool_with_os_memory_provider) {
227227
UBENCH_EX(simple, disjoint_pool_with_os_memory_provider) {
228228
alloc_t *array = alloc_array(N_ITERATIONS);
229229

230-
enum umf_result_t umf_result;
230+
umf_result_t umf_result;
231231
umf_memory_provider_handle_t os_memory_provider = NULL;
232232
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
233233
&UMF_OS_MEMORY_PROVIDER_PARAMS,
@@ -272,7 +272,7 @@ UBENCH_EX(simple, disjoint_pool_with_os_memory_provider) {
272272
UBENCH_EX(simple, jemalloc_pool_with_os_memory_provider) {
273273
alloc_t *array = alloc_array(N_ITERATIONS);
274274

275-
enum umf_result_t umf_result;
275+
umf_result_t umf_result;
276276
umf_memory_provider_handle_t os_memory_provider = NULL;
277277
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
278278
&UMF_OS_MEMORY_PROVIDER_PARAMS,
@@ -310,7 +310,7 @@ UBENCH_EX(simple, jemalloc_pool_with_os_memory_provider) {
310310
UBENCH_EX(simple, scalable_pool_with_os_memory_provider) {
311311
alloc_t *array = alloc_array(N_ITERATIONS);
312312

313-
enum umf_result_t umf_result;
313+
umf_result_t umf_result;
314314
umf_memory_provider_handle_t os_memory_provider = NULL;
315315
umf_result = umfMemoryProviderCreate(umfOsMemoryProviderOps(),
316316
&UMF_OS_MEMORY_PROVIDER_PARAMS,

‎src/memspace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ void umfMemspaceDestroy(umf_memspace_handle_t memspace) {
110110
umf_ba_global_free(memspace);
111111
}
112112

113-
enum umf_result_t umfMemspaceClone(umf_memspace_handle_t hMemspace,
114-
umf_memspace_handle_t *outHandle) {
113+
umf_result_t umfMemspaceClone(umf_memspace_handle_t hMemspace,
114+
umf_memspace_handle_t *outHandle) {
115115
if (!hMemspace || !outHandle) {
116116
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
117117
}
@@ -171,7 +171,7 @@ static int propertyCmp(const void *a, const void *b) {
171171
}
172172
}
173173

174-
enum umf_result_t
174+
umf_result_t
175175
umfMemspaceSortDesc(umf_memspace_handle_t hMemspace,
176176
umf_result_t (*getProperty)(umf_memory_target_handle_t node,
177177
uint64_t *property)) {

‎src/memspace_internal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ struct umf_memspace_t {
2727
///
2828
/// \brief Clones memspace
2929
///
30-
enum umf_result_t umfMemspaceClone(umf_memspace_handle_t hMemspace,
31-
umf_memspace_handle_t *outHandle);
30+
umf_result_t umfMemspaceClone(umf_memspace_handle_t hMemspace,
31+
umf_memspace_handle_t *outHandle);
3232

3333
typedef umf_result_t (*umfGetPropertyFn)(umf_memory_target_handle_t,
3434
uint64_t *);
3535

3636
///
3737
/// \brief Sorts memspace by getProperty() in descending order
3838
///
39-
enum umf_result_t umfMemspaceSortDesc(umf_memspace_handle_t hMemspace,
40-
umfGetPropertyFn getProperty);
39+
umf_result_t umfMemspaceSortDesc(umf_memspace_handle_t hMemspace,
40+
umfGetPropertyFn getProperty);
4141

4242
///
4343
/// \brief Destroys memspace

‎src/memspaces/memspace_numa.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
#include "base_alloc_global.h"
1515
#include "memspace_numa.h"
1616

17-
enum umf_result_t
18-
umfMemspaceCreateFromNumaArray(unsigned *nodeIds, size_t numIds,
19-
umf_memspace_handle_t *hMemspace) {
17+
umf_result_t umfMemspaceCreateFromNumaArray(unsigned *nodeIds, size_t numIds,
18+
umf_memspace_handle_t *hMemspace) {
2019
if (!nodeIds || numIds == 0 || !hMemspace) {
2120
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
2221
}
2322

24-
enum umf_result_t ret = UMF_RESULT_SUCCESS;
23+
umf_result_t ret = UMF_RESULT_SUCCESS;
2524
umf_memspace_handle_t memspace =
2625
umf_ba_global_alloc(sizeof(struct umf_memspace_t));
2726
if (!memspace) {

‎src/provider/provider_level_zero.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static void init_ze_global_state(void) {
9292
}
9393
}
9494

95-
enum umf_result_t ze_memory_provider_initialize(void *params, void **provider) {
95+
umf_result_t ze_memory_provider_initialize(void *params, void **provider) {
9696
if (provider == NULL || params == NULL) {
9797
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
9898
}
@@ -128,9 +128,9 @@ void ze_memory_provider_finalize(void *provider) {
128128
umf_ba_global_free(provider);
129129
}
130130

131-
static enum umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
132-
size_t alignment,
133-
void **resultPtr) {
131+
static umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
132+
size_t alignment,
133+
void **resultPtr) {
134134
assert(provider);
135135
assert(resultPtr);
136136

@@ -185,8 +185,8 @@ static enum umf_result_t ze_memory_provider_alloc(void *provider, size_t size,
185185
: UMF_RESULT_ERROR_MEMORY_PROVIDER_SPECIFIC;
186186
}
187187

188-
static enum umf_result_t ze_memory_provider_free(void *provider, void *ptr,
189-
size_t bytes) {
188+
static umf_result_t ze_memory_provider_free(void *provider, void *ptr,
189+
size_t bytes) {
190190
(void)bytes;
191191

192192
assert(provider);
@@ -210,9 +210,9 @@ void ze_memory_provider_get_last_native_error(void *provider,
210210
*pError = 0;
211211
}
212212

213-
static enum umf_result_t
214-
ze_memory_provider_get_min_page_size(void *provider, void *ptr,
215-
size_t *pageSize) {
213+
static umf_result_t ze_memory_provider_get_min_page_size(void *provider,
214+
void *ptr,
215+
size_t *pageSize) {
216216
(void)provider;
217217
(void)ptr;
218218

@@ -241,7 +241,7 @@ static umf_result_t ze_memory_provider_purge_force(void *provider, void *ptr,
241241
return UMF_RESULT_ERROR_NOT_SUPPORTED;
242242
}
243243

244-
static enum umf_result_t
244+
static umf_result_t
245245
ze_memory_provider_get_recommended_page_size(void *provider, size_t size,
246246
size_t *pageSize) {
247247
(void)provider;
@@ -257,10 +257,10 @@ const char *ze_memory_provider_get_name(void *provider) {
257257
return "LEVEL_ZERO";
258258
}
259259

260-
static enum umf_result_t ze_memory_provider_allocation_merge(void *hProvider,
261-
void *lowPtr,
262-
void *highPtr,
263-
size_t totalSize) {
260+
static umf_result_t ze_memory_provider_allocation_merge(void *hProvider,
261+
void *lowPtr,
262+
void *highPtr,
263+
size_t totalSize) {
264264
(void)hProvider;
265265
(void)lowPtr;
266266
(void)highPtr;

‎src/proxy_lib/proxy_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static __TLS int was_called_from_umfPool = 0;
109109
void proxy_lib_create_common(void) {
110110
umf_os_memory_provider_params_t os_params =
111111
umfOsMemoryProviderParamsDefault();
112-
enum umf_result_t umf_result;
112+
umf_result_t umf_result;
113113

114114
#ifndef _WIN32
115115
if (util_env_var_has_str("UMF_PROXY", "page.disposition=shared")) {

‎test/ipcAPI.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct provider_mock_ipc : public umf_test::provider_base_t {
2828
allocations_mutex_type alloc_mutex;
2929
allocations_map_type allocations;
3030

31-
enum umf_result_t alloc(size_t size, size_t align, void **ptr) noexcept {
31+
umf_result_t alloc(size_t size, size_t align, void **ptr) noexcept {
3232
auto ret = helper_prov.alloc(size, align, ptr);
3333
if (ret == UMF_RESULT_SUCCESS) {
3434
allocations_write_lock_type lock(alloc_mutex);
@@ -38,20 +38,20 @@ struct provider_mock_ipc : public umf_test::provider_base_t {
3838
}
3939
return ret;
4040
}
41-
enum umf_result_t free(void *ptr, size_t size) noexcept {
41+
umf_result_t free(void *ptr, size_t size) noexcept {
4242
allocations_write_lock_type lock(alloc_mutex);
4343
allocations.erase(ptr);
4444
lock.unlock();
4545
auto ret = helper_prov.free(ptr, size);
4646
return ret;
4747
}
4848
const char *get_name() noexcept { return "mock_ipc"; }
49-
enum umf_result_t get_ipc_handle_size(size_t *size) noexcept {
49+
umf_result_t get_ipc_handle_size(size_t *size) noexcept {
5050
*size = sizeof(provider_ipc_data_t);
5151
return UMF_RESULT_SUCCESS;
5252
}
53-
enum umf_result_t get_ipc_handle(const void *ptr, size_t size,
54-
void *providerIpcData) noexcept {
53+
umf_result_t get_ipc_handle(const void *ptr, size_t size,
54+
void *providerIpcData) noexcept {
5555
provider_ipc_data_t *ipcData =
5656
static_cast<provider_ipc_data_t *>(providerIpcData);
5757
// we do not need lock for allocations map here, because we just read
@@ -69,12 +69,11 @@ struct provider_mock_ipc : public umf_test::provider_base_t {
6969
ipcData->size = size; // size of the base allocation
7070
return UMF_RESULT_SUCCESS;
7171
}
72-
enum umf_result_t put_ipc_handle(void *providerIpcData) noexcept {
72+
umf_result_t put_ipc_handle(void *providerIpcData) noexcept {
7373
(void)providerIpcData;
7474
return UMF_RESULT_SUCCESS;
7575
}
76-
enum umf_result_t open_ipc_handle(void *providerIpcData,
77-
void **ptr) noexcept {
76+
umf_result_t open_ipc_handle(void *providerIpcData, void **ptr) noexcept {
7877
provider_ipc_data_t *ipcData =
7978
static_cast<provider_ipc_data_t *>(providerIpcData);
8079

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

10099
return UMF_RESULT_SUCCESS;
101100
}
102-
enum umf_result_t close_ipc_handle(void *ptr, size_t size) noexcept {
101+
umf_result_t close_ipc_handle(void *ptr, size_t size) noexcept {
103102
(void)size;
104103
std::free(ptr);
105104
return UMF_RESULT_SUCCESS;

‎test/memspaces/memspace_helpers.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct memspaceNumaTest : ::numaNodesTest {
4444
void SetUp() override {
4545
::numaNodesTest::SetUp();
4646

47-
enum umf_result_t ret = umfMemspaceCreateFromNumaArray(
47+
umf_result_t ret = umfMemspaceCreateFromNumaArray(
4848
nodeIds.data(), nodeIds.size(), &hMemspace);
4949
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
5050
ASSERT_NE(hMemspace, nullptr);

‎test/memspaces/memspace_host_all.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ TEST_F(numaNodesTest, memspaceGet) {
3434

3535
TEST_F(memspaceHostAllTest, providerFromHostAllMemspace) {
3636
umf_memory_provider_handle_t hProvider = nullptr;
37-
enum umf_result_t ret =
37+
umf_result_t ret =
3838
umfMemoryProviderCreateFromMemspace(hMemspace, nullptr, &hProvider);
3939
UT_ASSERTeq(ret, UMF_RESULT_SUCCESS);
4040
UT_ASSERTne(hProvider, nullptr);
@@ -47,8 +47,7 @@ TEST_F(memspaceHostAllProviderTest, allocFree) {
4747
size_t size = SIZE_4K;
4848
size_t alignment = 0;
4949

50-
enum umf_result_t ret =
51-
umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
50+
umf_result_t ret = umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
5251
UT_ASSERTeq(ret, UMF_RESULT_SUCCESS);
5352
UT_ASSERTne(ptr, nullptr);
5453

‎test/memspaces/memspace_numa.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
TEST_F(numaNodesTest, createDestroy) {
1313
umf_memspace_handle_t hMemspace = nullptr;
14-
enum umf_result_t ret = umfMemspaceCreateFromNumaArray(
14+
umf_result_t ret = umfMemspaceCreateFromNumaArray(
1515
nodeIds.data(), nodeIds.size(), &hMemspace);
1616
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
1717
ASSERT_NE(hMemspace, nullptr);
@@ -21,28 +21,28 @@ TEST_F(numaNodesTest, createDestroy) {
2121

2222
TEST_F(numaNodesTest, createInvalidNullArray) {
2323
umf_memspace_handle_t hMemspace = nullptr;
24-
enum umf_result_t ret = umfMemspaceCreateFromNumaArray(NULL, 0, &hMemspace);
24+
umf_result_t ret = umfMemspaceCreateFromNumaArray(NULL, 0, &hMemspace);
2525
ASSERT_EQ(ret, UMF_RESULT_ERROR_INVALID_ARGUMENT);
2626
ASSERT_EQ(hMemspace, nullptr);
2727
}
2828

2929
TEST_F(numaNodesTest, createInvalidZeroSize) {
3030
umf_memspace_handle_t hMemspace = nullptr;
31-
enum umf_result_t ret =
31+
umf_result_t ret =
3232
umfMemspaceCreateFromNumaArray(nodeIds.data(), 0, &hMemspace);
3333
ASSERT_EQ(ret, UMF_RESULT_ERROR_INVALID_ARGUMENT);
3434
ASSERT_EQ(hMemspace, nullptr);
3535
}
3636

3737
TEST_F(numaNodesTest, createInvalidNullHandle) {
38-
enum umf_result_t ret =
38+
umf_result_t ret =
3939
umfMemspaceCreateFromNumaArray(nodeIds.data(), nodeIds.size(), nullptr);
4040
ASSERT_EQ(ret, UMF_RESULT_ERROR_INVALID_ARGUMENT);
4141
}
4242

4343
TEST_F(memspaceNumaTest, providerFromNumaMemspace) {
4444
umf_memory_provider_handle_t hProvider = nullptr;
45-
enum umf_result_t ret =
45+
umf_result_t ret =
4646
umfMemoryProviderCreateFromMemspace(hMemspace, nullptr, &hProvider);
4747
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
4848
ASSERT_NE(hProvider, nullptr);
@@ -55,8 +55,7 @@ TEST_F(memspaceNumaProviderTest, allocFree) {
5555
size_t size = SIZE_4K;
5656
size_t alignment = 0;
5757

58-
enum umf_result_t ret =
59-
umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
58+
umf_result_t ret = umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
6059
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
6160
ASSERT_NE(ptr, nullptr);
6261

0 commit comments

Comments
 (0)