drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

Add auto expand to OxFS

Browse Source
This commit is contained in:
Gary Talent
2017-05-19 16:31:29 -05:00
parent c0d1aab3e0
commit e195c10d6d
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deps/ox/src/ox/fs/filesystem.cpp vendored
View File

@@ -10,7 +10,7 @@
namespace ox { namespace ox {
FileSystem *createFileSystem(void *buff, size_t buffSize) { FileSystem *createFileSystem(void *buff, size_t buffSize, bool autoExpand) {
auto version = ((FileStore16*) buff)->version(); auto version = ((FileStore16*) buff)->version();
auto type = ((FileStore16*) buff)->fsType(); auto type = ((FileStore16*) buff)->fsType();
FileSystem *fs = nullptr; FileSystem *fs = nullptr;
@@ -19,13 +19,13 @@ FileSystem *createFileSystem(void *buff, size_t buffSize) {
case 5: case 5:
switch (type) { switch (type) {
case ox::OxFS_16: case ox::OxFS_16:
fs = new FileSystem16(buff); fs = new FileSystem16(buff, autoExpand);
break; break;
case ox::OxFS_32: case ox::OxFS_32:
fs = new FileSystem32(buff); fs = new FileSystem32(buff, autoExpand);
break; break;
case ox::OxFS_64: case ox::OxFS_64:
fs = new FileSystem64(buff); fs = new FileSystem64(buff, autoExpand);
break; break;
} }
break; break;

23
deps/ox/src/ox/fs/filesystem.hpp vendored
View File

@@ -248,7 +248,7 @@ int FileSystem::ls(const char *path, List *list) {
return err; return err;
} }
FileSystem *createFileSystem(void *buff, size_t buffSize); FileSystem *createFileSystem(void *buff, size_t buffSize, bool autoExpand = false);
/** /**
* Creates a larger version of the given FileSystem. * Creates a larger version of the given FileSystem.
@@ -266,6 +266,7 @@ class FileSystemTemplate: public FileSystem {
private: private:
FileStore *m_store = nullptr; FileStore *m_store = nullptr;
bool m_autoExpand = false;
public: public:
// static members // static members
@@ -273,7 +274,7 @@ class FileSystemTemplate: public FileSystem {
static typename FileStore::InodeId_t INODE_ROOT_DIR; static typename FileStore::InodeId_t INODE_ROOT_DIR;
static typename FileStore::InodeId_t INODE_RESERVED_END; static typename FileStore::InodeId_t INODE_RESERVED_END;
explicit FileSystemTemplate(void *buff); explicit FileSystemTemplate(void *buff, bool autoExpand = false);
int stripDirectories() override; int stripDirectories() override;
@@ -332,11 +333,14 @@ class FileSystemTemplate: public FileSystem {
uint64_t generateInodeId(); uint64_t generateInodeId();
int insertDirectoryEntry(const char *dirPath, const char *fileName, uint64_t inode); int insertDirectoryEntry(const char *dirPath, const char *fileName, uint64_t inode);
void expand(uint64_t size);
}; };
template<typename FileStore, FsType FS_TYPE> template<typename FileStore, FsType FS_TYPE>
FileSystemTemplate<FileStore, FS_TYPE>::FileSystemTemplate(void *buff) { FileSystemTemplate<FileStore, FS_TYPE>::FileSystemTemplate(void *buff, bool autoExpand) {
m_store = (FileStore*) buff; m_store = (FileStore*) buff;
m_autoExpand = autoExpand;
} }
template<typename FileStore, FsType FS_TYPE> template<typename FileStore, FsType FS_TYPE>
@@ -547,6 +551,9 @@ int FileSystemTemplate<FileStore, FS_TYPE>::write(const char *path, void *buffer
#endif #endif
template<typename FileStore, FsType FS_TYPE> template<typename FileStore, FsType FS_TYPE>
int FileSystemTemplate<FileStore, FS_TYPE>::write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType) { int FileSystemTemplate<FileStore, FS_TYPE>::write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType) {
if (size > this->size()) {
expand(this->size() * 2);
}
return m_store->write(inode, buffer, size, fileType); return m_store->write(inode, buffer, size, fileType);
} }
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -780,6 +787,16 @@ int FileSystemTemplate<FileStore, FS_TYPE>::readDirectory(const char *path, Dire
} }
} }
template<typename FileStore, FsType FS_TYPE>
void FileSystemTemplate<FileStore, FS_TYPE>::expand(uint64_t newSize) {
if (newSize > size()) {
auto newBuff = new uint8_t[newSize];
ox_memcpy(newBuff, m_store, m_store->size());
delete m_store;
m_store = (FileStore*) newBuff;
resize(newSize);
}
}
typedef FileSystemTemplate<FileStore16, OxFS_16> FileSystem16; typedef FileSystemTemplate<FileStore16, OxFS_16> FileSystem16;
typedef FileSystemTemplate<FileStore32, OxFS_32> FileSystem32; typedef FileSystemTemplate<FileStore32, OxFS_32> FileSystem32;