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

* Added a lock to FileMap - since the map is retrieved lazily, and file

Browse Source 
systems like BFS only hold a read lock when reading the map, accessing the
  file map wasn't safe.
* Made FileMap::Free() private, and renamed it to _Free().


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26295 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-07-07 12:53:53 +00:00
parent 92c3ae2b69
commit 36bf05cac9
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/system/kernel/cache/file_map.cpp vendored
View File

@ -62,7 +62,6 @@ public:
void Invalidate(off_t offset, off_t size); void Invalidate(off_t offset, off_t size);
void SetSize(off_t size); void SetSize(off_t size);
void Free();
status_t Translate(off_t offset, size_t size, status_t Translate(off_t offset, size_t size,
file_io_vec* vecs, size_t* _count); file_io_vec* vecs, size_t* _count);
@ -78,11 +77,14 @@ private:
status_t _MakeSpace(size_t count); status_t _MakeSpace(size_t count);
status_t _Add(file_io_vec* vecs, size_t vecCount, status_t _Add(file_io_vec* vecs, size_t vecCount,
off_t& lastOffset); off_t& lastOffset);
void _InvalidateAfter(off_t offset);
void _Free();
union { union {
file_extent fDirect[CACHED_FILE_EXTENTS]; file_extent fDirect[CACHED_FILE_EXTENTS];
file_extent_array fIndirect; file_extent_array fIndirect;
}; };
mutex fLock;
size_t fCount; size_t fCount;
struct vnode* fVnode; struct vnode* fVnode;
off_t fSize; off_t fSize;
@ -98,6 +100,7 @@ static mutex sLock;
FileMap::FileMap(struct vnode* vnode, off_t size) FileMap::FileMap(struct vnode* vnode, off_t size)
{ {
mutex_init(&fLock, "file map");
fCount = 0; fCount = 0;
fVnode = vnode; fVnode = vnode;
fSize = size; fSize = size;
@ -111,7 +114,8 @@ FileMap::FileMap(struct vnode* vnode, off_t size)
FileMap::~FileMap() FileMap::~FileMap()
{ {
Free(); _Free();
mutex_destroy(&fLock);
#ifdef DEBUG_FILE_MAP #ifdef DEBUG_FILE_MAP
MutexLocker _(sLock); MutexLocker _(sLock);
@ -260,17 +264,9 @@ FileMap::_Add(file_io_vec* vecs, size_t vecCount, off_t& lastOffset)
} }
/*! Invalidates or removes the specified part of the file map.
*/
void void
FileMap::Invalidate(off_t offset, off_t size) FileMap::_InvalidateAfter(off_t offset)
{ {
// TODO: honour size, we currently always remove everything after "offset"
if (offset == 0) {
Free();
return;
}
uint32 index; uint32 index;
file_extent* extent = _FindExtent(offset, &index); file_extent* extent = _FindExtent(offset, &index);
if (extent != NULL) { if (extent != NULL) {
@ -282,18 +278,37 @@ FileMap::Invalidate(off_t offset, off_t size)
} }
/*! Invalidates or removes the specified part of the file map.
*/
void
FileMap::Invalidate(off_t offset, off_t size)
{
MutexLocker _(fLock);
// TODO: honour size, we currently always remove everything after "offset"
if (offset == 0) {
_Free();
return;
}
_InvalidateAfter(offset);
}
void void
FileMap::SetSize(off_t size) FileMap::SetSize(off_t size)
{ {
MutexLocker _(fLock);
if (size < fSize) if (size < fSize)
Invalidate(size, fSize - size); _InvalidateAfter(size);
fSize = size; fSize = size;
} }
void void
FileMap::Free() FileMap::_Free()
{ {
if (fCount > CACHED_FILE_EXTENTS) if (fCount > CACHED_FILE_EXTENTS)
free(fIndirect.array); free(fIndirect.array);
@ -305,6 +320,8 @@ FileMap::Free()
status_t status_t
FileMap::Translate(off_t offset, size_t size, file_io_vec* vecs, size_t* _count) FileMap::Translate(off_t offset, size_t size, file_io_vec* vecs, size_t* _count)
{ {
MutexLocker _(fLock);
size_t maxVecs = *_count; size_t maxVecs = *_count;
status_t status = B_OK; status_t status = B_OK;