Skip to content

Commit

Permalink
trivial: fix style issues
Browse files Browse the repository at this point in the history 
Signed-off-by: Axel Heider <[email protected]>
  • Loading branch information
@axel-h
axel-h committed Jan 12, 2024
1 parent f344301 commit dd50eed
Showing 1 changed file with 68 additions and 31 deletions.
99 changes: 68 additions & 31 deletions libsel4allocman/src/allocman.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,24 @@ static inline void _end_operation(allocman_t *alloc, int root)
}
}

static void allocman_mspace_queue_for_free(allocman_t *alloc, void *ptr, size_t bytes) {
static void allocman_mspace_queue_for_free(allocman_t *alloc, void *ptr, size_t bytes)
{
if (alloc->num_freed_mspace_chunks == alloc->desired_freed_mspace_chunks) {
assert(!"Out of space to store free'd objects. Leaking memory");
return;
}

alloc->freed_mspace_chunks[alloc->num_freed_mspace_chunks] =
(struct allocman_freed_mspace_chunk) {ptr, bytes};
(struct allocman_freed_mspace_chunk) {
.ptr = ptr,
.size = bytes
};

alloc->num_freed_mspace_chunks++;
}

static void allocman_cspace_queue_for_free(allocman_t *alloc, const cspacepath_t *path) {
static void allocman_cspace_queue_for_free(allocman_t *alloc, const cspacepath_t *path)
{
if (alloc->num_freed_slots == alloc->desired_freed_slots) {
assert(!"Out of space to store free'd objects. Leaking memory");
return;
Expand All @@ -67,13 +74,19 @@ static void allocman_cspace_queue_for_free(allocman_t *alloc, const cspacepath_t
alloc->num_freed_slots++;
}

static void allocman_utspace_queue_for_free(allocman_t *alloc, seL4_Word cookie, size_t size_bits) {
static void allocman_utspace_queue_for_free(allocman_t *alloc, seL4_Word cookie, size_t size_bits)
{
if (alloc->num_freed_utspace_chunks == alloc->desired_freed_utspace_chunks) {
assert(!"Out of space to store free'd objects. Leaking memory");
return;
}

alloc->freed_utspace_chunks[alloc->num_freed_utspace_chunks] =
(struct allocman_freed_utspace_chunk) {size_bits, cookie};
(struct allocman_freed_utspace_chunk) {
.size_bits = size_bits,
.cookie = cookie
};

alloc->num_freed_utspace_chunks++;
}

Expand Down Expand Up @@ -135,7 +148,8 @@ static int _try_watermark_cspace(allocman_t *alloc, cspacepath_t *slot)
return 0;
}

static seL4_Word _try_watermark_utspace(allocman_t *alloc, size_t size_bits, seL4_Word type, const cspacepath_t *path, int *_error)
static seL4_Word _try_watermark_utspace(allocman_t *alloc, size_t size_bits, seL4_Word type, const cspacepath_t *path,
int *_error)
{
size_t i;

Expand Down Expand Up @@ -255,14 +269,15 @@ static int _allocman_cspace_alloc(allocman_t *alloc, cspacepath_t *slot, int use
}
}

static seL4_Word _allocman_utspace_alloc(allocman_t *alloc, size_t size_bits, seL4_Word type, const cspacepath_t *path, uintptr_t paddr, bool canBeDev, int *_error, int use_watermark)
static seL4_Word _allocman_utspace_alloc(allocman_t *alloc, size_t size_bits, seL4_Word type, const cspacepath_t *path,
uintptr_t paddr, bool canBeDev, int *_error, int use_watermark)
{
int root_op;
int error;
seL4_Word ret;
/* see if we have an allocator installed yet*/
if (!alloc->have_utspace) {
SET_ERROR(_error,1);
SET_ERROR(_error, 1);
return 0;
}
/* Check that we are permitted to utspace_alloc here */
Expand Down Expand Up @@ -314,7 +329,8 @@ int allocman_cspace_alloc(allocman_t *alloc, cspacepath_t *slot)
return _allocman_cspace_alloc(alloc, slot, 1);
}

seL4_Word allocman_utspace_alloc_at(allocman_t *alloc, size_t size_bits, seL4_Word type, const cspacepath_t *path, uintptr_t paddr, bool canBeDev, int *_error)
seL4_Word allocman_utspace_alloc_at(allocman_t *alloc, size_t size_bits, seL4_Word type, const cspacepath_t *path,
uintptr_t paddr, bool canBeDev, int *_error)
{
return _allocman_utspace_alloc(alloc, size_bits, type, path, paddr, canBeDev, _error, 1);
}
Expand Down Expand Up @@ -379,7 +395,8 @@ static int _refill_watermark(allocman_t *alloc)
error = allocman_cspace_alloc(alloc, &slot);
if (!error) {
/* Now try to allocate */
cookie = _allocman_utspace_alloc(alloc, alloc->utspace_chunk[i].size_bits, alloc->utspace_chunk[i].type, &slot, ALLOCMAN_NO_PADDR, false, &error, 0);
cookie = _allocman_utspace_alloc(alloc, alloc->utspace_chunk[i].size_bits, alloc->utspace_chunk[i].type, &slot,
ALLOCMAN_NO_PADDR, false, &error, 0);
if (!error) {
alloc->utspace_chunks[i][alloc->utspace_chunk_count[i]].cookie = cookie;
alloc->utspace_chunks[i][alloc->utspace_chunk_count[i]].slot = slot;
Expand Down Expand Up @@ -414,7 +431,8 @@ static int _refill_watermark(allocman_t *alloc)
return found_empty_pool;
}

int allocman_create(allocman_t *alloc, struct mspace_interface mspace) {
int allocman_create(allocman_t *alloc, struct mspace_interface mspace)
{
/* zero out the struct */
memset(alloc, 0, sizeof(allocman_t));

Expand All @@ -424,7 +442,8 @@ int allocman_create(allocman_t *alloc, struct mspace_interface mspace) {
return 0;
}

int allocman_fill_reserves(allocman_t *alloc) {
int allocman_fill_reserves(allocman_t *alloc)
{
int full;
int root = _start_operation(alloc);
/* force the reserves to be checked */
Expand All @@ -449,15 +468,18 @@ int allocman_fill_reserves(allocman_t *alloc) {
return 0; \
}while(0)

int allocman_attach_utspace(allocman_t *alloc, struct utspace_interface utspace) {
int allocman_attach_utspace(allocman_t *alloc, struct utspace_interface utspace)
{
ALLOCMAN_ATTACH(alloc, utspace, utspace);
}

int allocman_attach_cspace(allocman_t *alloc, struct cspace_interface cspace) {
int allocman_attach_cspace(allocman_t *alloc, struct cspace_interface cspace)
{
ALLOCMAN_ATTACH(alloc, cspace, cspace);
}

static int resize_array(allocman_t *alloc, size_t num, void **array, size_t *size, size_t *count, size_t item_size) {
static int resize_array(allocman_t *alloc, size_t num, void **array, size_t *size, size_t *count, size_t item_size)
{
int root = _start_operation(alloc);
void *new_array;
int error;
Expand Down Expand Up @@ -490,27 +512,35 @@ static int resize_array(allocman_t *alloc, size_t num, void **array, size_t *siz
return error;
}

static int resize_slots_array(allocman_t *alloc, size_t num, cspacepath_t **slots, size_t *size, size_t *count) {
return resize_array(alloc, num, (void**)slots, size, count, sizeof(cspacepath_t));
static int resize_slots_array(allocman_t *alloc, size_t num, cspacepath_t **slots, size_t *size, size_t *count)
{
return resize_array(alloc, num, (void **)slots, size, count, sizeof(cspacepath_t));
}

int allocman_configure_cspace_reserve(allocman_t *alloc, size_t num) {
int allocman_configure_cspace_reserve(allocman_t *alloc, size_t num)
{
return resize_slots_array(alloc, num, &alloc->cspace_slots, &alloc->desired_cspace_slots, &alloc->num_cspace_slots);
}

int allocman_configure_max_freed_slots(allocman_t *alloc, size_t num) {
int allocman_configure_max_freed_slots(allocman_t *alloc, size_t num)
{
return resize_slots_array(alloc, num, &alloc->freed_slots, &alloc->desired_freed_slots, &alloc->num_freed_slots);
}

int allocman_configure_max_freed_memory_chunks(allocman_t *alloc, size_t num) {
return resize_array(alloc, num, (void**)&alloc->freed_mspace_chunks, &alloc->desired_freed_mspace_chunks, &alloc->num_freed_mspace_chunks, sizeof(struct allocman_freed_mspace_chunk));
int allocman_configure_max_freed_memory_chunks(allocman_t *alloc, size_t num)
{
return resize_array(alloc, num, (void **)&alloc->freed_mspace_chunks, &alloc->desired_freed_mspace_chunks,
&alloc->num_freed_mspace_chunks, sizeof(struct allocman_freed_mspace_chunk));
}

int allocman_configure_max_freed_untyped_chunks(allocman_t *alloc, size_t num) {
return resize_array(alloc, num, (void**)&alloc->freed_utspace_chunks, &alloc->desired_freed_utspace_chunks, &alloc->num_freed_utspace_chunks, sizeof(struct allocman_freed_utspace_chunk));
int allocman_configure_max_freed_untyped_chunks(allocman_t *alloc, size_t num)
{
return resize_array(alloc, num, (void **)&alloc->freed_utspace_chunks, &alloc->desired_freed_utspace_chunks,
&alloc->num_freed_utspace_chunks, sizeof(struct allocman_freed_utspace_chunk));
}

int allocman_configure_utspace_reserve(allocman_t *alloc, struct allocman_utspace_chunk chunk) {
int allocman_configure_utspace_reserve(allocman_t *alloc, struct allocman_utspace_chunk chunk)
{
int root = _start_operation(alloc);
size_t i;
struct allocman_utspace_chunk *new_chunk;
Expand All @@ -529,7 +559,9 @@ int allocman_configure_utspace_reserve(allocman_t *alloc, struct allocman_utspac
}
}
/* tack this chunk on */
new_chunk = allocman_mspace_alloc(alloc, sizeof(struct allocman_utspace_chunk) * (alloc->num_utspace_chunks + 1), &error);
new_chunk = allocman_mspace_alloc(alloc,
sizeof(struct allocman_utspace_chunk) * (alloc->num_utspace_chunks + 1),
&error);
if (error) {
goto exit;
}
Expand All @@ -538,7 +570,9 @@ int allocman_configure_utspace_reserve(allocman_t *alloc, struct allocman_utspac
allocman_mspace_free(alloc, new_chunk, sizeof(struct allocman_utspace_chunk) * (alloc->num_utspace_chunks + 1));
goto exit;
}
new_chunks = allocman_mspace_alloc(alloc, sizeof(struct allocman_utspace_allocation *) * (alloc->num_utspace_chunks + 1), &error);
new_chunks = allocman_mspace_alloc(alloc,
sizeof(struct allocman_utspace_allocation *) * (alloc->num_utspace_chunks + 1),
&error);
if (error) {
allocman_mspace_free(alloc, new_chunk, sizeof(struct allocman_utspace_chunk) * (alloc->num_utspace_chunks + 1));
allocman_mspace_free(alloc, new_counts, sizeof(size_t) * (alloc->num_utspace_chunks + 1));
Expand All @@ -557,7 +591,8 @@ int allocman_configure_utspace_reserve(allocman_t *alloc, struct allocman_utspac
memcpy(new_chunks, alloc->utspace_chunks, sizeof(struct allocman_utspace_allocation *) * alloc->num_utspace_chunks);
allocman_mspace_free(alloc, alloc->utspace_chunk, sizeof(struct allocman_utspace_chunk) * alloc->num_utspace_chunks);
allocman_mspace_free(alloc, alloc->utspace_chunk_count, sizeof(size_t) * alloc->num_utspace_chunks);
allocman_mspace_free(alloc, alloc->utspace_chunks, sizeof(struct allocman_utspace_allocation *) * alloc->num_utspace_chunks);
allocman_mspace_free(alloc, alloc->utspace_chunks,
sizeof(struct allocman_utspace_allocation *) * alloc->num_utspace_chunks);
}
new_chunk[alloc->num_utspace_chunks] = chunk;
new_counts[alloc->num_utspace_chunks] = 0;
Expand All @@ -572,7 +607,8 @@ int allocman_configure_utspace_reserve(allocman_t *alloc, struct allocman_utspac
return error;
}

int allocman_configure_mspace_reserve(allocman_t *alloc, struct allocman_mspace_chunk chunk) {
int allocman_configure_mspace_reserve(allocman_t *alloc, struct allocman_mspace_chunk chunk)
{
int root = _start_operation(alloc);
size_t i;
struct allocman_mspace_chunk *new_chunk;
Expand Down Expand Up @@ -635,13 +671,14 @@ int allocman_configure_mspace_reserve(allocman_t *alloc, struct allocman_mspace_
}


int allocman_add_untypeds_from_timer_objects(allocman_t *alloc, timer_objects_t *to) {
int allocman_add_untypeds_from_timer_objects(allocman_t *alloc, timer_objects_t *to)
{
int error = 0;
for (size_t i = 0; i < to->nobjs; i++) {
cspacepath_t path = allocman_cspace_make_path(alloc, to->objs[i].obj.cptr);
error = allocman_utspace_add_uts(alloc, 1, &path, &to->objs[i].obj.size_bits,
(uintptr_t *) &to->objs[i].region.base_addr,
ALLOCMAN_UT_DEV);
(uintptr_t *) &to->objs[i].region.base_addr,
ALLOCMAN_UT_DEV);
if (error) {
ZF_LOGE("Failed to add ut to allocman");
return error;
Expand Down

0 comments on commit dd50eed

Please sign in to comment.