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

[ox/fs] Fill out new FileSystem method stubs

Browse Source
This commit is contained in:
Gary Talent
2018-08-18 23:41:31 -05:00
parent 3d3ea32357
commit 40f8af85a8
6 changed files with 124 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
deps/ox/src/ox/fs/filestore/filestore.hpp vendored
View File

@@ -12,16 +12,16 @@
namespace ox::fs {
using InodeId_t = uintptr_t;
using FsSize_t = uintptr_t;
using InodeId_t = uint64_t;
using FsSize_t = std::size_t;
class FileStore {
public:
struct StatInfo {
InodeId_t inodeId = 0;
InodeId_t inode = 0;
InodeId_t links = 0;
InodeId_t size = 0;
FsSize_t size = 0;
uint8_t fileType = 0;
};
@@ -40,7 +40,7 @@ class FileStore {
*/
virtual Error remove(InodeId_t id) = 0;
virtual Error read(InodeId_t id, void *data, FsSize_t dataSize, FsSize_t *size = nullptr) = 0;
virtual Error read(InodeId_t id, void *data, FsSize_t dataSize, std::size_t *size = nullptr) = 0;
virtual Error read(InodeId_t id, FsSize_t readStart, FsSize_t readSize, void *data, FsSize_t *size = nullptr) = 0;
@@ -59,6 +59,14 @@ class FileStore {
virtual InodeId_t available() = 0;
/**
* @return a pointer to the buffer of the file system, or null if not
* applicable
*/
virtual uint8_t *buff() = 0;
virtual Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) = 0;
virtual ValErr<InodeId_t> generateInodeId() = 0;
};

53
deps/ox/src/ox/fs/filestore/filestoretemplate.hpp vendored
View File

@@ -63,23 +63,23 @@ class FileStoreTemplate: public FileStore {
public:
FileStoreTemplate(void *buff, size_t buffSize);
Error format();
Error format() override;
Error setSize(InodeId_t buffSize);
Error setSize(InodeId_t buffSize) override;
Error incLinks(InodeId_t id);
Error incLinks(InodeId_t id) override;
Error decLinks(InodeId_t id);
Error decLinks(InodeId_t id) override;
Error write(InodeId_t id, void *data, FsSize_t dataLen, uint8_t fileType = 0);
Error write(InodeId_t id, void *data, FsSize_t dataLen, uint8_t fileType = 0) override;
Error remove(InodeId_t id);
Error remove(InodeId_t id) override;
Error read(InodeId_t id, void *data, FsSize_t dataSize, FsSize_t *size);
Error read(InodeId_t id, void *data, FsSize_t dataSize, FsSize_t *size) override;
Error read(InodeId_t id, FsSize_t readStart, FsSize_t readSize, void *data, FsSize_t *size);
Error read(InodeId_t id, FsSize_t readStart, FsSize_t readSize, void *data, FsSize_t *size) override;
const ptrarith::Ptr<uint8_t, std::size_t> read(InodeId_t id);
const ptrarith::Ptr<uint8_t, std::size_t> read(InodeId_t id) override;
/**
* Reads the "file" at the given id. You are responsible for freeing
@@ -96,17 +96,21 @@ class FileStoreTemplate: public FileStore {
FsSize_t readSize, T *data,
FsSize_t *size);
ValErr<StatInfo> stat(InodeId_t id);
ValErr<StatInfo> stat(InodeId_t id) override;
Error resize(std::size_t size, void *newBuff = nullptr);
Error resize(std::size_t size, void *newBuff = nullptr) override;
InodeId_t spaceNeeded(FsSize_t size);
InodeId_t spaceNeeded(FsSize_t size) override;
InodeId_t size();
InodeId_t size() override;
InodeId_t available();
InodeId_t available() override;
ValErr<InodeId_t> generateInodeId();
uint8_t *buff() override;
Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) override;
ValErr<InodeId_t> generateInodeId() override;
private:
void compact();
@@ -376,6 +380,10 @@ const ptrarith::Ptr<uint8_t, std::size_t> FileStoreTemplate<size_t>::read(InodeI
template<typename size_t>
Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
m_buffSize = size;
if (newBuff) {
m_buffer = reinterpret_cast<Buffer*>(newBuff);
}
return OxError(0);
}
@@ -384,7 +392,7 @@ ValErr<typename FileStoreTemplate<size_t>::StatInfo> FileStoreTemplate<size_t>::
auto inode = find(id);
if (inode.valid()) {
return ValErr<StatInfo>({
.inodeId = id,
.inode = id,
.links = inode->links,
.size = inode->size(),
.fileType = inode->fileType,
@@ -408,6 +416,19 @@ InodeId_t FileStoreTemplate<size_t>::available() {
return m_buffer->available();
}
template<typename size_t>
uint8_t *FileStoreTemplate<size_t>::buff() {
return reinterpret_cast<uint8_t*>(m_buffer);
}
template<typename size_t>
Error FileStoreTemplate<size_t>::walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) {
for (auto i = m_buffer->iterator(); i.valid(); i.next()) {
oxReturnError(cb(i->fileType, i.ptr().offset(), i.ptr().end()));
}
return OxError(0);
}
template<typename size_t>
ValErr<InodeId_t> FileStoreTemplate<size_t>::generateInodeId() {
auto fsData = fileStoreData();