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

Start separate thread for inode ordering

Browse Source 
This makes it easier to tell apart in `htop` and similar tools.
This commit is contained in:
Marcus Holland-Moritz 2022-12-24 14:50:42 +01:00
parent 411468872e
commit 9320f502f4
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/dwarfs/scanner.cpp
View File

@ -661,29 +661,39 @@ void scanner_<LoggerPolicy>::scan(
LOG_INFO << "building blocks..."; LOG_INFO << "building blocks...";
block_manager bm(lgr_, prog, cfg_, os_, fsw); block_manager bm(lgr_, prog, cfg_, os_, fsw);
worker_group blockify("blockify", 1, 1 << 20); {
worker_group blockify("blockify", 1, 1 << 20);
im.order_inodes(script_, options_.file_order, {
[&](std::shared_ptr<inode> const& ino) { worker_group ordering("ordering", 1);
blockify.add_job([&] {
prog.current.store(ino.get());
bm.add_inode(ino);
prog.inodes_written++;
});
auto queued_files = blockify.queue_size();
auto queued_blocks = fsw.queue_fill();
prog.blockify_queue = queued_files;
prog.compress_queue = queued_blocks;
return INT64_C(500) * queued_blocks +
static_cast<int64_t>(queued_files);
});
LOG_INFO << "waiting for segmenting/blockifying to finish..."; ordering.add_job([&] {
im.order_inodes(script_, options_.file_order,
[&](std::shared_ptr<inode> const& ino) {
blockify.add_job([&] {
prog.current.store(ino.get());
bm.add_inode(ino);
prog.inodes_written++;
});
auto queued_files = blockify.queue_size();
auto queued_blocks = fsw.queue_fill();
prog.blockify_queue = queued_files;
prog.compress_queue = queued_blocks;
return INT64_C(500) * queued_blocks +
static_cast<int64_t>(queued_files);
});
});
blockify.wait(); ordering.wait();
}
LOG_INFO << "segmenting/blockifying CPU time: " LOG_INFO << "waiting for segmenting/blockifying to finish...";
<< time_with_unit(blockify.get_cpu_time());
blockify.wait();
LOG_INFO << "segmenting/blockifying CPU time: "
<< time_with_unit(blockify.get_cpu_time());
}
bm.finish_blocks(); bm.finish_blocks();
wg_.wait(); wg_.wait();