[haiku-commits] r35498 - haiku/trunk/src/system/kernel/vm
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 16 Feb 2010 17:54:01 +0100 (CET)
Author: bonefish
Date: 2010-02-16 17:54:01 +0100 (Tue, 16 Feb 2010)
New Revision: 35498
Changeset: http://dev.haiku-os.org/changeset/35498/haiku
Modified:
haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
map_page(): Got rid of the activatePage parameter. We always move previously
inactive pages to the active queue. This has the advantage that the page
daemon will keep track of those pages even in idle mode (where it only
processes the active queue).
Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp 2010-02-16 16:49:52 UTC (rev
35497)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp 2010-02-16 16:54:01 UTC (rev
35498)
@@ -473,10 +473,12 @@
*/
static status_t
map_page(VMArea* area, vm_page* page, addr_t address, uint32 protection,
- vm_page_reservation* reservation, bool activatePage)
+ vm_page_reservation* reservation)
{
VMTranslationMap* map = area->address_space->TranslationMap();
+ bool wasMapped = page->wired_count > 0 || !page->mappings.IsEmpty();
+
if (area->wiring == B_NO_LOCK) {
DEBUG_PAGE_ACCESS_CHECK(page);
@@ -515,13 +517,17 @@
increment_page_wired_count(page);
}
- if (page->state == PAGE_STATE_CACHED) {
- if (page->usage_count == 0 && !activatePage)
- vm_page_set_state(page, PAGE_STATE_INACTIVE);
- else
+ if (!wasMapped) {
+ // The page is mapped now, so we must not remain in the cached
queue.
+ // It also makes sense to move it from the inactive to the
active, since
+ // otherwise the page daemon wouldn't come to keep track of it
(in idle
+ // mode) -- if the page isn't touched, it will be deactivated
after a
+ // full iteration through the queue at the latest.
+ if (page->state == PAGE_STATE_CACHED
+ || page->state == PAGE_STATE_INACTIVE) {
vm_page_set_state(page, PAGE_STATE_ACTIVE);
- } else if (page->state == PAGE_STATE_INACTIVE && activatePage)
- vm_page_set_state(page, PAGE_STATE_ACTIVE);
+ }
+ }
return B_OK;
}
@@ -1136,7 +1142,7 @@
vm_page* page =
vm_page_allocate_page(&reservation,
PAGE_STATE_WIRED | pageAllocFlags);
cache->InsertPage(page, offset);
- map_page(area, page, address, protection,
&reservation, false);
+ map_page(area, page, address, protection,
&reservation);
DEBUG_PAGE_ACCESS_END(page);
}
@@ -1521,7 +1527,7 @@
DEBUG_PAGE_ACCESS_START(page);
map_page(area, page,
baseAddress + (page->cache_offset * B_PAGE_SIZE -
cacheOffset),
- B_READ_AREA | B_KERNEL_READ_AREA, reservation, false);
+ B_READ_AREA | B_KERNEL_READ_AREA, reservation);
DEBUG_PAGE_ACCESS_END(page);
}
}
@@ -1830,7 +1836,7 @@
map_page(newArea, page,
newArea->Base() +
((page->cache_offset << PAGE_SHIFT)
-
newArea->cache_offset),
- protection, &reservation,
false);
+ protection, &reservation);
DEBUG_PAGE_ACCESS_END(page);
}
}
@@ -3988,7 +3994,7 @@
if (mapPage) {
if (map_page(area, context.page, address, newProtection,
- &context.reservation, true) != B_OK) {
+ &context.reservation) != B_OK) {
// Mapping can only fail, when the page mapping
object couldn't
// be allocated. Save for the missing mapping
everything is
// fine, though. We'll simply leave and
probably fault again.
Other related posts:
- » [haiku-commits] r35498 - haiku/trunk/src/system/kernel/vm - ingo_weinhold
