Changeset 4841104 in mainline

Timestamp:

2005-09-23T20:44:35Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

adecf496

Parents:

23443b2

Message:

Physical memory management work.
Add "attribute ((packed))" to frame_t so that it takes up less space.
Note that this is essential as there is lot of these structures.
Remove busy list from zone_t as it is redundant.

Files:

• include/mm/frame.h (modified) (1 diff)
• src/main/main.c (modified) (2 diffs)
• src/mm/frame.c (modified) (5 diffs)

include/mm/frame.h

@@ -45 +45 @@
         frame_t *frames;        /**< array of frame_t structures in this zone */
         link_t free_head;       /**< list of free frame_t structures */
-        link_t busy_head;       /**< list of busy frame_t structures */
         count_t free_count;     /**< number of frame_t structures in free list */
-        count_t busy_count;     /**< number of frame_t structures in busy list */
+        count_t busy_count;     /**< number of frame_t structures not in free list */
         int flags;
 };
 
 struct frame {
-        count_t refcount;       /**< when > 0, the frame is in busy list, otherwise the frame is in free list */
-        link_t link;            /**< link either to frame_zone free or busy list */
-};
+        count_t refcount;       /**< when == 0, the frame is in free list */
+        link_t link;            /**< link to zone free list when refcount == 0 */
+} __attribute__ ((packed));
 
 extern spinlock_t zone_head_lock;       /**< this lock protects zone_head list */

src/main/main.c

@@ -36 +36 @@
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <mm/vm.h>
 #include <main/kinit.h>
 #include <cpu.h>
-#include <mm/heap.h>
 
 #ifdef __SMP__
@@ -49 +47 @@
 
 #include <arch/mm/memory_init.h>
+#include <mm/heap.h>
 #include <mm/frame.h>
 #include <mm/page.h>
 #include <mm/tlb.h>
+#include <mm/vm.h>
+
 #include <synch/waitq.h>
 

src/mm/frame.c

@@ -116 +116 @@
         frame->refcount++;
         list_remove(tmp);                       /* remove frame from free_head */
-        list_append(tmp, &zone->busy_head);     /* append frame to busy_head */
         zone->free_count--;
         zone->busy_count++;
@@ -181 +180 @@
 
         if (!--frame->refcount) {
-                list_remove(&frame->link);                      /* remove frame from busy_head */
                 list_append(&frame->link, &zone->free_head);    /* append frame to free_head */
                 zone->free_count++;
@@ -196 +194 @@
  *
  * Find respective frame structrue for supplied addr.
- * Increment frame reference count and move the frame structure to busy list.
+ * Increment frame reference count and remove the frame structure from free list.
  *
  * @param addr Address of the frame to be marked. It must be a multiple of FRAME_SIZE.
@@ -242 +240 @@
 
                 list_remove(&frame->link);                      /* remove frame from free_head */
-                list_append(&frame->link, &zone->busy_head);    /* append frame to busy_head */
                 zone->free_count--;
                 zone->busy_count++;
@@ -314 +311 @@
 
                 z->busy_count = 0;
-                list_initialize(&z->busy_head);
                 
                 z->frames = (frame_t *) malloc(cnt * sizeof(frame_t));