Changeset bb7e6fc5 in mainline

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c24b272f

Parents:

3342f33

Message:

Do not create an initial span on ra_arena_create().

Location:

kernel/generic

Files:

• include/lib/ra.h (modified) (1 diff)
• src/lib/ra.c (modified) (2 diffs)

kernel/generic/include/lib/ra.h

@@ -77 +77 @@
 } ra_segment_t;
 
-extern ra_arena_t *ra_arena_create(uintptr_t, size_t);
+extern ra_arena_t *ra_arena_create(void);
 extern bool ra_span_add(ra_arena_t *, uintptr_t, size_t);
 extern uintptr_t ra_alloc(ra_arena_t *, size_t, size_t);

kernel/generic/src/lib/ra.c

@@ -174 +174 @@
 }
 
-/** Create arena with initial span. */
-ra_arena_t *ra_arena_create(uintptr_t base, size_t size)
+/** Create an empty arena. */
+ra_arena_t *ra_arena_create(void)
 {
         ra_arena_t *arena;
+
+        arena = (ra_arena_t *) malloc(sizeof(ra_arena_t), FRAME_ATOMIC);
+        if (!arena)
+                return NULL;
+
+        spinlock_initialize(&arena->lock, "arena_lock");
+        list_initialize(&arena->spans);
+
+        return arena;
+}
+
+/** Add a span to arena. */
+bool ra_span_add(ra_arena_t *arena, uintptr_t base, size_t size)
+{
         ra_span_t *span;
 
@@ -185 +199 @@
          * slightly change the API of the resource allocator.
          */
-        if (base == 0)
-                return NULL;
-
-        arena = (ra_arena_t *) malloc(sizeof(ra_arena_t), FRAME_ATOMIC);
-        if (!arena)
-                return NULL;
-
-        span = ra_span_create(base, size);
-        if (!span) {
-                free(arena);
-                return NULL;
-        }
-
-        spinlock_initialize(&arena->lock, "arena_lock");
-        list_initialize(&arena->spans);
-        list_append(&span->span_link, &arena->spans);
-
-        return arena;
-}
-
-/** Add additional span to arena. */
-bool ra_span_add(ra_arena_t *arena, uintptr_t base, size_t size)
-{
-        ra_span_t *span;
-
         if (base == 0)
                 return false;