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

Only use read_pages() when we need to. Otherwise we bypass the cache of the

Browse Source 
upper layer, degrading performance qutie a bit.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30925 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-05-30 14:39:14 +00:00
parent 1f717fef4d
commit 5ab2eaabaa
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp
+17 -10
View File
@@ -117,7 +117,7 @@ public:
status_t Close(void *cookie); status_t Close(void *cookie);
status_t FreeCookie(void *cookie); status_t FreeCookie(void *cookie);
status_t Read(void *cookie, off_t position, void *buffer, status_t Read(void *cookie, off_t position, void *buffer,
size_t *length); size_t *length, bool readPages);
status_t Write(void *cookie, off_t position, status_t Write(void *cookie, off_t position,
const void *buffer, size_t *length); const void *buffer, size_t *length);
status_t SetFlags(void *cookie, int flags); status_t SetFlags(void *cookie, int flags);
@@ -448,7 +448,8 @@ OverlayInode::FreeCookie(void *_cookie)
status_t status_t
OverlayInode::Read(void *_cookie, off_t position, void *buffer, size_t *length) OverlayInode::Read(void *_cookie, off_t position, void *buffer, size_t *length,
bool readPages)
{ {
if (position >= fStat.st_size) { if (position >= fStat.st_size) {
*length = 0; *length = 0;
@@ -461,13 +462,19 @@ OverlayInode::Read(void *_cookie, off_t position, void *buffer, size_t *length)
superCookie = ((open_cookie *)_cookie)->super_cookie; superCookie = ((open_cookie *)_cookie)->super_cookie;
size_t readLength = MIN(fOriginalNodeLength - position, *length); size_t readLength = MIN(fOriginalNodeLength - position, *length);
status_t result = B_ERROR;
iovec vector; if (readPages) {
vector.iov_base = buffer; iovec vector;
vector.iov_len = readLength; vector.iov_base = buffer;
vector.iov_len = readLength;
status_t result = fSuperVnode.ops->read_pages(SuperVolume(), result = fSuperVnode.ops->read_pages(SuperVolume(),
&fSuperVnode, superCookie, position, &vector, 1, &readLength); &fSuperVnode, superCookie, position, &vector, 1, &readLength);
} else {
result = fSuperVnode.ops->read(SuperVolume(), &fSuperVnode,
superCookie, position, buffer, &readLength);
}
if (result != B_OK) if (result != B_OK)
return result; return result;
@@ -713,7 +720,7 @@ OverlayInode::ReadSymlink(char *buffer, size_t *bufferSize)
if (!S_ISLNK(fStat.st_mode)) if (!S_ISLNK(fStat.st_mode))
return B_BAD_VALUE; return B_BAD_VALUE;
return Read(NULL, 0, buffer, bufferSize); return Read(NULL, 0, buffer, bufferSize, false);
} }
if (fSuperVnode.ops->read_symlink == NULL) if (fSuperVnode.ops->read_symlink == NULL)
@@ -1069,7 +1076,7 @@ overlay_read_pages(fs_volume *volume, fs_vnode *vnode, void *cookie, off_t pos,
for (size_t i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {
size_t transferBytes = MIN(vecs[i].iov_len, bytesLeft); size_t transferBytes = MIN(vecs[i].iov_len, bytesLeft);
status_t result = node->Read(cookie, pos, vecs[i].iov_base, status_t result = node->Read(cookie, pos, vecs[i].iov_base,
&transferBytes); &transferBytes, true);
if (result != B_OK) { if (result != B_OK) {
*numBytes -= bytesLeft; *numBytes -= bytesLeft;
return result; return result;
@@ -1333,7 +1340,7 @@ overlay_read(fs_volume *volume, fs_vnode *vnode, void *cookie, off_t pos,
{ {
TRACE("read\n"); TRACE("read\n");
return ((OverlayInode *)vnode->private_node)->Read(cookie, pos, buffer, return ((OverlayInode *)vnode->private_node)->Read(cookie, pos, buffer,
length); length, false);
} }