Changeset bd48f4c in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/generic/src/mm/frame.c

@@ -75 +75 @@
 /********************/
 
-static inline size_t frame_index(zone_t *zone, frame_t *frame)
+NO_TRACE static inline size_t frame_index(zone_t *zone, frame_t *frame)
 {
         return (size_t) (frame - zone->frames);
 }
 
-static inline size_t frame_index_abs(zone_t *zone, frame_t *frame)
+NO_TRACE static inline size_t frame_index_abs(zone_t *zone, frame_t *frame)
 {
         return (size_t) (frame - zone->frames) + zone->base;
 }
 
-static inline bool frame_index_valid(zone_t *zone, size_t index)
+NO_TRACE static inline bool frame_index_valid(zone_t *zone, size_t index)
 {
         return (index < zone->count);
 }
 
-static inline size_t make_frame_index(zone_t *zone, frame_t *frame)
+NO_TRACE static inline size_t make_frame_index(zone_t *zone, frame_t *frame)
 {
         return (frame - zone->frames);
@@ -100 +100 @@
  *
  */
-static void frame_initialize(frame_t *frame)
+NO_TRACE static void frame_initialize(frame_t *frame)
 {
         frame->refcount = 1;
@@ -121 +121 @@
  *
  */
-static size_t zones_insert_zone(pfn_t base, size_t count)
+NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count)
 {
         if (zones.count + 1 == ZONES_MAX) {
@@ -133 +133 @@
                 if (overlaps(base, count,
                     zones.info[i].base, zones.info[i].count)) {
-                        printf("Zones overlap!\n");
+                        printf("Zone (%p, %p) overlaps with zone (%p, %p)!\n",
+                            PFN2ADDR(base), PFN2ADDR(base + count),
+                            PFN2ADDR(zones.info[i].base),
+                            PFN2ADDR(zones.info[i].base + zones.info[i].count));
                         return (size_t) -1;
                 }
@@ -162 +165 @@
  */
 #ifdef CONFIG_DEBUG
-static size_t total_frames_free(void)
+NO_TRACE static size_t total_frames_free(void)
 {
         size_t total = 0;
@@ -185 +188 @@
  *
  */
-size_t find_zone(pfn_t frame, size_t count, size_t hint)
+NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
 {
         if (hint >= zones.count)
@@ -206 +209 @@
 
 /** @return True if zone can allocate specified order */
-static bool zone_can_alloc(zone_t *zone, uint8_t order)
+NO_TRACE static bool zone_can_alloc(zone_t *zone, uint8_t order)
 {
         return (zone_flags_available(zone->flags)
@@ -222 +225 @@
  *
  */
-static size_t find_free_zone(uint8_t order, zone_flags_t flags, size_t hint)
+NO_TRACE static size_t find_free_zone(uint8_t order, zone_flags_t flags,
+    size_t hint)
 {
         if (hint >= zones.count)
@@ -262 +266 @@
  *
  */
-static link_t *zone_buddy_find_block(buddy_system_t *buddy, link_t *child,
-    uint8_t order)
+NO_TRACE static link_t *zone_buddy_find_block(buddy_system_t *buddy,
+    link_t *child, uint8_t order)
 {
         frame_t *frame = list_get_instance(child, frame_t, buddy_link);
@@ -285 +289 @@
  *
  */
-static link_t *zone_buddy_find_buddy(buddy_system_t *buddy, link_t *block) 
+NO_TRACE static link_t *zone_buddy_find_buddy(buddy_system_t *buddy,
+    link_t *block)
 {
         frame_t *frame = list_get_instance(block, frame_t, buddy_link);
@@ -321 +326 @@
  *
  */
-static link_t *zone_buddy_bisect(buddy_system_t *buddy, link_t *block)
+NO_TRACE static link_t *zone_buddy_bisect(buddy_system_t *buddy, link_t *block)
 {
         frame_t *frame_l = list_get_instance(block, frame_t, buddy_link);
@@ -339 +344 @@
  *
  */
-static link_t *zone_buddy_coalesce(buddy_system_t *buddy, link_t *block_1,
-    link_t *block_2)
+NO_TRACE static link_t *zone_buddy_coalesce(buddy_system_t *buddy,
+    link_t *block_1, link_t *block_2)
 {
         frame_t *frame1 = list_get_instance(block_1, frame_t, buddy_link);
@@ -355 +360 @@
  *
  */
-static void zone_buddy_set_order(buddy_system_t *buddy, link_t *block,
+NO_TRACE static void zone_buddy_set_order(buddy_system_t *buddy, link_t *block,
     uint8_t order)
 {
@@ -369 +374 @@
  *
  */
-static uint8_t zone_buddy_get_order(buddy_system_t *buddy, link_t *block)
+NO_TRACE static uint8_t zone_buddy_get_order(buddy_system_t *buddy,
+    link_t *block)
 {
         return list_get_instance(block, frame_t, buddy_link)->buddy_order;
@@ -380 +386 @@
  *
  */
-static void zone_buddy_mark_busy(buddy_system_t *buddy, link_t * block)
+NO_TRACE static void zone_buddy_mark_busy(buddy_system_t *buddy, link_t *block)
 {
         list_get_instance(block, frame_t, buddy_link)->refcount = 1;
@@ -389 +395 @@
  * @param buddy Buddy system.
  * @param block Buddy system block.
- */
-static void zone_buddy_mark_available(buddy_system_t *buddy, link_t *block)
+ *
+ */
+NO_TRACE static void zone_buddy_mark_available(buddy_system_t *buddy,
+    link_t *block)
 {
         list_get_instance(block, frame_t, buddy_link)->refcount = 0;
@@ -421 +429 @@
  *
  */
-static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
+NO_TRACE static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
 {
         ASSERT(zone_flags_available(zone->flags));
@@ -449 +457 @@
  *
  */
-static void zone_frame_free(zone_t *zone, size_t frame_idx)
+NO_TRACE static void zone_frame_free(zone_t *zone, size_t frame_idx)
 {
         ASSERT(zone_flags_available(zone->flags));
@@ -470 +478 @@
 
 /** Return frame from zone. */
-static frame_t *zone_get_frame(zone_t *zone, size_t frame_idx)
+NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t frame_idx)
 {
         ASSERT(frame_idx < zone->count);
@@ -477 +485 @@
 
 /** Mark frame in zone unavailable to allocation. */
-static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
+NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
 {
         ASSERT(zone_flags_available(zone->flags));
@@ -506 +514 @@
  *
  */
-static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1, buddy_system_t *buddy)
+NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
+    buddy_system_t *buddy)
 {
         ASSERT(zone_flags_available(zones.info[z1].flags));
@@ -602 +611 @@
  *
  */
-static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
+NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
 {
         ASSERT(zone_flags_available(zones.info[znum].flags));
@@ -637 +646 @@
  *
  */
-static void zone_reduce_region(size_t znum, pfn_t frame_idx, size_t count)
+NO_TRACE static void zone_reduce_region(size_t znum, pfn_t frame_idx,
+    size_t count)
 {
         ASSERT(zone_flags_available(zones.info[znum].flags));
@@ -777 +787 @@
  *
  */
-static void zone_construct(zone_t *zone, buddy_system_t *buddy, pfn_t start,
-    size_t count, zone_flags_t flags)
+NO_TRACE static void zone_construct(zone_t *zone, buddy_system_t *buddy,
+    pfn_t start, size_t count, zone_flags_t flags)
 {
         zone->base = start;
@@ -821 +831 @@
  *
  */
-uintptr_t zone_conf_size(size_t count)
+size_t zone_conf_size(size_t count)
 {
         return (count * sizeof(frame_t) + buddy_conf_size(fnzb(count)));
@@ -1108 +1118 @@
  *
  */
-void frame_reference_add(pfn_t pfn)
+NO_TRACE void frame_reference_add(pfn_t pfn)
 {
         irq_spinlock_lock(&zones.lock, true);
@@ -1127 +1137 @@
  *
  */
-void frame_mark_unavailable(pfn_t start, size_t count)
+NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
 {
         irq_spinlock_lock(&zones.lock, true);
@@ -1234 +1244 @@
 {
 #ifdef __32_BITS__
-        printf("#  base address frames       flags    free frames  busy frames\n");
-        printf("-- ------------ ------------ -------- ------------ ------------\n");
+        printf("[nr] [base addr] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
 
 #ifdef __64_BITS__
-        printf("#  base address          frames      flags    free frames  busy frames\n");
-        printf("-- -------------------- ------------ -------- ------------ ------------\n");
+        printf("[nr] [base address    ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
         
@@ -1273 +1281 @@
                 bool available = zone_flags_available(flags);
                 
-                printf("%-2" PRIs, i);
+                printf("%-4" PRIs, i);
                 
 #ifdef __32_BITS__
-                printf("   %10p", base);
+                printf("  %10p", base);
 #endif
                 
 #ifdef __64_BITS__
-                printf("   %18p", base);
+                printf(" %18p", base);
 #endif
                 
@@ -1289 +1297 @@
                 
                 if (available)
-                        printf("%12" PRIs " %12" PRIs,
+                        printf("%14" PRIs " %14" PRIs,
                             free_count, busy_count);