TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-16 07:46:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up block manager code

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2021-03-15 10:34:23 +01:00
parent 3ed20dcac3
commit 2877d55db1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dwarfs/block_manager.cpp
View File

@ -283,7 +283,9 @@ class block_manager_ final : public block_manager::impl {
cfg.window_increment_shift)} cfg.window_increment_shift)}
, block_size_{static_cast<size_t>(1) << cfg.block_size_bits} , block_size_{static_cast<size_t>(1) << cfg.block_size_bits}
, filter_{bloom_filter_size()} { , filter_{bloom_filter_size()} {
LOG_INFO << "bloom filter size: " << size_with_unit(filter_.size() / 8); if (segmentation_enabled()) {
LOG_INFO << "bloom filter size: " << size_with_unit(filter_.size() / 8);
}
} }
void add_inode(std::shared_ptr<inode> ino) override; void add_inode(std::shared_ptr<inode> ino) override;
@ -295,6 +297,10 @@ class block_manager_ final : public block_manager::impl {
size_t size{0}; size_t size{0};
}; };
bool segmentation_enabled() const {
return cfg_.max_active_blocks > 0 and window_size_ > 0;
}
void block_ready(); void block_ready();
void finish_chunk(inode& ino); void finish_chunk(inode& ino);
void append_to_block(inode& ino, mmif& mm, size_t offset, size_t size); void append_to_block(inode& ino, mmif& mm, size_t offset, size_t size);
@ -423,8 +429,7 @@ void block_manager_<LoggerPolicy>::add_inode(std::shared_ptr<inode> ino) {
LOG_TRACE << "adding inode " << ino->num() << " [" << ino->any()->name() LOG_TRACE << "adding inode " << ino->num() << " [" << ino->any()->name()
<< "] - size: " << size; << "] - size: " << size;
if (cfg_.max_active_blocks == 0 or window_size_ == 0 or if (!segmentation_enabled() or size < window_size_) {
size < window_size_) {
// no point dealing with hashing, just write it out // no point dealing with hashing, just write it out
add_data(*ino, *mm, 0, size); add_data(*ino, *mm, 0, size);
finish_chunk(*ino); finish_chunk(*ino);