drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/fs] Add support for direct access to FS memory

Browse Source
This commit is contained in:
Gary Talent 2019-11-01 01:25:24 -05:00
parent 73377068c6
commit 9da47f75c0
4 changed files with 70 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,18 @@
namespace ox { namespace ox {
[[nodiscard]] ox::ValErr<const uint8_t*> FileSystem::read(FileAddress addr) {
switch (addr.type()) {
case FileAddressType::Inode:
return read(addr.getInode().value);
case FileAddressType::ConstPath:
case FileAddressType::Path:
return read(addr.getPath().value);
default:
return OxError(1);
}
}
[[nodiscard]] ox::Error FileSystem::read(FileAddress addr, void *buffer, std::size_t size) { [[nodiscard]] ox::Error FileSystem::read(FileAddress addr, void *buffer, std::size_t size) {
switch (addr.type()) { switch (addr.type()) {
case FileAddressType::Inode: case FileAddressType::Inode:

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

@ -21,54 +21,60 @@ class FileSystem {
public: public:
virtual ~FileSystem() = default; virtual ~FileSystem() = default;
virtual ox::Error mkdir(const char *path, bool recursive = false) = 0; [[nodiscard]] virtual ox::Error mkdir(const char *path, bool recursive = false) = 0;
/** /**
* Moves an entry from one directory to another. * Moves an entry from one directory to another.
* @param src the path to the file * @param src the path to the file
* @param dest the path of the destination directory * @param dest the path of the destination directory
*/ */
virtual ox::Error move(const char *src, const char *dest) = 0; [[nodiscard]] virtual ox::Error move(const char *src, const char *dest) = 0;
virtual ox::Error read(const char *path, void *buffer, std::size_t buffSize) = 0; [[nodiscard]] virtual ox::Error read(const char *path, void *buffer, std::size_t buffSize) = 0;
virtual ox::Error read(uint64_t inode, void *buffer, std::size_t size) = 0; [[nodiscard]] virtual ox::ValErr<const uint8_t*> read(const char *path) = 0;
virtual ox::Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) = 0; [[nodiscard]] virtual ox::Error read(uint64_t inode, void *buffer, std::size_t size) = 0;
[[nodiscard]] virtual ox::Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) = 0;
[[nodiscard]] virtual ox::ValErr<const uint8_t*> read(uint64_t inode) = 0;
[[nodiscard]] ox::Error read(FileAddress addr, void *buffer, std::size_t size); [[nodiscard]] ox::Error read(FileAddress addr, void *buffer, std::size_t size);
[[nodiscard]] ox::Error read(FileAddress addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size); [[nodiscard]] ox::Error read(FileAddress addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size);
virtual ox::Error remove(const char *path, bool recursive = false) = 0; [[nodiscard]] ox::ValErr<const uint8_t*> read(FileAddress addr);
[[nodiscard]] virtual ox::Error remove(const char *path, bool recursive = false) = 0;
[[nodiscard]] ox::Error remove(FileAddress addr, bool recursive = false); [[nodiscard]] ox::Error remove(FileAddress addr, bool recursive = false);
virtual ox::Error resize(uint64_t size, void *buffer = nullptr) = 0; [[nodiscard]] virtual ox::Error resize(uint64_t size, void *buffer = nullptr) = 0;
virtual ox::Error write(const char *path, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile) = 0; [[nodiscard]] virtual ox::Error write(const char *path, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile) = 0;
virtual ox::Error write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile) = 0; [[nodiscard]] virtual ox::Error write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile) = 0;
[[nodiscard]] ox::Error write(FileAddress addr, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile); [[nodiscard]] ox::Error write(FileAddress addr, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile);
virtual ox::ValErr<FileStat> stat(uint64_t inode) = 0; [[nodiscard]] virtual ox::ValErr<FileStat> stat(uint64_t inode) = 0;
virtual ox::ValErr<FileStat> stat(const char *path) = 0; [[nodiscard]] virtual ox::ValErr<FileStat> stat(const char *path) = 0;
[[nodiscard]] ox::ValErr<FileStat> stat(FileAddress addr); [[nodiscard]] ox::ValErr<FileStat> stat(FileAddress addr);
virtual uint64_t spaceNeeded(uint64_t size) = 0; [[nodiscard]] virtual uint64_t spaceNeeded(uint64_t size) = 0;
virtual uint64_t available() = 0; [[nodiscard]] virtual uint64_t available() = 0;
virtual uint64_t size() const = 0; [[nodiscard]] virtual uint64_t size() const = 0;
virtual uint8_t *buff() = 0; [[nodiscard]] virtual uint8_t *buff() = 0;
virtual ox::Error walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) = 0; [[nodiscard]] virtual ox::Error walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) = 0;
virtual bool valid() const = 0; [[nodiscard]] virtual bool valid() const = 0;
}; };
@ -104,10 +110,14 @@ class FileSystemTemplate: public FileSystem {
[[nodiscard]] ox::Error read(const char *path, void *buffer, std::size_t buffSize) override; [[nodiscard]] ox::Error read(const char *path, void *buffer, std::size_t buffSize) override;
[[nodiscard]] ox::ValErr<const uint8_t*> read(const char*) override;
[[nodiscard]] ox::Error read(uint64_t inode, void *buffer, std::size_t size) override; [[nodiscard]] ox::Error read(uint64_t inode, void *buffer, std::size_t size) override;
[[nodiscard]] ox::Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) override; [[nodiscard]] ox::Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) override;
[[nodiscard]] ox::ValErr<const uint8_t*> read(uint64_t) override;
template<typename F> template<typename F>
[[nodiscard]] ox::Error ls(const char *dir, F cb); [[nodiscard]] ox::Error ls(const char *dir, F cb);
@ -212,6 +222,16 @@ ox::Error FileSystemTemplate<FileStore, Directory>::read(const char *path, void
return read(inode, buffer, buffSize); return read(inode, buffer, buffSize);
} }
template<typename FileStore, typename Directory>
[[nodiscard]] ox::ValErr<const uint8_t*> FileSystemTemplate<FileStore, Directory>::read(const char *path) {
auto fd = fileSystemData();
oxReturnError(fd.error);
Directory rootDir(m_fs, fd.value.rootDirInode);
auto [inode, err] = rootDir.find(path);
oxReturnError(err);
return read(inode);
}
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
ox::Error FileSystemTemplate<FileStore, Directory>::read(uint64_t inode, void *buffer, std::size_t buffSize) { ox::Error FileSystemTemplate<FileStore, Directory>::read(uint64_t inode, void *buffer, std::size_t buffSize) {
return m_fs.read(inode, buffer, buffSize); return m_fs.read(inode, buffer, buffSize);
@ -222,6 +242,15 @@ ox::Error FileSystemTemplate<FileStore, Directory>::read(uint64_t inode, std::si
return m_fs.read(inode, readStart, readSize, reinterpret_cast<uint8_t*>(buffer), size); return m_fs.read(inode, readStart, readSize, reinterpret_cast<uint8_t*>(buffer), size);
} }
template<typename FileStore, typename Directory>
[[nodiscard]] ox::ValErr<const uint8_t*> FileSystemTemplate<FileStore, Directory>::read(uint64_t inode) {
auto data = m_fs.read(inode);
if (!data.valid()) {
return OxError(1);
}
return data.get();
}
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
template<typename F> template<typename F>
ox::Error FileSystemTemplate<FileStore, Directory>::ls(const char *path, F cb) { ox::Error FileSystemTemplate<FileStore, Directory>::ls(const char *path, F cb) {

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

@ -58,6 +58,10 @@ Error PassThroughFS::read(const char *path, void *buffer, std::size_t buffSize)
return OxError(1); return OxError(1);
} }
ValErr<const uint8_t*> PassThroughFS::read(const char*) {
return OxError(1);
}
Error PassThroughFS::read(uint64_t, void*, std::size_t) { Error PassThroughFS::read(uint64_t, void*, std::size_t) {
// unsupported // unsupported
return OxError(1); return OxError(1);
@ -68,6 +72,10 @@ Error PassThroughFS::read(uint64_t, std::size_t, std::size_t, void*, std::size_t
return OxError(1); return OxError(1);
} }
ValErr<const uint8_t*> PassThroughFS::read(uint64_t) {
return OxError(1);
}
Error PassThroughFS::remove(const char *path, bool recursive) { Error PassThroughFS::remove(const char *path, bool recursive) {
if (recursive) { if (recursive) {
return OxError(std::filesystem::remove_all(m_path / stripSlash(path)) != 0); return OxError(std::filesystem::remove_all(m_path / stripSlash(path)) != 0);

4
deps/ox/src/ox/fs/filesystem/passthroughfs.hpp vendored
View File

@ -43,10 +43,14 @@ class PassThroughFS: public FileSystem {
ox::Error read(const char *path, void *buffer, std::size_t buffSize) override; ox::Error read(const char *path, void *buffer, std::size_t buffSize) override;
ox::ValErr<const uint8_t*> read(const char*) override;
ox::Error read(uint64_t inode, void *buffer, std::size_t size) override; ox::Error read(uint64_t inode, void *buffer, std::size_t size) override;
ox::Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) override; ox::Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) override;
ox::ValErr<const uint8_t*> read(uint64_t) override;
template<typename F> template<typename F>
ox::Error ls(const char *dir, F cb); ox::Error ls(const char *dir, F cb);