[haiku-commits] r35395 - haiku/trunk/src/system/kernel/vm
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 3 Feb 2010 20:05:30 +0100 (CET)
Author: bonefish
Date: 2010-02-03 20:05:30 +0100 (Wed, 03 Feb 2010)
New Revision: 35395
Changeset: http://dev.haiku-os.org/changeset/35395/haiku
Modified:
haiku/trunk/src/system/kernel/vm/vm_page.cpp
Log:
Removed the commented out scanning of the inactive queue when no paging is
going on. I only wanted to have it in the repository in case we decide at a
later point that it is a good idea after all.
Modified: haiku/trunk/src/system/kernel/vm/vm_page.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm_page.cpp 2010-02-03 18:55:52 UTC
(rev 35394)
+++ haiku/trunk/src/system/kernel/vm/vm_page.cpp 2010-02-03 19:05:30 UTC
(rev 35395)
@@ -1990,93 +1990,7 @@
}
-// TODO: Not needed when we remove the mappings of pages in the active scan
when
-// moved to the inactive queue.
-#if 0
static void
-idle_scan_inactive_pages(page_stats& pageStats)
-{
- VMPageQueue& queue = sInactivePageQueue;
-
- // We want to scan the whole queue in roughly kIdleRunsForFullQueue
runs.
- uint32 maxToScan = queue.Count() / kIdleRunsForFullQueue + 1;
-
- while (maxToScan > 0) {
- maxToScan--;
-
- // Get the next page. Note that we don't bother to lock here.
We go with
- // the assumption that on all architectures reading/writing
pointers is
- // atomic. Beyond that it doesn't really matter. We have to
unlock the
- // queue anyway to lock the page's cache, and we'll recheck
afterwards.
- vm_page* page = queue.Head();
- if (page == NULL)
- break;
-
- // lock the page's cache
- VMCache* cache = vm_cache_acquire_locked_page_cache(page, true);
- if (cache == NULL)
- continue;
-
- if (page->state != PAGE_STATE_INACTIVE) {
- // page is no longer in this queue
- cache->ReleaseRefAndUnlock();
- continue;
- }
-
- if (page->busy) {
- // page is busy -- requeue at the end
- vm_page_requeue(page, true);
- cache->ReleaseRefAndUnlock();
- continue;
- }
-
- DEBUG_PAGE_ACCESS_START(page);
-
- // Get the accessed count, clear the accessed/modified flags.
- int32 usageCount = vm_clear_page_mapping_accessed_flags(page);
-
- // update usage count
- if (usageCount > 0) {
- usageCount += page->usage_count + kPageUsageAdvance;
- if (usageCount > kPageUsageMax)
- usageCount = kPageUsageMax;
- } else {
- usageCount += page->usage_count -
(int32)kPageUsageDecline;
- if (usageCount < 0)
- usageCount = 0;
- }
-
- page->usage_count = usageCount;
-
- // Move to fitting queue or requeue:
- // * Active mapped pages go to the active queue.
- // * Inactive mapped (i.e. wired) pages are requeued.
- // * Inactive unmapped pages of a temporary cache are requeued.
We don't
- // want to page out memory until really necessary.
- // * The remaining pages are cachable. Thus, if unmodified they
go to
- // the cached queue, otherwise to the modified queue.
- bool isMapped = page->wired_count > 0 ||
!page->mappings.IsEmpty();
- if (usageCount > 0) {
- if (isMapped)
- set_page_state(page, PAGE_STATE_ACTIVE);
- else
- vm_page_requeue(page, true);
- } else if (isMapped || cache->temporary) {
- vm_page_requeue(page, true);
- } else if (page->modified) {
- set_page_state(page, PAGE_STATE_MODIFIED);
- } else
- set_page_state(page, PAGE_STATE_CACHED);
-
- DEBUG_PAGE_ACCESS_END(page);
-
- cache->ReleaseRefAndUnlock();
- }
-}
-#endif
-
-
-static void
idle_scan_active_pages(page_stats& pageStats)
{
VMPageQueue& queue = sActivePageQueue;
@@ -2387,11 +2301,6 @@
get_page_stats(pageStats);
}
- // Walk the inactive list and transfer pages to the cached and modified
and
- // active queues.
-// get_page_stats(pageStats);
-// idle_scan_inactive_pages(pageStats);
-
// Walk the active list and move pages to the inactive queue.
get_page_stats(pageStats);
idle_scan_active_pages(pageStats);
Other related posts:
- » [haiku-commits] r35395 - haiku/trunk/src/system/kernel/vm - ingo_weinhold
