Changeset 2a9543d in mainline

Timestamp:

2005-09-28T13:22:21Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

40a468a

Parents:

32ff43e6

Message:

Optimize buddy_system_free().
Remove special-case code from the main codepath.

File:

• src/mm/buddy.c (modified) (1 diff)

src/mm/buddy.c

@@ -163 +163 @@
         ASSERT(i < b->max_order);
 
-        /*
-         * See if there is any buddy in the list of order i.
-         */
-        buddy = b->op->find_buddy(block);
-        
-        if (buddy && i != b->max_order - 1) {
-
-                ASSERT(b->op->get_order(buddy) == i);
-                
+        if (i != b->max_order - 1) {
                 /*
-                 * Remove buddy from the list of order i.
+                 * See if there is any buddy in the list of order i.
                  */
-                list_remove(buddy);
-                
-                /*
-                 * 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.
-                 */
-                hlp = b->op->coalesce(block, buddy);
-
-                /*
-                 * Set order of the coalesced block to i + 1.
-                 */
-                b->op->set_order(hlp, i + 1);
-
-                /*
-                 * Recursively add the coalesced block to the list of order i + 1.
-                 */
-                buddy_system_free(b, hlp);
+                buddy = b->op->find_buddy(block);
+                if (buddy) {
+
+                        ASSERT(b->op->get_order(buddy) == i);
+                
+                        /*
+                         * Remove buddy from the list of order i.
+                         */
+                        list_remove(buddy);
+                
+                        /*
+                         * 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.
+                         */
+                        hlp = b->op->coalesce(block, buddy);
+
+                        /*
+                         * Set order of the coalesced block to i + 1.
+                         */
+                        b->op->set_order(hlp, i + 1);
+
+                        /*
+                         * Recursively add the coalesced block to the list of order i + 1.
+                         */
+                        buddy_system_free(b, hlp);
+                        return;
+                }
         }
-        else {
-                /*
-                 * Insert block into the list of order i.
-                 */
-                list_append(block, &b->order[i]);
-        }
+
+        /*
+         * Insert block into the list of order i.
+         */
+        list_append(block, &b->order[i]);
 
 }