Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

You really can do the same mistake twice, even in two subsequent lines of code...

Browse Source 
get_file_map() now seems to work correctly in all regular cases.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13947 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-08-13 12:37:13 +00:00
parent 634c23467b
commit b96ea69c37
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/kernel/cache/file_cache.cpp vendored
View File

@ -234,8 +234,9 @@ get_file_map(file_cache_ref *ref, off_t offset, size_t size,
return B_OK; return B_OK;
} }
offset -= fileExtent->offset;
vecs[0].offset = fileExtent->disk.offset + offset; vecs[0].offset = fileExtent->disk.offset + offset;
vecs[0].length = fileExtent->disk.length - (offset - fileExtent->offset); vecs[0].length = fileExtent->disk.length - offset;
if (vecs[0].length >= size || index >= ref->map.count - 1) { if (vecs[0].length >= size || index >= ref->map.count - 1) {
*_count = 1; *_count = 1;
@ -247,7 +248,6 @@ get_file_map(file_cache_ref *ref, off_t offset, size_t size,
size -= vecs[0].length; size -= vecs[0].length;
for (index = 1; index < ref->map.count;) { for (index = 1; index < ref->map.count;) {
// ToDo: this needs to be tested!
fileExtent++; fileExtent++;
vecs[index] = fileExtent->disk; vecs[index] = fileExtent->disk;
@ -288,7 +288,7 @@ pages_io(file_cache_ref *ref, off_t offset, const iovec *vecs, size_t count,
// ToDo: handle array overflow gracefully! // ToDo: handle array overflow gracefully!
#ifdef TRACE_FILE_CACHE #ifdef TRACE_FILE_CACHE
dprintf("got %lu file vecs:\n", fileVecCount); dprintf("got %lu file vecs for %Ld:%lu:\n", fileVecCount, offset, numBytes);
for (size_t i = 0; i < fileVecCount; i++) for (size_t i = 0; i < fileVecCount; i++)
dprintf("[%lu] offset = %Ld, size = %Ld\n", i, fileVecs[i].offset, fileVecs[i].length); dprintf("[%lu] offset = %Ld, size = %Ld\n", i, fileVecs[i].offset, fileVecs[i].length);
#endif #endif