Skip to content

Use defined os_mutex_t in base_alloc.c #183

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
Jan 29, 2024
Merged

Use defined os_mutex_t in base_alloc.c #183

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
25 changes: 11 additions & 14 deletions src/base_alloc/base_alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define MINIMUM_CHUNK_COUNT (128)

// alignment of the base allocator
#define MEMORY_ALIGNMENT (8)
#define MEMORY_ALIGNMENT (sizeof(uintptr_t))

typedef struct umf_ba_chunk_t umf_ba_chunk_t;
typedef struct umf_ba_next_pool_t umf_ba_next_pool_t;
Expand All @@ -34,7 +34,7 @@ struct umf_ba_chunk_t {
struct umf_ba_main_pool_meta_t {
size_t pool_size; // size of each pool (argument of each ba_os_alloc() call)
size_t chunk_size; // size of all memory chunks in this pool
os_mutex_t *free_lock; // lock of free_list
os_mutex_t free_lock; // lock of free_list
umf_ba_chunk_t *free_list; // list of free chunks
#ifndef NDEBUG
size_t n_pools;
Expand Down Expand Up @@ -146,29 +146,26 @@ umf_ba_pool_t *umf_ba_create(size_t size) {

align_ptr_size((void **)&data_ptr, &size_left, MEMORY_ALIGNMENT);

// allocate and init free_lock
pool->metadata.free_lock = util_mutex_init(data_ptr);
if (!pool->metadata.free_lock) {
// init free_lock
os_mutex_t *mutex = util_mutex_init(&pool->metadata.free_lock);
if (!mutex) {
ba_os_free(pool, pool_size);
return NULL;
}

data_ptr += mutex_size; // free_lock is here
size_left -= mutex_size; // for free_lock

pool->metadata.free_list = NULL;
ba_divide_memory_into_chunks(pool, data_ptr, size_left);

return pool;
}

void *umf_ba_alloc(umf_ba_pool_t *pool) {
util_mutex_lock(pool->metadata.free_lock);
util_mutex_lock(&pool->metadata.free_lock);
if (pool->metadata.free_list == NULL) {
umf_ba_next_pool_t *new_pool =
(umf_ba_next_pool_t *)ba_os_alloc(pool->metadata.pool_size);
if (!new_pool) {
util_mutex_unlock(pool->metadata.free_lock);
util_mutex_unlock(&pool->metadata.free_lock);
return NULL;
}

Expand All @@ -194,7 +191,7 @@ void *umf_ba_alloc(umf_ba_pool_t *pool) {
pool->metadata.n_allocs++;
ba_debug_checks(pool);
#endif /* NDEBUG */
util_mutex_unlock(pool->metadata.free_lock);
util_mutex_unlock(&pool->metadata.free_lock);

return chunk;
}
Expand All @@ -206,14 +203,14 @@ void umf_ba_free(umf_ba_pool_t *pool, void *ptr) {

umf_ba_chunk_t *chunk = (umf_ba_chunk_t *)ptr;

util_mutex_lock(pool->metadata.free_lock);
util_mutex_lock(&pool->metadata.free_lock);
chunk->next = pool->metadata.free_list;
pool->metadata.free_list = chunk;
#ifndef NDEBUG
pool->metadata.n_allocs--;
ba_debug_checks(pool);
#endif /* NDEBUG */
util_mutex_unlock(pool->metadata.free_lock);
util_mutex_unlock(&pool->metadata.free_lock);
}

void umf_ba_destroy(umf_ba_pool_t *pool) {
Expand All @@ -230,6 +227,6 @@ void umf_ba_destroy(umf_ba_pool_t *pool) {
ba_os_free(current_pool, size);
}

util_mutex_destroy_not_free(pool->metadata.free_lock);
util_mutex_destroy_not_free(&pool->metadata.free_lock);
ba_os_free(pool, size);
}