Changeset 02667d9 in mainline

Timestamp:

2017-10-09T19:10:25Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bfdb7c63

Parents:

d75dc05

Message:

Resource arenas should be destructible

Location:

kernel/generic

Files:

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

kernel/generic/include/lib/ra.h

@@ -87 +87 @@
 extern void ra_init(void);
 extern ra_arena_t *ra_arena_create(void);
+extern void ra_arena_destroy(ra_arena_t *);
 extern bool ra_span_add(ra_arena_t *, uintptr_t, size_t);
 extern bool ra_alloc(ra_arena_t *, size_t, size_t, uintptr_t *);

kernel/generic/src/lib/ra.c

@@ -75 +75 @@
 static bool used_key_equal(void *key, const ht_link_t *item)
 {
-        uintptr_t *base = (sysarg_t *) key;
+        uintptr_t *base = (uintptr_t *) key;
         ra_segment_t *seg = hash_table_get_inst(item, ra_segment_t, uh_link);
         return seg->base == *base;
@@ -184 +184 @@
 }
 
+static void ra_span_destroy(ra_span_t *span)
+{
+        hash_table_destroy(&span->used);
+
+        list_foreach_safe(span->segments, cur, next) {
+                ra_segment_t *seg = list_get_instance(cur, ra_segment_t,
+                    segment_link);
+                list_remove(&seg->segment_link);
+                if (seg->flags & RA_SEGMENT_FREE)
+                        list_remove(&seg->fl_link);
+                ra_segment_destroy(seg);
+        }
+
+        free(span);
+}
+
 /** Create an empty arena. */
 ra_arena_t *ra_arena_create(void)
@@ -197 +213 @@
 
         return arena;
+}
+
+void ra_arena_destroy(ra_arena_t *arena)
+{
+        /*
+         * No locking necessary as this is the cleanup and all users should have
+         * stopped using the arena already.
+         */
+        list_foreach_safe(arena->spans, cur, next) {
+                ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
+                list_remove(&span->span_link);
+                ra_span_destroy(span);
+        }
+
+        free(arena);
 }