rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 19:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework thread pool for increased stability + config and doc updates (#1453)

Browse source 
Also updates fmt to 11.2.0 and replaced syslog usage with a wrapper
leveraging fmt.
This commit is contained in:
trapexit 2025-05-05 18:28:49 -05:00 • committed by GitHub
parent 455a81290b
commit 344014aa81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
58 changed files with 9097 additions and 24020 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/fuse_readdir_factory.cpp
View file

@ -28,50 +28,53 @@
#include <cstdlib>
#include <set>
#define DEFAULT_MAX_QUEUE_DEPTH 3
namespace l
static
void
_read_cfg(std::string const str_,
std::string &type_,
unsigned &concurrency_,
unsigned &max_queue_depth_)
{
static
void
read_cfg(std::string const str_,
std::string &type_,
unsigned &concurrency_,
unsigned &max_queue_depth_)
{
char type[16];
int concurrency;
int max_queue_depth;
char type[16];
int concurrency;
int max_queue_depth;
concurrency = 0;
max_queue_depth = 0;
std::sscanf(str_.c_str(),
"%15[a-z]:%d:%d",
type,
&concurrency,
&max_queue_depth);
concurrency = 0;
max_queue_depth = 0;
std::sscanf(str_.c_str(),
"%15[a-z]:%d:%d",
type,
&concurrency,
&max_queue_depth);
if(concurrency == 0)
if(concurrency == 0)
{
concurrency = std::thread::hardware_concurrency();
else if(concurrency < 0)
if(concurrency > 8)
concurrency = 8;
}
else if(concurrency < 0)
{
concurrency = (std::thread::hardware_concurrency() / std::abs(concurrency));
}
if(concurrency == 0)
concurrency = 1;
if(concurrency <= 0)
concurrency = 1;
if(max_queue_depth == 0)
max_queue_depth = DEFAULT_MAX_QUEUE_DEPTH;
if(max_queue_depth <= 0)
max_queue_depth = 2;
max_queue_depth *= concurrency;
max_queue_depth *= concurrency;
type_ = type;
concurrency_ = concurrency;
max_queue_depth_ = max_queue_depth;
}
type_ = type;
concurrency_ = concurrency;
max_queue_depth_ = max_queue_depth;
}
bool
FUSE::ReadDirFactory::valid(std::string const str_)
FUSE::ReadDirFactory::valid(const std::string str_)
{
unsigned concurrency;
unsigned max_queue_depth;
@ -81,7 +84,7 @@ FUSE::ReadDirFactory::valid(std::string const str_)
"seq", "cosr", "cor"
};
l::read_cfg(str_,type,concurrency,max_queue_depth);
::_read_cfg(str_,type,concurrency,max_queue_depth);
if(types.find(type) == types.end())
return false;
@ -101,7 +104,7 @@ FUSE::ReadDirFactory::make(std::string const str_)
if(!valid(str_))
return {};
l::read_cfg(str_,type,concurrency,max_queue_depth);
::_read_cfg(str_,type,concurrency,max_queue_depth);
if(type == "seq")
return std::make_shared<FUSE::ReadDirSeq>();