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

Make _scaling_config const to enforce write-once invariant

Browse source 
_scaling_config was documented as read-only after construction but
nothing prevented accidental mutation.  Move its initialization from
the constructor body into the member initializer list (using a
ternary to handle the nullptr case) and mark it const.

_autoscale_enabled cannot be made const because the constructor
clears it if the monitor thread fails to spawn.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Antonio S. Musumeci 2026-04-10 13:44:27 -04:00
parent 0a0c82c224
commit 462020d19a
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,11 +173,11 @@ private:
std::atomic<std::uint64_t> _tasks_completed{0};
// Auto-scaling state
// _autoscale_enabled and _scaling_config are set once in the
// constructor before any threads start and are thereafter read-only.
// No synchronization is needed for their accesses.
bool _autoscale_enabled;
ScalingConfig _scaling_config;
// _autoscale_enabled is set in the constructor and may be cleared
// if the monitor thread fails to spawn. Read-only after ctor.
// _scaling_config is fully immutable after construction.
bool _autoscale_enabled;
ScalingConfig const _scaling_config;
pthread_t _monitor_thread;
pthread_mutex_t _monitor_mutex;
pthread_cond_t _monitor_cond;
@ -204,7 +204,7 @@ ThreadPool::ThreadPool(const unsigned thread_count_,
: _queue(max_queue_depth_),
_name(name_),
_autoscale_enabled(scaling_config_ != nullptr),
_scaling_config(),
_scaling_config(scaling_config_ ? *scaling_config_ : ScalingConfig{}),
_monitor_thread(),
_monitor_mutex(PTHREAD_MUTEX_INITIALIZER),
_monitor_cond()
@ -219,9 +219,6 @@ ThreadPool::ThreadPool(const unsigned thread_count_,
pthread_condattr_destroy(&attr);
}
if(scaling_config_)
_scaling_config = *scaling_config_;
// Clamp initial thread count to ScalingConfig bounds when auto-scaling.
std::size_t count = thread_count_;
if(_autoscale_enabled)