Misc changes (#1513)
Some checks are pending
CodeQL / Analyze (push) Waiting to run
mkdocs / deploy (push) Waiting to run

* Start moving to string_view where possible
* Rework readdir object to use atomic load/store
This commit is contained in:
trapexit 2025-08-21 23:42:58 -04:00 • committed by GitHub
parent 2101ef5bcc
commit 6ac7f389c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
61 changed files with 841 additions and 745 deletions

View file

@ -22,31 +22,46 @@
#include "fuse_readdir_cosr.hpp"
#include "fuse_readdir_seq.hpp"
#include <array>
#include <cassert>
#include <cmath>
#include <cstdio>
#include <cstdlib>
#include <set>
#include <regex>
// Regex:
// ^([a-z]{1,15}) -> required type
// (?::(\d+))? -> optional colon + concurrency
// (?::(\d+))? -> optional colon + max_queue_depth
// $ -> end of string
static
void
_read_cfg(std::string const str_,
std::string &type_,
unsigned &concurrency_,
unsigned &max_queue_depth_)
_read_cfg(const std::string_view str_,
std::string &type_,
int &concurrency_,
int &max_queue_depth_)
{
char type[16];
std::string type;
int concurrency;
int max_queue_depth;
bool matched;
std::cmatch match;
std::regex re(R"(^([a-z]{1,15})(?::(\d+))?(?::(\d+))?$)");
concurrency = 0;
concurrency = 0;
max_queue_depth = 0;
std::sscanf(str_.c_str(),
"%15[a-z]:%d:%d",
type,
&concurrency,
&max_queue_depth);
matched = std::regex_match(str_.begin(),
str_.end(),
match,
re);
if(matched)
{
type = match[1];
if(match[2].matched)
concurrency = std::stoi(match[2]);
if(match[3].matched)
max_queue_depth = std::stoi(match[3]);
}
if(concurrency == 0)
{
@ -73,37 +88,13 @@ _read_cfg(std::string const str_,
}
bool
FUSE::ReadDirFactory::valid(const std::string str_)
{
unsigned concurrency;
unsigned max_queue_depth;
std::string type;
static const std::set<std::string> types =
{
"seq", "cosr", "cor"
};
::_read_cfg(str_,type,concurrency,max_queue_depth);
if(types.find(type) == types.end())
return false;
if(concurrency <= 0)
return false;
return true;
}
std::shared_ptr<FUSE::ReadDirBase>
FUSE::ReadDirFactory::make(std::string const str_)
FUSE::ReadDirFactory::make(const std::string_view str_)
{
unsigned concurrency;
unsigned max_queue_depth;
int concurrency;
int max_queue_depth;
std::string type;
if(!valid(str_))
return {};
::_read_cfg(str_,type,concurrency,max_queue_depth);
if(type == "seq")