mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

resource allocator: use list abstraction

Browse Source
This commit is contained in:
Matheus
2026-10-14 23:10:35 -03:00
parent 26cd12e7c6
commit 01ea6c1256
2 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/resource_allocator.h
+3 -4
View File
@@ -4,19 +4,18 @@
// simple FIFO allocator for an arbritary resource // simple FIFO allocator for an arbritary resource
#include <kernel/scheduler.h> #include <kernel/scheduler.h>
#include <list.h>
#include <spinlock.h> #include <spinlock.h>
// TODO move this to a proper dequeue abstraction
typedef struct resource_allocator_waiter_t { typedef struct resource_allocator_waiter_t {
size_t requested; size_t requested;
thread_t *thread; thread_t *thread;
struct resource_allocator_waiter_t *next; list_node_t list_node;
} resource_allocator_waiter_t; } resource_allocator_waiter_t;
typedef struct { typedef struct {
spinlock_t spinlock; // a spinlock is used to allow freeing in an interrupt context spinlock_t spinlock; // a spinlock is used to allow freeing in an interrupt context
resource_allocator_waiter_t *queue; list_node_t queue;
resource_allocator_waiter_t *tail;
size_t resource_current; size_t resource_current;
size_t allocate_max; size_t allocate_max;
} resource_allocator_t; } resource_allocator_t;
kernel-src/lib/resource_allocator.c
+12 -24
View File
@@ -1,25 +1,10 @@
#include <resource_allocator.h> #include <resource_allocator.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <util.h>
static void insert(resource_allocator_t *allocator, resource_allocator_waiter_t *node) {
if (allocator->queue) {
allocator->tail->next = node;
allocator->tail = node;
} else {
allocator->queue = node;
allocator->tail = node;
}
}
static void pop(resource_allocator_t *allocator) {
resource_allocator_waiter_t *w = allocator->queue;
allocator->queue = w->next;
sched_wakeup(w->thread, 0);
}
void resource_allocator_init(resource_allocator_t *allocator, size_t resource_total, size_t allocate_max) { void resource_allocator_init(resource_allocator_t *allocator, size_t resource_total, size_t allocate_max) {
SPINLOCK_INIT(allocator->spinlock); SPINLOCK_INIT(allocator->spinlock);
allocator->queue = allocator->tail = NULL; list_init(&allocator->queue);
allocator->resource_current = resource_total; allocator->resource_current = resource_total;
allocator->allocate_max = allocate_max; allocator->allocate_max = allocate_max;
} }
@@ -28,14 +13,13 @@ size_t resource_allocate(resource_allocator_t *allocator, size_t count) {
count = min(allocator->allocate_max, count); count = min(allocator->allocate_max, count);
bool status = spinlock_acquire_irq_clear(&allocator->spinlock); bool status = spinlock_acquire_irq_clear(&allocator->spinlock);
if (allocator->queue || allocator->resource_current < count) { if (!list_is_empty(&allocator->queue) || allocator->resource_current < count) {
resource_allocator_waiter_t waiter = { resource_allocator_waiter_t waiter = {
.requested = count, .requested = count,
.thread = current_thread(), .thread = current_thread()
.next = NULL
}; };
insert(allocator, &waiter); list_push_back(&allocator->queue, &waiter.list_node);
sched_prepare_sleep(false); sched_prepare_sleep(false);
spinlock_release(&allocator->spinlock); spinlock_release(&allocator->spinlock);
sched_yield(); sched_yield();
@@ -54,10 +38,14 @@ void resource_free(resource_allocator_t *allocator, size_t count) {
allocator->resource_current += count; allocator->resource_current += count;
while (allocator->queue && allocator->queue->requested <= allocator->resource_current) { while (!list_is_empty(&allocator->queue)) {
allocator->resource_current -= allocator->queue->requested; resource_allocator_waiter_t *waiter = container_of(list_get_first(&allocator->queue), resource_allocator_waiter_t, list_node);
if (waiter->requested > allocator->resource_current)
break;
allocator->resource_current -= waiter->requested;
pop(allocator); list_remove(&waiter->list_node);
sched_wakeup(waiter->thread, 0);
} }
spinlock_release_irq_restore(&allocator->spinlock, status); spinlock_release_irq_restore(&allocator->spinlock, status);