Changeset 1093620 in mainline for generic/src/mm/buddy.c

Timestamp:

2006-01-22T16:51:11Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

0d8d27c

Parents:

bd6e392

Message:

Fixes, comments, tests to frame allocator

File:

• generic/src/mm/buddy.c (modified) (7 diffs)

generic/src/mm/buddy.c

@@ -69 +69 @@
                  * Allocate memory for all orders this buddy system will work with.
                  */
-                b->order = (link_t *) early_malloc(max_order * sizeof(link_t));
+                b->order = (link_t *) early_malloc((max_order + 1) * sizeof(link_t));
                 if (!b->order) {
                         early_free(b);
@@ -75 +75 @@
                 }
         
-                for (i = 0; i < max_order; i++)
+                for (i = 0; i <= max_order; i++)
                         list_initialize(&b->order[i]);
         
@@ -96 +96 @@
         __u8 k;
         
-        ASSERT(i < b->max_order);
-        
-        for (k=i; k < b->max_order; k++) {
+        /*
+         * If requested block is greater then maximal block
+         * we know immediatly that we cannot satisfy the request.
+         */
+        if (i > b->max_order) return false;
+
+        /*
+         * Check if any bigger or equal order has free elements
+         */
+        for (k=i; k <= b->max_order; k++) {
                 if (!list_empty(&b->order[k])) {
                         return true;
@@ -119 +126 @@
         link_t *res, *hlp;
 
-        ASSERT(i < b->max_order);
+        ASSERT(i <= b->max_order);
 
         /*
@@ -136 +143 @@
          * the request cannot be satisfied.
          */
-        if (i == b->max_order - 1)
+        if (i == b->max_order)
                 return NULL;
 
@@ -186 +193 @@
         i = b->op->get_order(b, block);
 
-        ASSERT(i < b->max_order);
-
-        if (i != b->max_order - 1) {
+        ASSERT(i <= b->max_order);
+
+        if (i != b->max_order) {
                 /*
                  * See if there is any buddy in the list of order i.
@@ -246 +253 @@
         printf("-----\t------\t--------\t----------\t---------------\n");
         
-        for (i=0;i < b->max_order; i++) {
+        for (i=0;i <= b->max_order; i++) {
                 cnt = 0;
                 if (!list_empty(&b->order[i])) {