TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-08 11:59:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some dwarfsextract tweaks

Browse Source 
- Make sure we don't block if file size is larger than cache size
- Increase default cache size just a bit
- Tweak initial semaphore value to avoid early cache evictions
This commit is contained in:
Marcus Holland-Moritz 2021-03-05 23:54:29 +01:00
parent 30a3d2faad
commit fb38539c69
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dwarfsextract.cpp
View File

@ -56,26 +56,29 @@ namespace {
class semaphore { class semaphore {
public: public:
void post(uint64_t n = 1) { void post(int64_t n) {
{ {
std::lock_guard lock(mx_); std::lock_guard lock(mx_);
count_ += n; size_ += n;
++count_;
} }
condition_.notify_one(); condition_.notify_one();
} }
void wait(uint64_t n = 1) { void wait(int64_t n) {
std::unique_lock lock(mx_); std::unique_lock lock(mx_);
while (count_ < n) { while (size_ < n && count_ <= 0) {
condition_.wait(lock); condition_.wait(lock);
} }
count_ -= n; size_ -= n;
--count_;
} }
private: private:
std::mutex mx_; std::mutex mx_;
std::condition_variable condition_; std::condition_variable condition_;
uint64_t count_{0}; int64_t count_{0};
int64_t size_{0};
}; };
int dwarfsextract(int argc, char** argv) { int dwarfsextract(int argc, char** argv) {
@ -98,7 +101,7 @@ int dwarfsextract(int argc, char** argv) {
po::value<size_t>(&num_workers)->default_value(4), po::value<size_t>(&num_workers)->default_value(4),
"number of worker threads") "number of worker threads")
("cache-size,s", ("cache-size,s",
po::value<std::string>(&cache_size_str)->default_value("256m"), po::value<std::string>(&cache_size_str)->default_value("512m"),
"block cache size") "block cache size")
("log-level,l", ("log-level,l",
po::value<std::string>(&log_level)->default_value("warn"), po::value<std::string>(&log_level)->default_value("warn"),
@ -181,7 +184,14 @@ int dwarfsextract(int argc, char** argv) {
worker_group archiver("archiver", 1); worker_group archiver("archiver", 1);
semaphore sem; semaphore sem;
sem.post(fsopts.block_cache.max_bytes);
{
struct ::statvfs buf;
fs.statvfs(&buf);
sem.post(fsopts.block_cache.max_bytes > buf.f_bsize
? fsopts.block_cache.max_bytes - buf.f_bsize
: 0);
}
auto do_archive = [&](::archive_entry* ae, entry_view entry) { auto do_archive = [&](::archive_entry* ae, entry_view entry) {
if (auto size = ::archive_entry_size(ae); if (auto size = ::archive_entry_size(ae);