Changeset 32ff43e6 in mainline

Timestamp:

2005-09-28T13:00:11Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a9543d

Parents:

a58db280

Message:

Redeclare eraly_malloc() with attribute ((malloc)) to improve optimizations.

Reorganize #include's in scheduler.c.

Buddy system improvements.
Make buddy_system_free() explicitly invalidate order of blocks before they are coalesced.
Add some assertions.

Files:

• include/mm/buddy.h (modified) (1 diff)
• include/mm/heap.h (modified) (1 diff)
• src/mm/buddy.c (modified) (3 diffs)
• src/proc/scheduler.c (modified) (1 diff)

include/mm/buddy.h

@@ -33 +33 @@
 #include <typedefs.h>
 
+#define BUDDY_SYSTEM_INNER_BLOCK        0xff
+
 struct buddy_operations {
         link_t *(* find_buddy)(link_t *);

include/mm/heap.h

@@ -46 +46 @@
 extern void early_heap_init(__address heap, size_t size);
 
-extern void *early_malloc(size_t size);
+extern void *early_malloc(size_t size) __attribute__ ((malloc));
 extern void early_free(void *ptr);
 

src/mm/buddy.c

@@ -49 +49 @@
         int i;
 
+        ASSERT(max_order < BUDDY_SYSTEM_INNER_BLOCK);
+
         ASSERT(op->find_buddy);
         ASSERT(op->set_order);
@@ -167 +169 @@
         
         if (buddy && i != b->max_order - 1) {
+
+                ASSERT(b->op->get_order(buddy) == i);
+                
                 /*
                  * Remove buddy from the list of order i.
@@ -173 +178 @@
                 
                 /*
+                 * Invalidate order of both block and buddy.
+                 */
+                b->op->set_order(block, BUDDY_SYSTEM_INNER_BLOCK);
+                b->op->set_order(buddy, BUDDY_SYSTEM_INNER_BLOCK);
+                
+                /*
                  * Coalesce block and buddy into one block.
                  */

src/proc/scheduler.c

@@ -30 +30 @@
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <cpu.h>
+#include <mm/heap.h>
+#include <mm/frame.h>
+#include <mm/page.h>
 #include <mm/vm.h>
+#include <arch/asm.h>
+#include <arch/faddr.h>
+#include <arch/atomic.h>
+#include <synch/spinlock.h>
 #include <config.h>
 #include <context.h>
 #include <func.h>
 #include <arch.h>
-#include <arch/asm.h>
 #include <list.h>
 #include <panic.h>
 #include <typedefs.h>
-#include <mm/page.h>
-#include <synch/spinlock.h>
-#include <arch/faddr.h>
-#include <arch/atomic.h>
+#include <cpu.h>
 #include <print.h>
-#include <mm/frame.h>
-#include <mm/heap.h>
 #include <debug.h>