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

Removed special dummy page handling. It became obsolete with r21816,

Browse Source 
since fault_find_page() does no longer insert a dummy page into a cache
that has a store from which it can read the page.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21887 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-08-11 00:31:14 +00:00
parent 1873b4b37e
commit 13542314ef
1 changed files with 6 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/cache/file_cache.cpp
Vendored
+6 -71
View File
@@ -892,7 +892,6 @@ cache_io(void *_cacheRef, off_t offset, addr_t buffer, size_t *_size, bool doWri
// check if this page is already in memory // check if this page is already in memory
restart: restart:
vm_page *page = vm_cache_lookup_page(cache, offset); vm_page *page = vm_cache_lookup_page(cache, offset);
vm_page *dummyPage = NULL;
if (page != NULL) { if (page != NULL) {
// The page is busy - since we need to unlock the cache sometime // The page is busy - since we need to unlock the cache sometime
// in the near future, we need to satisfy the request of the pages // in the near future, we need to satisfy the request of the pages
@@ -918,21 +917,12 @@ cache_io(void *_cacheRef, off_t offset, addr_t buffer, size_t *_size, bool doWri
} }
if (page->state == PAGE_STATE_BUSY) { if (page->state == PAGE_STATE_BUSY) {
if (page->type == PAGE_TYPE_DUMMY) { ConditionVariableEntry<vm_page> entry;
dummyPage = page; entry.Add(page);
page = vm_page_allocate_page(PAGE_STATE_FREE); mutex_unlock(&cache->lock);
if (page == NULL) { entry.Wait();
mutex_unlock(&cache->lock); mutex_lock(&cache->lock);
return B_NO_MEMORY; goto restart;
}
} else {
ConditionVariableEntry<vm_page> entry;
entry.Add(page);
mutex_unlock(&cache->lock);
entry.Wait();
mutex_lock(&cache->lock);
goto restart;
}
} }
} }
@@ -944,24 +934,6 @@ cache_io(void *_cacheRef, off_t offset, addr_t buffer, size_t *_size, bool doWri
vm_get_physical_page(page->physical_page_number * B_PAGE_SIZE, vm_get_physical_page(page->physical_page_number * B_PAGE_SIZE,
&virtualAddress, PHYSICAL_PAGE_CAN_WAIT); &virtualAddress, PHYSICAL_PAGE_CAN_WAIT);
if (dummyPage != NULL && (!doWrite || bytesInPage != B_PAGE_SIZE)) {
// This page is currently in-use by someone else - since we cannot
// know if this someone does what we want, and if it even can do
// what we want (we may own a lock the blocks the other request),
// we need to handle this case specifically
iovec vec;
vec.iov_base = (void *)virtualAddress;
vec.iov_len = B_PAGE_SIZE;
size_t size = B_PAGE_SIZE;
status_t status = pages_io(ref, offset, &vec, 1, &size, false);
if (status != B_OK) {
vm_put_physical_page(virtualAddress);
mutex_unlock(&cache->lock);
return status;
}
}
// and copy the contents of the page already in memory // and copy the contents of the page already in memory
if (doWrite) { if (doWrite) {
user_memcpy((void *)(virtualAddress + pageOffset), (void *)buffer, bytesInPage); user_memcpy((void *)(virtualAddress + pageOffset), (void *)buffer, bytesInPage);
@@ -974,43 +946,6 @@ cache_io(void *_cacheRef, off_t offset, addr_t buffer, size_t *_size, bool doWri
vm_put_physical_page(virtualAddress); vm_put_physical_page(virtualAddress);
if (dummyPage != NULL) {
// check if the dummy page is still in place
restart_dummy_lookup:
vm_page *currentPage = vm_cache_lookup_page(cache, offset);
if (currentPage == NULL) {
// there is no page in place anymore, we'll put ours
// into it
vm_cache_insert_page(cache, page, offset);
} else if (currentPage->state == PAGE_STATE_BUSY) {
if (currentPage->type == PAGE_TYPE_DUMMY) {
// we let the other party add our page
currentPage->queue_next = page;
} else {
ConditionVariableEntry<vm_page> entry;
entry.Add(page);
mutex_unlock(&cache->lock);
entry.Wait();
mutex_lock(&cache->lock);
goto restart_dummy_lookup;
}
} else {
// we need to copy our new page into the old one
addr_t destinationAddress;
vm_get_physical_page(page->physical_page_number * B_PAGE_SIZE,
&virtualAddress, PHYSICAL_PAGE_CAN_WAIT);
vm_get_physical_page(currentPage->physical_page_number * B_PAGE_SIZE,
&destinationAddress, PHYSICAL_PAGE_CAN_WAIT);
memcpy((void *)destinationAddress, (void *)virtualAddress, B_PAGE_SIZE);
vm_put_physical_page(destinationAddress);
vm_put_physical_page(virtualAddress);
vm_page_set_state(page, PAGE_STATE_FREE);
}
}
if (bytesLeft <= bytesInPage) { if (bytesLeft <= bytesInPage) {
// we've read the last page, so we're done! // we've read the last page, so we're done!
mutex_unlock(&cache->lock); mutex_unlock(&cache->lock);