Changeset 5d2ab23 in mainline for generic/src/mm/frame.c

Timestamp:

2006-01-17T20:52:33Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

64c44e8

Parents:

77147d6

Message:

Commit of the falloc_bad branch to trunk (719:723).

File:

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

generic/src/mm/frame.c

@@ -134 +134 @@
         }
                 
-
         /* Allocate frames from zone buddy system */
         tmp = buddy_system_alloc(zone->buddy_system, order);
@@ -161 +160 @@
                 *status = FRAME_OK;
         }
-        
         return v;
 }
@@ -180 +178 @@
         zone_t *zone = NULL;
         frame_t *frame;
+        int order;
+        
         ASSERT(addr % FRAME_SIZE == 0);
         
@@ -210 +210 @@
         
         frame = ADDR2FRAME(zone, addr);
+        
+        /* remember frame order */
+        order = frame->buddy_order;
 
         ASSERT(frame->refcount);
@@ -218 +221 @@
 
         /* Update zone information. */
-        zone->free_count += (1 << frame->buddy_order);
-        zone->busy_count -= (1 << frame->buddy_order);
+        zone->free_count += (1 << order);
+        zone->busy_count -= (1 << order);
         
         spinlock_unlock(&zone->lock);
@@ -322 +325 @@
         
                 z->base = start;
+                z->base_index = start / FRAME_SIZE;
+                
                 z->flags = flags;
 
@@ -349 +354 @@
                         buddy_system_free(z->buddy_system, &z->frames[i].buddy_link);   
                 }
+                
         }
         return z;
@@ -401 +407 @@
         frame = list_get_instance(block, frame_t, buddy_link);
         zone = (zone_t *) b->data;
-        
-        ASSERT(IS_BUDDY_ORDER_OK(FRAME_INDEX(zone, frame), frame->buddy_order));
-        
-        is_left = IS_BUDDY_LEFT_BLOCK(zone, frame);
-        is_right = IS_BUDDY_RIGHT_BLOCK(zone, frame);
+        ASSERT(IS_BUDDY_ORDER_OK(FRAME_INDEX_ABS(zone, frame), frame->buddy_order));
+        
+        
+        is_left = IS_BUDDY_LEFT_BLOCK_ABS(zone, frame);
+        is_right = IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame);
         
         ASSERT(is_left ^ is_right);