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

Squashed 'deps/ox/' changes from 68c144f..56d91c1

Browse Source 
56d91c1 Fix delete/new[] mismatch
8a07138 Fix m_store delete to use delete[]
b4a6aed Change auto expand to own buff attribute in OxFS
7fa43da Make auto expand loop if necessary
c1e8d07 Fix auto expand condition
d43aecd Add auto expand to OxFS
d778570 Merge branch 'master' of github.com:wombatant/ox
4798e54 Add -s flag to nested make calls
038ca96 Add missing error reporting to file system ls
ac3f12f Remove unnecessary ls from FileSystemTemplate
c19a717 Fix readDirectory use the right type of directory
4a44a23 Add default constructor for DirectoryListing

git-subtree-dir: deps/ox
git-subtree-split: 56d91c18bd
This commit is contained in:
Gary Talent
2017-07-01 02:31:26 -05:00
parent f92c8ab577
commit feb7e4c184
4 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -2
View File
@@ -3,9 +3,9 @@ HOST_ENV=${OS}-$(shell uname -m)
DEVENV=devenv$(shell pwd | sed 's/\//-/g') DEVENV=devenv$(shell pwd | sed 's/\//-/g')
DEVENV_IMAGE=wombatant/devenv DEVENV_IMAGE=wombatant/devenv
ifneq ($(shell which gmake),) ifneq ($(shell which gmake),)
MAKE=gmake MAKE=gmake -s
else else
MAKE=make MAKE=make -s
endif endif
ifneq ($(shell which docker 2>&1),) ifneq ($(shell which docker 2>&1),)
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running) ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
src/ox/fs/filesystem.cpp
+4 -4
View File
@@ -10,7 +10,7 @@
namespace ox { namespace ox {
FileSystem *createFileSystem(void *buff, size_t buffSize) { FileSystem *createFileSystem(uint8_t *buff, size_t buffSize, bool ownsBuff) {
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, ownsBuff);
break; break;
case ox::OxFS_32: case ox::OxFS_32:
fs = new FileSystem32(buff); fs = new FileSystem32(buff, ownsBuff);
break; break;
case ox::OxFS_64: case ox::OxFS_64:
fs = new FileSystem64(buff); fs = new FileSystem64(buff, ownsBuff);
break; break;
} }
break; break;
src/ox/fs/filesystem.hpp
+45 -42
View File
@@ -35,6 +35,8 @@ struct DirectoryListing {
String name; String name;
FileStat stat; FileStat stat;
DirectoryListing() = default;
DirectoryListing(const char *name) { DirectoryListing(const char *name) {
this->name = name; this->name = name;
} }
@@ -155,18 +157,18 @@ int Directory<InodeId_t, FsSize_t>::rmFile(const char *name) {
template<typename InodeId_t, typename FsSize_t> template<typename InodeId_t, typename FsSize_t>
int Directory<InodeId_t, FsSize_t>::copy(Directory<uint64_t, uint64_t> *dirOut) { int Directory<InodeId_t, FsSize_t>::copy(Directory<uint64_t, uint64_t> *dirOut) {
auto current = files(); auto current = files();
auto dirBuff = (uint8_t*) dirOut; auto dirOutBuff = (uint8_t*) dirOut;
dirBuff += sizeof(Directory<uint64_t, uint64_t>); dirOutBuff += sizeof(Directory<uint64_t, uint64_t>);
dirOut->size = this->size; dirOut->size = this->size;
dirOut->children = this->children; dirOut->children = this->children;
if (current) { if (current) {
for (uint64_t i = 0; i < this->children; i++) { for (uint64_t i = 0; i < this->children; i++) {
auto entry = (DirectoryEntry<uint64_t>*) dirBuff; auto entry = (DirectoryEntry<uint64_t>*) dirOutBuff;
entry->inode = current->inode; entry->inode = current->inode;
entry->setName(current->getName()); entry->setName(current->getName());
current = (DirectoryEntry<InodeId_t>*) (((uint8_t*) current) + current->size()); current = (DirectoryEntry<InodeId_t>*) (((uint8_t*) current) + current->size());
dirBuff += entry->size(); dirOutBuff += entry->size();
} }
return 0; return 0;
} else { } else {
@@ -181,7 +183,7 @@ int Directory<InodeId_t, FsSize_t>::ls(List *list) {
if (current) { if (current) {
for (uint64_t i = 0; i < this->children; i++) { for (uint64_t i = 0; i < this->children; i++) {
list->push_back(current->getName()); list->push_back(current->getName());
list->at(i).stat.inode = current->inode; (*list)[i].stat.inode = current->inode;
current = (DirectoryEntry<InodeId_t>*) (((uint8_t*) current) + current->size()); current = (DirectoryEntry<InodeId_t>*) (((uint8_t*) current) + current->size());
} }
return 0; return 0;
@@ -242,11 +244,11 @@ int FileSystem::ls(const char *path, List *list) {
uint8_t dirBuff[s.size * 4]; uint8_t dirBuff[s.size * 4];
auto dir = (Directory<uint64_t, uint64_t>*) dirBuff; auto dir = (Directory<uint64_t, uint64_t>*) dirBuff;
auto err = readDirectory(path, dir); auto err = readDirectory(path, dir);
dir->ls(list); err |= dir->ls(list);
return err; return err;
} }
FileSystem *createFileSystem(void *buff, size_t buffSize); FileSystem *createFileSystem(uint8_t *buff, size_t buffSize, bool ownsBuff = false);
/** /**
* Creates a larger version of the given FileSystem. * Creates a larger version of the given FileSystem.
@@ -264,6 +266,7 @@ class FileSystemTemplate: public FileSystem {
private: private:
FileStore *m_store = nullptr; FileStore *m_store = nullptr;
bool m_ownsBuff = false;
public: public:
// static members // static members
@@ -271,13 +274,12 @@ 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(uint8_t *buff, bool ownsBuff = false);
~FileSystemTemplate();
int stripDirectories() override; int stripDirectories() override;
template<typename List>
int ls(const char *path, List *list);
int mkdir(const char *path) override; int mkdir(const char *path) override;
int read(const char *path, void *buffer, size_t buffSize) override; int read(const char *path, void *buffer, size_t buffSize) override;
@@ -324,7 +326,7 @@ class FileSystemTemplate: public FileSystem {
*/ */
int rmDirectoryEntry(const char *path); int rmDirectoryEntry(const char *path);
static uint8_t *format(void *buffer, typename FileStore::FsSize_t size, bool useDirectories); static uint8_t *format(uint8_t *buffer, typename FileStore::FsSize_t size, bool useDirectories);
protected: protected:
int readDirectory(const char *path, Directory<uint64_t, uint64_t> *dirOut) override; int readDirectory(const char *path, Directory<uint64_t, uint64_t> *dirOut) override;
@@ -333,11 +335,21 @@ 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(uint8_t *buff, bool ownsBuff) {
m_store = (FileStore*) buff; m_store = (FileStore*) buff;
m_ownsBuff = ownsBuff;
}
template<typename FileStore, FsType FS_TYPE>
FileSystemTemplate<FileStore, FS_TYPE>::~FileSystemTemplate() {
if (m_ownsBuff) {
delete[] (uint8_t*) m_store;
}
} }
template<typename FileStore, FsType FS_TYPE> template<typename FileStore, FsType FS_TYPE>
@@ -354,30 +366,6 @@ int FileSystemTemplate<FileStore, FS_TYPE>::stripDirectories() {
return m_store->removeAllType(FileType::FileType_Directory); return m_store->removeAllType(FileType::FileType_Directory);
} }
template<typename FileStore, FsType FS_TYPE>
template<typename List>
int FileSystemTemplate<FileStore, FS_TYPE>::ls(const char *path, List *list) {
int err = 0;
auto inode = findInodeOf(path);
auto dirStat = stat(inode);
auto dirBuffLen = dirStat.size;
uint8_t dirBuff[dirBuffLen];
auto dir = (Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t>*) dirBuff;
err = read(dirStat.inode, dirBuff, dirBuffLen);
if (!err) {
dir->ls(list);
for (auto &i : *list) {
i.stat = stat(i.stat.inode);
}
return 0;
} else {
return 1;
}
}
template<typename FileStore, FsType FS_TYPE> template<typename FileStore, FsType FS_TYPE>
int FileSystemTemplate<FileStore, FS_TYPE>::mkdir(const char *path) { int FileSystemTemplate<FileStore, FS_TYPE>::mkdir(const char *path) {
Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t> dir; Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t> dir;
@@ -572,6 +560,11 @@ 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 (m_ownsBuff) {
while (m_store->spaceNeeded(size) > m_store->available()) {
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
@@ -643,12 +636,12 @@ uint8_t *FileSystemTemplate<FileStore, FS_TYPE>::buff() {
#pragma warning(disable:4244) #pragma warning(disable:4244)
#endif #endif
template<typename FileStore, FsType FS_TYPE> template<typename FileStore, FsType FS_TYPE>
uint8_t *FileSystemTemplate<FileStore, FS_TYPE>::format(void *buffer, typename FileStore::FsSize_t size, bool useDirectories) { uint8_t *FileSystemTemplate<FileStore, FS_TYPE>::format(uint8_t *buffer, typename FileStore::FsSize_t size, bool useDirectories) {
buffer = FileStore::format((uint8_t*) buffer, size, (uint16_t) FS_TYPE); buffer = FileStore::format(buffer, size, (uint16_t) FS_TYPE);
if (buffer && useDirectories) { if (buffer && useDirectories) {
Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t> dir; Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t> dir;
FileSystemTemplate<FileStore, FS_TYPE> fs(buffer); FileSystemTemplate<FileStore, FS_TYPE> fs((uint8_t*) buffer);
fs.write(INODE_ROOT_DIR, &dir, sizeof(dir), FileType::FileType_Directory); fs.write(INODE_ROOT_DIR, &dir, sizeof(dir), FileType::FileType_Directory);
} }
@@ -700,7 +693,7 @@ int FileSystemTemplate<FileStore, FS_TYPE>::insertDirectoryEntry(const char *dir
auto entry = (DirectoryEntry<typename FileStore::InodeId_t>*) &dirBuff[s.size]; auto entry = (DirectoryEntry<typename FileStore::InodeId_t>*) &dirBuff[s.size];
entry->inode = inode; entry->inode = inode;
entry->setName(fileName); entry->setName(fileName);
return write(s.inode, dirBuff, dirBuffSize, FileType::FileType_Directory); return write(s.inode, dirBuff, dirBuffSize, FileType_Directory);
} else { } else {
return 1; return 1;
} }
@@ -795,7 +788,7 @@ int FileSystemTemplate<FileStore, FS_TYPE>::readDirectory(const char *path, Dire
auto dirStat = stat(inode); auto dirStat = stat(inode);
auto dirBuffLen = dirStat.size; auto dirBuffLen = dirStat.size;
uint8_t dirBuff[dirBuffLen]; uint8_t dirBuff[dirBuffLen];
auto dir = (Directory<uint64_t, uint64_t>*) dirBuff; auto dir = (Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t>*) dirBuff;
err = read(dirStat.inode, dirBuff, dirBuffLen); err = read(dirStat.inode, dirBuff, dirBuffLen);
if (!err) { if (!err) {
@@ -805,6 +798,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;
src/ox/fs/oxfstool.cpp
+3 -3
View File
@@ -30,12 +30,12 @@ const static auto usage = "usage:\n"
"\toxfs compact <FS file>\n" "\toxfs compact <FS file>\n"
"\toxfs version\n"; "\toxfs version\n";
char *loadFileBuff(FILE *file, ::size_t *sizeOut = nullptr) { uint8_t *loadFileBuff(FILE *file, ::size_t *sizeOut = nullptr) {
if (file) { if (file) {
fseek(file, 0, SEEK_END); fseek(file, 0, SEEK_END);
const auto size = ftell(file); const auto size = ftell(file);
rewind(file); rewind(file);
auto buff = new char[size]; auto buff = new uint8_t[size];
auto itemsRead = fread(buff, size, 1, file); auto itemsRead = fread(buff, size, 1, file);
fclose(file); fclose(file);
if (sizeOut) { if (sizeOut) {
@@ -47,7 +47,7 @@ char *loadFileBuff(FILE *file, ::size_t *sizeOut = nullptr) {
} }
} }
char *loadFileBuff(const char *path, ::size_t *sizeOut = nullptr) { uint8_t *loadFileBuff(const char *path, ::size_t *sizeOut = nullptr) {
return loadFileBuff(fopen(path, "rb"), sizeOut); return loadFileBuff(fopen(path, "rb"), sizeOut);
} }