Fix fuse loop hang when a read worker exits

- DEFERs run in reverse order, so workers posted the semaphore before
  setting exited; the main loop could wake, see exited == 0 and wait
  again. With one read thread mergerfs then stayed running after
  unmount until signaled.
- Set exited and post in a single DEFER, in that order.
This commit is contained in:
neargye 2026-11-17 16:50:48 +04:00 • committed by trapexit
parent 6d138906ec
commit cb930ee7a0

View file

@ -85,8 +85,12 @@ struct AsyncWorker
void
operator()() const
{
DEFER{ fuse_session_exit(_se); };
DEFER{ sem_post(_finished); };
// Set exited before waking the main loop, which rechecks it.
DEFER
{
fuse_session_exit(_se);
sem_post(_finished);
};
ThreadPool::PToken ptok(_process_tp->ptoken());
while(!fuse_session_exited(_se))
@ -149,8 +153,12 @@ struct SyncWorker
void
operator()() const
{
DEFER{ fuse_session_exit(_se); };
DEFER{ sem_post(_finished); };
// Set exited before waking the main loop, which rechecks it.
DEFER
{
fuse_session_exit(_se);
sem_post(_finished);
};
while(!fuse_session_exited(_se))
{