Changeset 0d8a304 in mainline

Timestamp:

2011-05-16T20:33:11Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3375bd4, 97d42d5

Parents:

0496c17 (diff), 8d308b9 (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 from lp:~jakub/helenos/mm.

Location:

kernel/generic

Files:

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

kernel/generic/include/mm/frame.h

@@ -164 +164 @@
 extern void frame_free_noreserve(uintptr_t);
 extern void frame_reference_add(pfn_t);
+extern size_t frame_total_free_get(void);
 
 extern size_t find_zone(pfn_t, size_t, size_t);

kernel/generic/include/mm/reserve.h

@@ -38 +38 @@
 #include <typedefs.h>
 
+extern void reserve_init(void);
 extern bool reserve_try_alloc(size_t);
 extern void reserve_force_alloc(size_t);

kernel/generic/src/main/main.c

@@ -71 +71 @@
 #include <mm/as.h>
 #include <mm/slab.h>
+#include <mm/reserve.h>
 #include <synch/waitq.h>
 #include <synch/futex.h>
@@ -217 +218 @@
         ddi_init();
         arch_post_mm_init();
+        reserve_init();
         arch_pre_smp_init();
         smp_init();

kernel/generic/src/mm/frame.c

@@ -182 +182 @@
  *
  */
-#ifdef CONFIG_DEBUG
-NO_TRACE static size_t total_frames_free(void)
+NO_TRACE static size_t frame_total_free_get_internal(void)
 {
         size_t total = 0;
         size_t i;
+
         for (i = 0; i < zones.count; i++)
                 total += zones.info[i].free_count;
@@ -192 +192 @@
         return total;
 }
-#endif /* CONFIG_DEBUG */
+
+NO_TRACE size_t frame_total_free_get(void)
+{
+        size_t total;
+
+        irq_spinlock_lock(&zones.lock, true);
+        total = frame_total_free_get_internal();
+        irq_spinlock_unlock(&zones.lock, true);
+
+        return total;
+}
+
 
 /** Find a zone with a given frames.
@@ -840 +851 @@
                         buddy_system_free(zone->buddy_system, &zone->frames[i].buddy_link);
                 }
-
-                /* "Unreserve" new frames. */
-                reserve_free(count);
         } else
                 zone->frames = NULL;
@@ -1051 +1059 @@
                 
 #ifdef CONFIG_DEBUG
-                size_t avail = total_frames_free();
+                size_t avail = frame_total_free_get_internal();
 #endif
                 

kernel/generic/src/mm/reserve.c

@@ -45 +45 @@
 IRQ_SPINLOCK_STATIC_INITIALIZE_NAME(reserve_lock, "reserve_lock");
 static ssize_t reserve = 0;
+
+/** Initialize memory reservations tracking.
+ *
+ * This function must be called after frame zones are created and merged
+ * and before any address space area is created.
+ */
+void reserve_init(void)
+{
+        reserve = frame_total_free_get();
+}
 
 /** Try to reserve memory.