Skip to content

Use unused ba_leak_aligned_alloc() #942

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 2 commits into from
Nov 27, 2024
Merged

Use unused ba_leak_aligned_alloc() #942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a3aec
Remove not needed code
ldorau Nov 27, 2024
98745dd
Use unused ba_leak_aligned_alloc()
ldorau Nov 27, 2024
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
25 changes: 9 additions & 16 deletions src/proxy_lib/proxy_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,6 @@ static int get_system_allocator_symbols(void) {
return 0;
}

*((void **)(&System_aligned_alloc)) = NULL;
*((void **)(&System_calloc)) = NULL;
*((void **)(&System_free)) = NULL;
*((void **)(&System_malloc)) = NULL;
*((void **)(&System_malloc_usable_size)) = NULL;
*((void **)(&System_realloc)) = NULL;

return -1;
}
#endif /* _WIN32 */
Expand Down Expand Up @@ -323,28 +316,28 @@ static void ba_leak_init_once(void) {
utils_init_once(&Base_alloc_leak_initialized, ba_leak_create);
}

static inline void *ba_leak_malloc(size_t size) {
static inline void *ba_leak_aligned_alloc(size_t alignment, size_t size) {
ba_leak_init_once();
return umf_ba_linear_alloc(Base_alloc_leak, size);
void *ptr = umf_ba_linear_alloc(Base_alloc_leak, size + alignment);
return (void *)ALIGN_UP_SAFE((uintptr_t)ptr, alignment);
}

static inline void *ba_leak_malloc(size_t size) {
return ba_leak_aligned_alloc(0, size);
}

static inline void *ba_leak_calloc(size_t nmemb, size_t size) {
ba_leak_init_once();
// umf_ba_linear_alloc() returns zeroed memory
return umf_ba_linear_alloc(Base_alloc_leak, nmemb * size);
// so ba_leak_aligned_alloc() does too
return ba_leak_aligned_alloc(0, nmemb * size);
}

static inline void *ba_leak_realloc(void *ptr, size_t size, size_t max_size) {
ba_leak_init_once();
return ba_generic_realloc(Base_alloc_leak, ptr, size, max_size);
}

static inline void *ba_leak_aligned_alloc(size_t alignment, size_t size) {
ba_leak_init_once();
void *ptr = umf_ba_linear_alloc(Base_alloc_leak, size + alignment);
return (void *)ALIGN_UP_SAFE((uintptr_t)ptr, alignment);
}

static inline int ba_leak_free(void *ptr) {
ba_leak_init_once();
return umf_ba_linear_free(Base_alloc_leak, ptr);
Expand Down
Loading