Changeset ad64a2d in mainline for generic/src/mm/frame.c

Timestamp:

2006-03-19T21:51:31Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8d25b44

Parents:

7c7aae16

Message:

Fix bug with refcounts in frame allocator after zone_merge. (it caused some
frames not to be coalesced).

File:

• generic/src/mm/frame.c (modified) (2 diffs)

generic/src/mm/frame.c

@@ -538 +538 @@
         }
         /* Copy frames from both zones to preserve full frame orders,
-         * parents etc. Set all frames with refcount=0 to 1, because
+         * parents etc. Set all free frames with refcount=0 to 1, because
          * we add all free frames to buddy allocator later again, clear
-         * order to 0.
+         * order to 0. Don't set busy frames with refcount=0, as they
+         * will not be reallocated during merge and it would make later
+         * problems with allocation/free.
          */
         for (i=0; i<z1->count; i++)
@@ -548 +550 @@
                 z->frames[z2idx] = z2->frames[i];
         }
-        for (i=0; i < z->count; i++) {
-                if (!z->frames[i].refcount) {
+        i = 0;
+        while (i < z->count) {
+                if (z->frames[i].refcount) {
+                        /* skip busy frames */
+                        i += 1 << z->frames[i].buddy_order;
+                } else { /* Free frames, set refcount=1 */
+                        /* All free frames have refcount=0, we need not
+                         * to check the order */
                         z->frames[i].refcount = 1;
                         z->frames[i].buddy_order = 0;
+                        i++;
                 }
         }