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

[ox/fs] Add Error return to FileStore compact

Browse Source
This commit is contained in:
Gary Talent
2019-07-20 18:46:52 -05:00
parent 22378d0a9f
commit 2d2cd2bbb6
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
deps/ox/src/ox/ptrarith/nodebuffer.hpp vendored
View File

@@ -150,7 +150,7 @@ class __attribute__((packed)) NodeBuffer {
size_t spaceNeeded(size_t size);
template<typename F>
void compact(F cb = [](uint64_t, ItemPtr) {});
ox::Error compact(F cb = [](uint64_t, ItemPtr) {});
void truncate();
@@ -354,13 +354,13 @@ size_t NodeBuffer<size_t, Item>::spaceNeeded(size_t size) {
template<typename size_t, typename Item>
template<typename F>
void NodeBuffer<size_t, Item>::compact(F cb) {
ox::Error NodeBuffer<size_t, Item>::compact(F cb) {
auto src = firstItem();
auto dest = ptr(sizeof(*this));
while (src.valid() && dest.valid() && dest.offset() <= src.offset()) {
// move node
ox_memcpy(dest, src, src.size());
cb(src, dest);
oxReturnError(cb(src, dest));
// update surrounding nodes
auto prev = ptr(dest->prev);
if (prev.valid()) {
@@ -374,6 +374,7 @@ void NodeBuffer<size_t, Item>::compact(F cb) {
src = ptr(dest->next);
dest = ptr(dest.offset() + dest.size());
}
return OxError(0);
}
template<typename size_t, typename Item>