hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Simplified read/write implementation

Browse Source
This commit is contained in:
Sebastian Messmer 2015-02-26 20:23:37 +01:00
parent a44b6318e2
commit c978a4581a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
implementations/onblocks/BlobOnBlocks.cpp
View File

@ -34,7 +34,7 @@ void BlobOnBlocks::flush() const {
_datatree->flush(); _datatree->flush();
} }
void BlobOnBlocks::traverseLeaves(uint64_t beginByte, uint64_t sizeBytes, function<void (DataLeafNode*, uint64_t, uint32_t, uint32_t)> func) const { void BlobOnBlocks::traverseLeaves(uint64_t beginByte, uint64_t sizeBytes, function<void (uint64_t, void *, uint32_t)> func) const {
uint64_t endByte = beginByte + sizeBytes; uint64_t endByte = beginByte + sizeBytes;
assert(endByte <= size()); assert(endByte <= size());
uint32_t firstLeaf = beginByte / _datatree->maxBytesPerLeaf(); uint32_t firstLeaf = beginByte / _datatree->maxBytesPerLeaf();
@ -43,19 +43,19 @@ void BlobOnBlocks::traverseLeaves(uint64_t beginByte, uint64_t sizeBytes, functi
uint64_t indexOfFirstLeafByte = leafIndex * leaf->maxStoreableBytes(); uint64_t indexOfFirstLeafByte = leafIndex * leaf->maxStoreableBytes();
uint32_t dataBegin = utils::maxZeroSubtraction(beginByte, indexOfFirstLeafByte); uint32_t dataBegin = utils::maxZeroSubtraction(beginByte, indexOfFirstLeafByte);
uint32_t dataSize = std::min((uint64_t)leaf->maxStoreableBytes(), endByte - indexOfFirstLeafByte); uint32_t dataSize = std::min((uint64_t)leaf->maxStoreableBytes(), endByte - indexOfFirstLeafByte);
func(leaf, indexOfFirstLeafByte, dataBegin, dataSize); func(indexOfFirstLeafByte, (uint8_t*)leaf->data() + dataBegin, dataSize);
}); });
} }
void BlobOnBlocks::read(void *target, uint64_t offset, uint64_t size) const { void BlobOnBlocks::read(void *target, uint64_t offset, uint64_t size) const {
traverseLeaves(offset, size, [target] (DataLeafNode *leaf, uint64_t indexOfFirstLeafByte, uint32_t dataBegin, uint32_t dataSize) { traverseLeaves(offset, size, [target] (uint64_t indexOfFirstLeafByte, void *leafDataBegin, uint32_t leafDataSize) {
std::memcpy(target, (uint8_t*)leaf->data() + dataBegin, dataSize); std::memcpy(target, leafDataBegin, leafDataSize);
}); });
} }
void BlobOnBlocks::write(const void *source, uint64_t offset, uint64_t size) { void BlobOnBlocks::write(const void *source, uint64_t offset, uint64_t size) {
traverseLeaves(offset, size, [source] (DataLeafNode *leaf, uint64_t indexOfFirstLeafByte, uint32_t dataBegin, uint32_t dataSize) { traverseLeaves(offset, size, [source] (uint64_t indexOfFirstLeafByte, void *leafDataBegin, uint32_t leafDataSize) {
std::memcpy((uint8_t*)leaf->data() + dataBegin, source, dataSize); std::memcpy(leafDataBegin, source, leafDataSize);
}); });
} }

2
implementations/onblocks/BlobOnBlocks.h
View File

@ -30,7 +30,7 @@ public:
private: private:
//TODO Don't pass DataLeafNode, but pointer to its data region? Does this work with both read/write (const/nonconst)? //TODO Don't pass DataLeafNode, but pointer to its data region? Does this work with both read/write (const/nonconst)?
void traverseLeaves(uint64_t offsetBytes, uint64_t sizeBytes, std::function<void (datanodestore::DataLeafNode*, uint64_t, uint32_t, uint32_t)>) const; void traverseLeaves(uint64_t offsetBytes, uint64_t sizeBytes, std::function<void (uint64_t, void *, uint32_t)>) const;
std::unique_ptr<datatreestore::DataTree> _datatree; std::unique_ptr<datatreestore::DataTree> _datatree;
}; };