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

We do now store a VNode object per node in a hash table. This allowed us to get

Browse Source 
rid of the vnode count hash map and the mount vnode maps. Furthermore it will
allows us to easily associate a file cache with each node.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29435 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-03-08 00:50:51 +00:00
parent 50d9f08911
commit 6880c19362
2 changed files with 501 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

793
src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp
View File

File diff suppressed because it is too large Load Diff

30
src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.h
View File

@ -9,6 +9,8 @@
#include <Referenceable.h>
#include <kernel/lock.h>
#include "FSCapabilities.h"
namespace UserlandFSUtil {
@ -40,12 +42,9 @@ public:
inline dev_t GetID() const;
inline bool HasCapability(int capability) const;
inline bool HasVNodeCapability(void* vnode,
int capability) const;
void* GetUserlandVolume() const;
ino_t GetRootID() const;
bool IsMounting() const;
// client methods
status_t GetVNode(ino_t vnid, void** node);
@ -202,6 +201,13 @@ public:
uint32* countRead);
status_t RewindQuery(void* cookie);
private:
struct VNode;
struct VNodeHashDefinition;
struct VNodeMap;
class AutoIncrementer;
private:
status_t _Mount(const char* device, uint32 flags,
const char* parameters);
@ -239,28 +245,24 @@ private:
status_t _PutAllPendingVNodes();
private:
struct MountVNodeMap;
struct VNodeCountMap;
class AutoIncrementer;
inline bool HasVNodeCapability(VNode* vnode,
int capability) const;
private:
mutex fLock;
FileSystem* fFileSystem;
fs_volume* fFSVolume;
FSVolumeCapabilities fCapabilities;
void* fUserlandVolume;
ino_t fRootID;
void* fRootNode;
MountVNodeMap* fMountVNodes;
VNode* fRootNode;
vint32 fOpenFiles;
vint32 fOpenDirectories;
vint32 fOpenAttributeDirectories;
vint32 fOpenAttributes;
vint32 fOpenIndexDirectories;
vint32 fOpenQueries;
VNodeCountMap* fVNodeCountMap;
// Tracks the number of new/get_vnode()
// calls to be balanced by the FS by
// corresponding put_vnode()s.
VNodeMap* fVNodes;
volatile bool fVNodeCountingEnabled;
};
@ -281,7 +283,7 @@ Volume::HasCapability(int capability) const
inline bool
Volume::HasVNodeCapability(void* vnode, int capability) const
Volume::HasVNodeCapability(VNode* vnode, int capability) const
{
// TODO: Implement for real!
return true;