Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

variant to span helper

Browse Source
This commit is contained in:
Green Sky 2024-04-01 12:43:21 +02:00
parent 1b9363e7b5
commit b640b5a06b
No known key found for this signature in database
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/fragment_store/fragment_store.cpp
View File

@ -37,6 +37,19 @@ static const char* metaFileTypeSuffix(MetaFileType mft) {
return ""; // .unk? return ""; // .unk?
} }
// TODO: move to ... somewhere. (span? file2i?)
static ByteSpan spanFromRead(const std::variant<ByteSpan, std::vector<uint8_t>>& data_var) {
if (std::holds_alternative<std::vector<uint8_t>>(data_var)) {
auto& vec = std::get<std::vector<uint8_t>>(data_var);
return {vec.data(), vec.size()};
} else if (std::holds_alternative<ByteSpan>(data_var)) {
return std::get<ByteSpan>(data_var);
} else {
assert(false);
return {};
}
}
FragmentStore::FragmentStore(void) { FragmentStore::FragmentStore(void) {
registerSerializers(); registerSerializers();
} }
@ -445,27 +458,21 @@ bool FragmentStore::loadFromStorage(FragmentID fid, std::function<read_from_stor
// add layer based on enum // add layer based on enum
if (data_comp == Compression::ZSTD) { if (data_comp == Compression::ZSTD) {
data_file_stack.push(std::make_unique<File2ZSTDR>(*data_file_stack.top().get())); data_file_stack.push(std::make_unique<File2ZSTDR>(*data_file_stack.top().get()));
if (!data_file_stack.top()->isGood()) {
std::cerr << "FS error: fragment data file failed to add zstd decompression layer '" << frag_path << "'\n";
return false;
}
} else { } else {
// TODO: make error instead
assert(data_comp == Compression::NONE); assert(data_comp == Compression::NONE);
} }
if (!data_file_stack.top()->isGood()) {
std::cerr << "FS error: fragment data file failed to add " << (int)data_comp << " decompression layer '" << frag_path << "'\n";
return false;
}
// TODO: make it read in a single chunk instead? // TODO: make it read in a single chunk instead?
static constexpr int64_t chunk_size {1024 * 1024}; // 1MiB should be good for read static constexpr int64_t chunk_size {1024 * 1024}; // 1MiB should be good for read
do { do {
auto data_var = data_file_stack.top()->read(chunk_size); auto data_var = data_file_stack.top()->read(chunk_size);
ByteSpan data; ByteSpan data = spanFromRead(data_var);
if (std::holds_alternative<std::vector<uint8_t>>(data_var)) {
auto& vec = std::get<std::vector<uint8_t>>(data_var);
data = {vec.data(), vec.size()};
} else if (std::holds_alternative<ByteSpan>(data_var)) {
data = std::get<ByteSpan>(data_var);
} else {
assert(false);
}
if (data.empty()) { if (data.empty()) {
// error or probably eof // error or probably eof