drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Add first inode to FileStore

Browse Source 
Added first inode refernce to FileStore so m_root can be something other than the first inode.
This commit is contained in:
Gary Talent
2016-07-02 02:19:59 -05:00
parent 490bf2f8e8
commit e2781ac743
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/fs/filestore.hpp
+6 -5
View File
@@ -48,6 +48,7 @@ class FileStore {
uint32_t m_version; uint32_t m_version;
FsSize_t m_size; FsSize_t m_size;
FsSize_t m_firstInode;
FsSize_t m_rootInode; FsSize_t m_rootInode;
public: public:
@@ -112,7 +113,7 @@ class FileStore {
void *alloc(FsSize_t size); void *alloc(FsSize_t size);
/** /**
* Compresses all of the inode into a contiguous space, starting at m_rootInode. * Compresses all of the inode into a contiguous space, starting at m_firstInode.
*/ */
void compress(); void compress();
@@ -261,14 +262,13 @@ void *FileStore<FsSize_t>::alloc(FsSize_t size) {
const auto inode = ptr<Inode*>(retval); const auto inode = ptr<Inode*>(retval);
memset(inode, 0, size); memset(inode, 0, size);
inode->next = retval + size; inode->next = retval + size;
ptr<Inode*>(m_rootInode)->prev = retval; ptr<Inode*>(m_firstInode)->prev = retval;
ptr<Inode*>(inode->next)->prev = retval;
return inode; return inode;
} }
template<typename FsSize_t> template<typename FsSize_t>
void FileStore<FsSize_t>::compress() { void FileStore<FsSize_t>::compress() {
auto current = ptr<Inode*>(m_rootInode); auto current = ptr<Inode*>(m_firstInode);
while (current->next) { while (current->next) {
auto prevEnd = current + current->size(); auto prevEnd = current + current->size();
current = ptr<Inode*>(current->next); current = ptr<Inode*>(current->next);
@@ -319,7 +319,7 @@ typename FileStore<FsSize_t>::Inode *FileStore<FsSize_t>::firstInode() {
template<typename FsSize_t> template<typename FsSize_t>
typename FileStore<FsSize_t>::Inode *FileStore<FsSize_t>::lastInode() { typename FileStore<FsSize_t>::Inode *FileStore<FsSize_t>::lastInode() {
return ptr<Inode*>(ptr<Inode*>(m_rootInode)->prev); return ptr<Inode*>(ptr<Inode*>(m_firstInode)->prev);
} }
template<typename FsSize_t> template<typename FsSize_t>
@@ -335,6 +335,7 @@ uint8_t *FileStore<FsSize_t>::format(uint8_t *buffer, FsSize_t size) {
fs->m_version = FileStore<FsSize_t>::version(); fs->m_version = FileStore<FsSize_t>::version();
fs->m_size = size; fs->m_size = size;
fs->m_rootInode = sizeof(FileStore<FsSize_t>); fs->m_rootInode = sizeof(FileStore<FsSize_t>);
fs->m_firstInode = sizeof(FileStore<FsSize_t>);
fs->lastInode()->m_id = 0; fs->lastInode()->m_id = 0;
fs->lastInode()->next = sizeof(FileStore<FsSize_t>); fs->lastInode()->next = sizeof(FileStore<FsSize_t>);