Changeset 3342f33 in mainline for kernel/generic/src/lib/ra.c

Timestamp:

2011-12-09T21:35:29Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bb7e6fc5

Parents:

12cb03d

Message:

Basic locking for resource allocator.

File:

• kernel/generic/src/lib/ra.c (modified) (7 diffs)

kernel/generic/src/lib/ra.c

@@ -53 +53 @@
 #include <align.h>
 #include <macros.h>
+#include <synch/spinlock.h>
 
 #define USED_BUCKETS    1024
@@ -197 +198 @@
         }
 
+        spinlock_initialize(&arena->lock, "arena_lock");
         list_initialize(&arena->spans);
         list_append(&span->span_link, &arena->spans);
@@ -216 +218 @@
 
         /* TODO: check for overlaps */
+        spinlock_lock(&arena->lock);
         list_append(&span->span_link, &arena->spans);
+        spinlock_unlock(&arena->lock);
         return true;
 }
@@ -395 +399 @@
         ASSERT(ispwr2(alignment));
 
+        spinlock_lock(&arena->lock);
         list_foreach(arena->spans, cur) {
                 ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
@@ -402 +407 @@
                         break;
         }
+        spinlock_unlock(&arena->lock);
 
         return base;
@@ -409 +415 @@
 void ra_free(ra_arena_t *arena, uintptr_t base, size_t size)
 {
+        spinlock_lock(&arena->lock);
         list_foreach(arena->spans, cur) {
                 ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
@@ -414 +421 @@
                 if (iswithin(span->base, span->size, base, size)) {
                         ra_span_free(span, base, size);
+                        spinlock_unlock(&arena->lock);
                         return;
                 }
         }
+        spinlock_unlock(&arena->lock);
 
         panic("Freeing to wrong arena (base=%" PRIxn ", size=%" PRIdn ").",