Changeset 594a468 in mainline for generic/src

Timestamp:

2005-11-15T16:00:24Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

db79676

Parents:

93354b0

Message:

Make the buddy system more general.
Store implementation defined pointer in buddy_system_t.
Pass buddy system pointer to implementation defined buddy system operations.

Location:

generic/src/mm

Files:

• buddy.c (modified) (6 diffs)
• frame.c (modified) (7 diffs)

generic/src/mm/buddy.c

@@ -41 +41 @@
  * @param max_order The biggest allocable size will be 2^max_order.
  * @param op Operations for new buddy system.
+ * @param data Pointer to be used by implentation.
  *
  * @return New buddy system.
  */
-buddy_system_t *buddy_system_create(__u8 max_order, buddy_system_operations_t *op)
+buddy_system_t *buddy_system_create(__u8 max_order, buddy_system_operations_t *op, void *data)
 {
         buddy_system_t *b;
@@ -77 +78 @@
                 b->max_order = max_order;
                 b->op = op;
+                b->data = data;
         }
         
@@ -131 +133 @@
          * Bisect the block and set order of both of its parts to i.
          */
-        hlp = b->op->bisect(res);
-        b->op->set_order(res, i);
-        b->op->set_order(hlp, i);
+        hlp = b->op->bisect(b, res);
+        b->op->set_order(b, res, i);
+        b->op->set_order(b, hlp, i);
         
         /*
@@ -159 +161 @@
          * Determine block's order.
          */
-        i = b->op->get_order(block);
+        i = b->op->get_order(b, block);
 
         ASSERT(i < b->max_order);
@@ -167 +169 @@
                  * See if there is any buddy in the list of order i.
                  */
-                buddy = b->op->find_buddy(block);
+                buddy = b->op->find_buddy(b, block);
                 if (buddy) {
 
-                        ASSERT(b->op->get_order(buddy) == i);
+                        ASSERT(b->op->get_order(b, buddy) == i);
                 
                         /*
@@ -180 +182 @@
                          * 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);
+                        b->op->set_order(b, block, BUDDY_SYSTEM_INNER_BLOCK);
+                        b->op->set_order(b, buddy, BUDDY_SYSTEM_INNER_BLOCK);
                 
                         /*
                          * Coalesce block and buddy into one block.
                          */
-                        hlp = b->op->coalesce(block, buddy);
+                        hlp = b->op->coalesce(b, block, buddy);
 
                         /*
                          * Set order of the coalesced block to i + 1.
                          */
-                        b->op->set_order(hlp, i + 1);
+                        b->op->set_order(b, hlp, i + 1);
 
                         /*

generic/src/mm/frame.c

@@ -339 +339 @@
                  */
                 for (max_order = 0; cnt >> max_order; max_order++);
-                z->buddy_system = buddy_system_create(max_order, &zone_buddy_system_operations);
+                z->buddy_system = buddy_system_create(max_order, &zone_buddy_system_operations, (void *) z);
         }
         
@@ -544 +544 @@
 
 /** Buddy system find_buddy implementation
+ *
+ * @param b Buddy system.
  * @param block Block for which buddy should be found
  *
  * @return Buddy for given block if found
  */
-link_t * zone_buddy_find_buddy(link_t * block) {
+link_t * zone_buddy_find_buddy(buddy_system_t *b, link_t * block) {
         frame_t * frame, * f;
         zone_t * zone;
@@ -596 +598 @@
 /** Buddy system bisect implementation
  *
+ * @param b Buddy system.
  * @param block Block to bisect
  *
  * @return right block
  */
-link_t * zone_buddy_bisect(link_t * block) {
+link_t * zone_buddy_bisect(buddy_system_t *b, link_t * block) {
         frame_t * frame_l, * frame_r;
         
@@ -613 +616 @@
 /** Buddy system coalesce implementation
  *
+ * @param b Buddy system.
  * @param block_1 First block
  * @param block_2 First block's buddy
@@ -618 +622 @@
  * @return Coalesced block (actually block that represents lower address)
  */
-link_t * zone_buddy_coalesce(link_t * block_1, link_t * block_2) {
+link_t * zone_buddy_coalesce(buddy_system_t *b, link_t * block_1, link_t * block_2) {
         frame_t * frame1, * frame2;
         
@@ -628 +632 @@
 
 /** Buddy system set_order implementation
+ *
+ * @param b Buddy system.
  * @param block Buddy system block
  * @param order Order to set
  */
-void zone_buddy_set_order(link_t * block, __u8 order) {
+void zone_buddy_set_order(buddy_system_t *b, link_t * block, __u8 order) {
         frame_t * frame;
         frame = list_get_instance(block, frame_t, buddy_link);
@@ -638 +644 @@
 
 /** Buddy system get_order implementation
+ *
+ * @param b Buddy system.
  * @param block Buddy system block
  *
  * @return Order of block
  */
-__u8 zone_buddy_get_order(link_t * block) {
+__u8 zone_buddy_get_order(buddy_system_t *b, link_t * block) {
         frame_t * frame;
         frame = list_get_instance(block, frame_t, buddy_link);