i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vm_cache_resize() can now resize all caches - and therefore, it now accepts

Browse Source 
an off_t as size argument.
Implemented new function vm_cache_write_modified() which will write all
dirty pages of this cache back to disk (using the new vm_page_write_modified()
function).
Fixed warnings when compiled with debug output.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10205 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-11-23 03:34:04 +00:00
parent 86b5aa8df9
commit 40ab990937
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/vm/vm_cache.c
+28 -17
View File
@@ -1,10 +1,10 @@
/* /*
** Copyright 2002-2004, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2002-2004, Axel Dörfler, [email protected].
** Distributed under the terms of the Haiku License. * Distributed under the terms of the MIT License.
** *
** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
** Distributed under the terms of the NewOS License. * Distributed under the terms of the NewOS License.
*/ */
#include <kernel.h> #include <kernel.h>
@@ -48,7 +48,7 @@ page_compare_func(void *_p, const void *_key)
vm_page *page = _p; vm_page *page = _p;
const struct page_lookup_key *key = _key; const struct page_lookup_key *key = _key;
TRACE(("page_compare_func: p 0x%x, key 0x%x\n", page, key)); TRACE(("page_compare_func: page %p, key %p\n", page, key));
if (page->cache == key->cache && page->offset == key->offset) if (page->cache == key->cache && page->offset == key->offset)
return 0; return 0;
@@ -154,7 +154,7 @@ vm_cache_release_ref(vm_cache_ref *cache_ref)
{ {
vm_page *page; vm_page *page;
TRACE(("vm_cache_release_ref: cache_ref 0x%x, ref will be %d\n", cache_ref, cache_ref->ref_count - 1)); TRACE(("vm_cache_release_ref: cache_ref %p, ref will be %ld\n", cache_ref, cache_ref->ref_count - 1));
if (cache_ref == NULL) if (cache_ref == NULL)
panic("vm_cache_release_ref: passed NULL\n"); panic("vm_cache_release_ref: passed NULL\n");
@@ -189,7 +189,7 @@ vm_cache_release_ref(vm_cache_ref *cache_ref)
release_spinlock(&page_cache_table_lock); release_spinlock(&page_cache_table_lock);
restore_interrupts(state); restore_interrupts(state);
TRACE(("vm_cache_release_ref: freeing page 0x%x\n", oldPage->ppn)); TRACE(("vm_cache_release_ref: freeing page 0x%lx\n", oldPage->ppn));
vm_page_set_state(oldPage, PAGE_STATE_FREE); vm_page_set_state(oldPage, PAGE_STATE_FREE);
} }
@@ -230,7 +230,7 @@ vm_cache_insert_page(vm_cache_ref *cache_ref, vm_page *page, off_t offset)
{ {
int state; int state;
TRACE(("vm_cache_insert_page: cache 0x%x, page 0x%x, offset 0x%x 0x%x\n", cache_ref, page, offset)); TRACE(("vm_cache_insert_page: cache_ref %p, page %p, offset %Ld\n", cache_ref, page, offset));
page->offset = offset; page->offset = offset;
@@ -264,7 +264,7 @@ vm_cache_remove_page(vm_cache_ref *cache_ref, vm_page *page)
{ {
int state; int state;
TRACE(("vm_cache_remove_page: cache 0x%x, page 0x%x\n", cache_ref, page)); TRACE(("vm_cache_remove_page: cache %p, page %p\n", cache_ref, page));
ASSERT_LOCKED_MUTEX(&cache_ref->lock); ASSERT_LOCKED_MUTEX(&cache_ref->lock);
state = disable_interrupts(); state = disable_interrupts();
@@ -289,6 +289,21 @@ vm_cache_remove_page(vm_cache_ref *cache_ref, vm_page *page)
} }
status_t
vm_cache_write_modified(vm_cache_ref *ref)
{
status_t status;
TRACE(("vm_cache_write_modified(ref = %p)\n", ref));
mutex_lock(&ref->lock);
status = vm_page_write_modified(ref->cache);
mutex_unlock(&ref->lock);
return status;
}
status_t status_t
vm_cache_set_minimal_commitment(vm_cache_ref *ref, off_t commitment) vm_cache_set_minimal_commitment(vm_cache_ref *ref, off_t commitment)
{ {
@@ -318,18 +333,14 @@ vm_cache_set_minimal_commitment(vm_cache_ref *ref, off_t commitment)
*/ */
status_t status_t
vm_cache_resize(vm_cache_ref *cacheRef, size_t newSize) vm_cache_resize(vm_cache_ref *cacheRef, off_t newSize)
{ {
vm_cache *cache = cacheRef->cache; vm_cache *cache = cacheRef->cache;
status_t status; status_t status;
size_t oldSize; off_t oldSize;
ASSERT_LOCKED_MUTEX(&cacheRef->lock); ASSERT_LOCKED_MUTEX(&cacheRef->lock);
// ToDo: only cache's with an anonymous memory store should be resizable!
if (!cache->temporary)
return B_NOT_ALLOWED;
status = cache->store->ops->commit(cache->store, newSize); status = cache->store->ops->commit(cache->store, newSize);
if (status != B_OK) if (status != B_OK)
return status; return status;