Changeset 5892ec1 in mainline

Timestamp:

2012-11-07T11:01:22Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c387838

Parents:

9a9c805

Message:

Rename AS_AREA_NORESERVE to AS_AREA_LATE_RESERVE.

This reflects the fact that we still reserve memory for these areas,
but the reservation is done late during the page fault.

Files:

• abi/include/mm/as.h (modified) (1 diff)
• kernel/generic/src/mm/backend_anon.c (modified) (6 diffs)
• uspace/lib/c/generic/fibril.c (modified) (1 diff)

abi/include/mm/as.h

@@ -37 +37 @@
 
 /** Address space area flags. */
-#define AS_AREA_READ       0x01
-#define AS_AREA_WRITE      0x02
-#define AS_AREA_EXEC       0x04
-#define AS_AREA_CACHEABLE  0x08
-#define AS_AREA_GUARD      0x10
-#define AS_AREA_NORESERVE  0x20
+#define AS_AREA_READ         0x01
+#define AS_AREA_WRITE        0x02
+#define AS_AREA_EXEC         0x04
+#define AS_AREA_CACHEABLE    0x08
+#define AS_AREA_GUARD        0x10
+#define AS_AREA_LATE_RESERVE 0x20
 
 /** Address space area info exported to uspace. */

kernel/generic/src/mm/backend_anon.c

@@ -74 +74 @@
 bool anon_create(as_area_t *area)
 {
-        if (area->flags & AS_AREA_NORESERVE)
+        if (area->flags & AS_AREA_LATE_RESERVE)
                 return true;
 
@@ -82 +82 @@
 bool anon_resize(as_area_t *area, size_t new_pages)
 {
-        if (area->flags & AS_AREA_NORESERVE)
+        if (area->flags & AS_AREA_LATE_RESERVE)
                 return true;
 
@@ -106 +106 @@
         ASSERT(mutex_locked(&area->as->lock));
         ASSERT(mutex_locked(&area->lock));
-        ASSERT(!(area->flags & AS_AREA_NORESERVE));
+        ASSERT(!(area->flags & AS_AREA_LATE_RESERVE));
 
         /*
@@ -146 +146 @@
 void anon_destroy(as_area_t *area)
 {
-        if (area->flags & AS_AREA_NORESERVE)
+        if (area->flags & AS_AREA_LATE_RESERVE)
                 return;
 
@@ -236 +236 @@
                  */
 
-                if (area->flags & AS_AREA_NORESERVE) {
+                if (area->flags & AS_AREA_LATE_RESERVE) {
                         /*
                          * Reserve the memory for this page now.
@@ -274 +274 @@
         ASSERT(mutex_locked(&area->lock));
 
-        if (area->flags & AS_AREA_NORESERVE) {
-                /*
-                 * In case of the NORESERVE areas, physical memory will not be
-                 * unreserved when the area is destroyed so we need to use the
-                 * normal unreserving frame_free().
+        if (area->flags & AS_AREA_LATE_RESERVE) {
+                /*
+                 * In case of the late reserve areas, physical memory will not
+                 * be unreserved when the area is destroyed so we need to use
+                 * the normal unreserving frame_free().
                  */
                 frame_free(frame);

uspace/lib/c/generic/fibril.c

@@ -274 +274 @@
             FIBRIL_INITIAL_STACK_PAGES_NO * getpagesize(),
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
-            AS_AREA_NORESERVE);
+            AS_AREA_LATE_RESERVE);
         if (fibril->stack == (void *) -1) {
                 fibril_teardown(fibril);