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

* file_cache_ref::lock was not initialized and destroyed.

Browse Source 
* Fixed locking problems.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20461 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2007-03-28 23:02:10 +00:00
parent f5a324b063
commit 563a8c4749
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/add-ons/kernel/file_systems/userlandfs/server/haiku_file_cache.cpp
View File

@ -552,6 +552,8 @@ vm_page_set_state(vm_page *page, int state)
} }
// cache must be locked
//
void void
vm_cache_insert_page(file_cache_ref *cache, vm_page *page, off_t offset) vm_cache_insert_page(file_cache_ref *cache, vm_page *page, off_t offset)
{ {
@ -581,6 +583,8 @@ vm_cache_insert_page(file_cache_ref *cache, vm_page *page, off_t offset)
} }
// cache must be locked
//
void void
vm_cache_remove_page(file_cache_ref *cache, vm_page *page) vm_cache_remove_page(file_cache_ref *cache, vm_page *page)
{ {
@ -829,6 +833,8 @@ vfs_write_pages(int fd, off_t pos, const iovec *vecs, size_t count,
} }
// cache must be locked
//
status_t status_t
vfs_get_file_map(file_cache_ref *cache, off_t offset, size_t size, vfs_get_file_map(file_cache_ref *cache, off_t offset, size_t size,
struct file_io_vec *vecs, size_t *_count) struct file_io_vec *vecs, size_t *_count)
@ -840,15 +846,10 @@ vfs_get_file_map(file_cache_ref *cache, off_t offset, size_t size,
return B_ERROR; return B_ERROR;
} }
// node handle cached? // if node handle is not cached, get it
fs_vnode nodeHandle = NULL; fs_vnode nodeHandle = cache->nodeHandle;
{
MutexLocker _(cache->lock);
nodeHandle = cache->nodeHandle;
}
// if not cached, get the node handle
if (!nodeHandle) { if (!nodeHandle) {
// TODO: Unlock cache while getting the handle?
status_t error = UserlandFS::KernelEmu::get_vnode(cache->mountID, status_t error = UserlandFS::KernelEmu::get_vnode(cache->mountID,
cache->nodeID, &nodeHandle); cache->nodeID, &nodeHandle);
if (error != B_OK) if (error != B_OK)
@ -856,7 +857,6 @@ vfs_get_file_map(file_cache_ref *cache, off_t offset, size_t size,
UserlandFS::KernelEmu::put_vnode(cache->mountID, cache->nodeID); UserlandFS::KernelEmu::put_vnode(cache->mountID, cache->nodeID);
// cache the handle // cache the handle
MutexLocker _(cache->lock);
cache->nodeHandle = nodeHandle; cache->nodeHandle = nodeHandle;
} }
@ -1769,7 +1769,17 @@ file_cache_create(mount_id mountID, vnode_id vnodeID, off_t size, int fd)
ref->deviceFD = fd; ref->deviceFD = fd;
ref->virtual_size = size; ref->virtual_size = size;
// ((vnode_store *)ref->cache->cache->store)->file_cache_ref = ref; // create lock
char buffer[32];
snprintf(buffer, sizeof(buffer), "file cache %ld:%lld", mountID, vnodeID);
status_t error = mutex_init(&ref->lock, buffer);
if (error != B_OK) {
dprintf("file_cache_create(): Failed to init mutex: %s\n",
strerror(error));
delete ref;
return NULL;
}
return ref; return ref;
} }
@ -1790,7 +1800,8 @@ file_cache_delete(void *_cacheRef)
mutex_lock(&ref->lock); mutex_lock(&ref->lock);
vm_cache_resize(ref, 0); vm_cache_resize(ref, 0);
mutex_unlock(&ref->lock);
mutex_destroy(&ref->lock);
delete ref; delete ref;
} }