Skip to content

Commit 4995e24

Browse files
lplewalplewa
committed
Rename umfMemoryTarget functions
1 parent dcfc94f commit 4995e24

File tree

7 files changed

+43
-39
lines changed

7 files changed

+43
-39
lines changed

‎src/memspace.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ umfMemoryProviderCreateFromMemspace(umf_const_memspace_handle_t memspace,
105105
void umfMemspaceDestroy(umf_memspace_handle_t memspace) {
106106
assert(memspace);
107107
for (size_t i = 0; i < memspace->size; i++) {
108-
umfMemoryTargetDestroy(memspace->nodes[i]);
108+
umfMemtargetDestroy(memspace->nodes[i]);
109109
}
110110

111111
umf_ba_global_free(memspace->nodes);
@@ -136,7 +136,7 @@ umf_result_t umfMemspaceClone(umf_const_memspace_handle_t hMemspace,
136136
umf_result_t ret;
137137

138138
for (i = 0; i < clone->size; i++) {
139-
ret = umfMemoryTargetClone(hMemspace->nodes[i], &clone->nodes[i]);
139+
ret = umfMemtargetClone(hMemspace->nodes[i], &clone->nodes[i]);
140140
if (ret != UMF_RESULT_SUCCESS) {
141141
goto err;
142142
}
@@ -148,7 +148,7 @@ umf_result_t umfMemspaceClone(umf_const_memspace_handle_t hMemspace,
148148
err:
149149
while (i != 0) {
150150
i--;
151-
umfMemoryTargetDestroy(clone->nodes[i]);
151+
umfMemtargetDestroy(clone->nodes[i]);
152152
}
153153
umf_ba_global_free(clone->nodes);
154154
umf_ba_global_free(clone);
@@ -268,8 +268,8 @@ umf_result_t umfMemspaceFilter(umf_const_memspace_handle_t hMemspace,
268268

269269
size_t cloneIdx = 0;
270270
for (cloneIdx = 0; cloneIdx < newMemspace->size; cloneIdx++) {
271-
ret = umfMemoryTargetClone(uniqueBestNodes[cloneIdx],
272-
&newMemspace->nodes[cloneIdx]);
271+
ret = umfMemtargetClone(uniqueBestNodes[cloneIdx],
272+
&newMemspace->nodes[cloneIdx]);
273273
if (ret != UMF_RESULT_SUCCESS) {
274274
goto err_free_cloned_nodes;
275275
}
@@ -283,7 +283,7 @@ umf_result_t umfMemspaceFilter(umf_const_memspace_handle_t hMemspace,
283283
err_free_cloned_nodes:
284284
while (cloneIdx != 0) {
285285
cloneIdx--;
286-
umfMemoryTargetDestroy(newMemspace->nodes[cloneIdx]);
286+
umfMemtargetDestroy(newMemspace->nodes[cloneIdx]);
287287
}
288288
umf_ba_global_free(newMemspace->nodes);
289289
err_free_new_memspace:

‎src/memspaces/memspace_highest_bandwidth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static umf_result_t getBestBandwidthTarget(umf_memtarget_handle_t initiator,
2828
for (size_t nodeIdx = 0; nodeIdx < numNodes; nodeIdx++) {
2929
size_t bandwidth = 0;
3030
umf_result_t ret =
31-
umfMemoryTargetGetBandwidth(initiator, nodes[nodeIdx], &bandwidth);
31+
umfMemtargetGetBandwidth(initiator, nodes[nodeIdx], &bandwidth);
3232
if (ret) {
3333
return ret;
3434
}

‎src/memspaces/memspace_highest_capacity.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ umfMemspaceHighestCapacityCreate(umf_memspace_handle_t *hMemspace) {
3434
}
3535

3636
ret = umfMemspaceSortDesc(highCapacityMemspace,
37-
(umfGetPropertyFn)&umfMemoryTargetGetCapacity);
37+
(umfGetPropertyFn)&umfMemtargetGetCapacity);
3838
if (ret != UMF_RESULT_SUCCESS) {
3939
return ret;
4040
}

‎src/memspaces/memspace_lowest_latency.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static umf_result_t getBestLatencyTarget(umf_memtarget_handle_t initiator,
2828
for (size_t nodeIdx = 0; nodeIdx < numNodes; nodeIdx++) {
2929
size_t latency = SIZE_MAX;
3030
umf_result_t ret =
31-
umfMemoryTargetGetLatency(initiator, nodes[nodeIdx], &latency);
31+
umfMemtargetGetLatency(initiator, nodes[nodeIdx], &latency);
3232
if (ret) {
3333
return ret;
3434
}

‎src/memspaces/memspace_numa.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ umf_result_t umfMemspaceCreateFromNumaArray(unsigned *nodeIds, size_t numIds,
3737
size_t nodeIdx;
3838
for (nodeIdx = 0; nodeIdx < numIds; nodeIdx++) {
3939
struct umf_numa_memtarget_config_t config = {nodeIds[nodeIdx]};
40-
ret = umfMemoryTargetCreate(&UMF_MEMTARGET_NUMA_OPS, &config,
41-
&memspace->nodes[nodeIdx]);
40+
ret = umfMemtargetCreate(&UMF_MEMTARGET_NUMA_OPS, &config,
41+
&memspace->nodes[nodeIdx]);
4242
if (ret) {
4343
goto err_target_create;
4444
}
@@ -51,7 +51,7 @@ umf_result_t umfMemspaceCreateFromNumaArray(unsigned *nodeIds, size_t numIds,
5151
err_target_create:
5252
umf_ba_global_free(memspace->nodes);
5353
for (size_t i = 0; i < nodeIdx; i++) {
54-
umfMemoryTargetDestroy(memspace->nodes[i]);
54+
umfMemtargetDestroy(memspace->nodes[i]);
5555
}
5656
err_nodes_alloc:
5757
umf_ba_global_free(memspace);

‎src/memtarget.c

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "memtarget_ops.h"
1717
#include "utils_concurrency.h"
1818

19-
umf_result_t umfMemoryTargetCreate(const umf_memtarget_ops_t *ops, void *params,
20-
umf_memtarget_handle_t *memoryTarget) {
19+
umf_result_t umfMemtargetCreate(const umf_memtarget_ops_t *ops, void *params,
20+
umf_memtarget_handle_t *memoryTarget) {
2121
libumfInit();
2222
if (!ops || !memoryTarget) {
2323
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
@@ -47,14 +47,14 @@ umf_result_t umfMemoryTargetCreate(const umf_memtarget_ops_t *ops, void *params,
4747
return UMF_RESULT_SUCCESS;
4848
}
4949

50-
void umfMemoryTargetDestroy(umf_memtarget_handle_t memoryTarget) {
50+
void umfMemtargetDestroy(umf_memtarget_handle_t memoryTarget) {
5151
assert(memoryTarget);
5252
memoryTarget->ops->finalize(memoryTarget->priv);
5353
umf_ba_global_free(memoryTarget);
5454
}
5555

56-
umf_result_t umfMemoryTargetClone(umf_memtarget_handle_t memoryTarget,
57-
umf_memtarget_handle_t *outHandle) {
56+
umf_result_t umfMemtargetClone(umf_const_memtarget_handle_t memoryTarget,
57+
umf_memtarget_handle_t *outHandle) {
5858
assert(memoryTarget);
5959
assert(outHandle);
6060

@@ -76,18 +76,19 @@ umf_result_t umfMemoryTargetClone(umf_memtarget_handle_t memoryTarget,
7676
return UMF_RESULT_SUCCESS;
7777
}
7878

79-
umf_result_t umfMemoryTargetGetCapacity(umf_memtarget_handle_t memoryTarget,
80-
size_t *capacity) {
79+
umf_result_t umfMemtargetGetCapacity(umf_const_memtarget_handle_t memoryTarget,
80+
size_t *capacity) {
8181
if (!memoryTarget || !capacity) {
8282
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
8383
}
8484

8585
return memoryTarget->ops->get_capacity(memoryTarget->priv, capacity);
8686
}
8787

88-
umf_result_t umfMemoryTargetGetBandwidth(umf_memtarget_handle_t srcMemoryTarget,
89-
umf_memtarget_handle_t dstMemoryTarget,
90-
size_t *bandwidth) {
88+
umf_result_t
89+
umfMemtargetGetBandwidth(umf_const_memtarget_handle_t srcMemoryTarget,
90+
umf_const_memtarget_handle_t dstMemoryTarget,
91+
size_t *bandwidth) {
9192
if (!srcMemoryTarget || !dstMemoryTarget || !bandwidth) {
9293
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
9394
}
@@ -96,9 +97,10 @@ umf_result_t umfMemoryTargetGetBandwidth(umf_memtarget_handle_t srcMemoryTarget,
9697
srcMemoryTarget->priv, dstMemoryTarget->priv, bandwidth);
9798
}
9899

99-
umf_result_t umfMemoryTargetGetLatency(umf_memtarget_handle_t srcMemoryTarget,
100-
umf_memtarget_handle_t dstMemoryTarget,
101-
size_t *latency) {
100+
umf_result_t
101+
umfMemtargetGetLatency(umf_const_memtarget_handle_t srcMemoryTarget,
102+
umf_const_memtarget_handle_t dstMemoryTarget,
103+
size_t *latency) {
102104
if (!srcMemoryTarget || !dstMemoryTarget || !latency) {
103105
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
104106
}

‎src/memtarget_internal.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,22 @@ typedef struct umf_memtarget_t {
2424
void *priv;
2525
} umf_memtarget_t;
2626

27-
umf_result_t umfMemoryTargetCreate(const umf_memtarget_ops_t *ops, void *params,
28-
umf_memtarget_handle_t *memoryTarget);
29-
void umfMemoryTargetDestroy(umf_memtarget_handle_t memoryTarget);
30-
31-
umf_result_t umfMemoryTargetClone(umf_memtarget_handle_t memoryTarget,
32-
umf_memtarget_handle_t *outHandle);
33-
umf_result_t umfMemoryTargetGetCapacity(umf_memtarget_handle_t memoryTarget,
34-
size_t *capacity);
35-
umf_result_t umfMemoryTargetGetBandwidth(umf_memtarget_handle_t srcMemoryTarget,
36-
umf_memtarget_handle_t dstMemoryTarget,
37-
size_t *bandwidth);
38-
umf_result_t umfMemoryTargetGetLatency(umf_memtarget_handle_t srcMemoryTarget,
39-
umf_memtarget_handle_t dstMemoryTarget,
40-
size_t *latency);
27+
umf_result_t umfMemtargetCreate(const umf_memtarget_ops_t *ops, void *params,
28+
umf_memtarget_handle_t *memoryTarget);
29+
void umfMemtargetDestroy(umf_memtarget_handle_t memoryTarget);
30+
31+
umf_result_t umfMemtargetClone(umf_const_memtarget_handle_t memoryTarget,
32+
umf_memtarget_handle_t *outHandle);
33+
umf_result_t umfMemtargetGetCapacity(umf_const_memtarget_handle_t memoryTarget,
34+
size_t *capacity);
35+
umf_result_t
36+
umfMemtargetGetBandwidth(umf_const_memtarget_handle_t srcMemoryTarget,
37+
umf_const_memtarget_handle_t dstMemoryTarget,
38+
size_t *bandwidth);
39+
umf_result_t
40+
umfMemtargetGetLatency(umf_const_memtarget_handle_t srcMemoryTarget,
41+
umf_const_memtarget_handle_t dstMemoryTarget,
42+
size_t *latency);
4143

4244
#ifdef __cplusplus
4345
}

0 commit comments

Comments
 (0)