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

Fixed another big and stupid bug: the first read/write not in the cache

Browse Source 
and not on a page boundary had been executed with a I/O size too large,
and thus clobbering all sorts of memory (oh my god).
The problems with ResourceFile now seems to be gone.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10863 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-01-19 02:35:39 +00:00
parent 6ab1da7516
commit 0f8e6927d8
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/cache/file_cache.cpp
Vendored
+23 -12
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2004-2005, Axel Dörfler, [email protected]. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -462,12 +462,12 @@ cache_io(void *_cacheRef, off_t offset, addr_t bufferBase, size_t *_size, bool d
} }
int32 pageOffset = offset & (B_PAGE_SIZE - 1); int32 pageOffset = offset & (B_PAGE_SIZE - 1);
size_t size = *_size + pageOffset; size_t size = *_size;
offset -= pageOffset; offset -= pageOffset;
if (offset + size > fileSize) { if (offset + pageOffset + size > fileSize) {
// adapt size to be within the file's offsets // adapt size to be within the file's offsets
size = fileSize - offset; size = fileSize - pageOffset - offset;
*_size = size; *_size = size;
} }
@@ -492,12 +492,20 @@ cache_io(void *_cacheRef, off_t offset, addr_t bufferBase, size_t *_size, bool d
TRACE(("lookup page from offset %Ld: %p\n", offset, page)); TRACE(("lookup page from offset %Ld: %p\n", offset, page));
if (page != NULL if (page != NULL
&& vm_get_physical_page(page->ppn * B_PAGE_SIZE, &virtualAddress, PHYSICAL_PAGE_CAN_WAIT) == B_OK) { && vm_get_physical_page(page->ppn * B_PAGE_SIZE,
// it is, so let's satisfy in the first part of the request &virtualAddress, PHYSICAL_PAGE_CAN_WAIT) == B_OK) {
// it is, so let's satisfy the first part of the request, if we have to
if (bufferBase != buffer) { if (bufferBase != buffer) {
size_t requestSize = buffer - bufferBase; size_t requestSize = buffer - bufferBase;
if ((doWrite && write_to_cache(ref, lastOffset + pageOffset, requestSize, bufferBase, requestSize) != B_OK) status_t status;
|| (!doWrite && read_into_cache(ref, lastOffset + pageOffset, requestSize, bufferBase, requestSize) != B_OK)) { if (doWrite) {
status = write_to_cache(ref, lastOffset + pageOffset,
requestSize, bufferBase, requestSize);
} else {
status = read_into_cache(ref, lastOffset + pageOffset,
requestSize, bufferBase, requestSize);
}
if (status != B_OK) {
vm_put_physical_page(virtualAddress); vm_put_physical_page(virtualAddress);
mutex_unlock(&cache->lock); mutex_unlock(&cache->lock);
return B_IO_ERROR; return B_IO_ERROR;
@@ -506,10 +514,13 @@ cache_io(void *_cacheRef, off_t offset, addr_t bufferBase, size_t *_size, bool d
} }
// 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, min_c(B_PAGE_SIZE, bytesLeft) - pageOffset); user_memcpy((void *)(virtualAddress + pageOffset), (void *)buffer,
else min_c(size_t(B_PAGE_SIZE - pageOffset), bytesLeft));
user_memcpy((void *)buffer, (void *)(virtualAddress + pageOffset), min_c(B_PAGE_SIZE, bytesLeft) - pageOffset); } else {
user_memcpy((void *)buffer, (void *)(virtualAddress + pageOffset),
min_c(size_t(B_PAGE_SIZE - pageOffset), bytesLeft));
}
vm_put_physical_page(virtualAddress); vm_put_physical_page(virtualAddress);