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

thread_pool: replace goto claimed with explicit bool in claim path

Browse source 
The RAII-guarded locks at function top survive the goto correctly, but
the pattern reads awkwardly — reviewers have to verify that nothing in
the claimed path relies on state that the goto skipped over.  Use a
bool flag and a straight-line fall-through instead.  No behavior
change.
This commit is contained in:
Antonio S. Musumeci 2026-04-18 17:51:29 -04:00
parent e55bf1829b
commit f7a9fbd0cf
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
vendored/libfuse/include/thread_pool.hpp
View file

@ -887,29 +887,31 @@ ThreadPool::_try_claim_and_remove_self(pthread_t t_)
// Try to claim a pending removal.
std::size_t count = _remove_count.load(std::memory_order_relaxed);
bool claimed = false;
while(count > 0)
{
if(_remove_count.compare_exchange_weak(count,count - 1,
std::memory_order_acq_rel))
goto claimed;
{
claimed = true;
break;
}
}
return false;
if(!claimed)
return false;
claimed:
// Safety floor: never remove the last thread. Use the same
// min_allowed logic as _remove_thread_scaling_locked.
{
std::size_t min_allowed = 1;
if(_dynamic_scaling_enabled && _scaling_config.min_threads > min_allowed)
min_allowed = _scaling_config.min_threads;
if(_threads.size() <= min_allowed)
{
// Restore the claim — a future set_threads or grow will
// either cancel it or the pool will be large enough.
_remove_count.fetch_add(1,std::memory_order_relaxed);
return false;
}
}
std::size_t min_allowed = 1;
if(_dynamic_scaling_enabled && _scaling_config.min_threads > min_allowed)
min_allowed = _scaling_config.min_threads;
if(_threads.size() <= min_allowed)
{
// Restore the claim — a future set_threads or grow will
// either cancel it or the pool will be large enough.
_remove_count.fetch_add(1,std::memory_order_relaxed);
return false;
}
auto it = std::find(_threads.begin(),_threads.end(),t_);
if(it == _threads.end())