Skip to content

Commit 2034c4e

Browse files
committed
Rename utils_align_ptr_size() to utils_align_ptr_up_size_down()
Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 3bae087 commit 2034c4e

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/base_alloc/base_alloc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ umf_ba_pool_t *umf_ba_create(size_t size) {
168168
char *data_ptr = (char *)&pool->data;
169169
size_t size_left = pool_size - offsetof(umf_ba_pool_t, data);
170170

171-
utils_align_ptr_size((void **)&data_ptr, &size_left, MEMORY_ALIGNMENT);
171+
utils_align_ptr_up_size_down((void **)&data_ptr, &size_left,
172+
MEMORY_ALIGNMENT);
172173

173174
// init free_lock
174175
utils_mutex_t *mutex = utils_mutex_init(&pool->metadata.free_lock);
@@ -209,7 +210,8 @@ void *umf_ba_alloc(umf_ba_pool_t *pool) {
209210
size_t size_left =
210211
pool->metadata.pool_size - offsetof(umf_ba_next_pool_t, data);
211212

212-
utils_align_ptr_size((void **)&data_ptr, &size_left, MEMORY_ALIGNMENT);
213+
utils_align_ptr_up_size_down((void **)&data_ptr, &size_left,
214+
MEMORY_ALIGNMENT);
213215
ba_divide_memory_into_chunks(pool, data_ptr, size_left);
214216
}
215217

src/base_alloc/base_alloc_linear.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ umf_ba_linear_pool_t *umf_ba_linear_create(size_t pool_size) {
9898
void *data_ptr = &pool->data;
9999
size_t size_left = pool_size - offsetof(umf_ba_linear_pool_t, data);
100100

101-
utils_align_ptr_size(&data_ptr, &size_left, MEMORY_ALIGNMENT);
101+
utils_align_ptr_up_size_down(&data_ptr, &size_left, MEMORY_ALIGNMENT);
102102

103103
pool->metadata.pool_size = pool_size;
104104
pool->metadata.data_ptr = data_ptr;
@@ -149,7 +149,7 @@ void *umf_ba_linear_alloc(umf_ba_linear_pool_t *pool, size_t size) {
149149
void *data_ptr = &new_pool->data;
150150
size_t size_left =
151151
new_pool->pool_size - offsetof(umf_ba_next_linear_pool_t, data);
152-
utils_align_ptr_size(&data_ptr, &size_left, MEMORY_ALIGNMENT);
152+
utils_align_ptr_up_size_down(&data_ptr, &size_left, MEMORY_ALIGNMENT);
153153

154154
pool->metadata.data_ptr = data_ptr;
155155
pool->metadata.size_left = size_left;

src/utils/utils_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "utils_assert.h"
1313
#include "utils_common.h"
1414

15-
// align a pointer and a size
16-
void utils_align_ptr_size(void **ptr, size_t *size, size_t alignment) {
15+
// align a pointer up and a size down
16+
void utils_align_ptr_up_size_down(void **ptr, size_t *size, size_t alignment) {
1717
uintptr_t p = (uintptr_t)*ptr;
1818
size_t s = *size;
1919

src/utils/utils_common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ int utils_is_running_in_proxy_lib(void);
8282

8383
size_t utils_get_page_size(void);
8484

85-
// align a pointer and a size
86-
void utils_align_ptr_size(void **ptr, size_t *size, size_t alignment);
85+
// align a pointer up and a size down
86+
void utils_align_ptr_up_size_down(void **ptr, size_t *size, size_t alignment);
8787

8888
// get the current process ID
8989
int utils_getpid(void);

0 commit comments

Comments
 (0)