diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-28 13:37:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-28 13:37:03 -0400 |
| commit | 4888c5b0422c8006b4c178503b24bced733931fa (patch) | |
| tree | e171586eddc9a0bcd0c8f2af3097121f2c25d3a6 /Assistant.hs | |
| parent | 40f357fdcf07a9b9844e675fe478ab08f5c1bae8 (diff) | |
improve thread termination handling
The reason the DirWatcher had to wait for program termination was because
it used withINotify, so when it finished, its watcher threads were killed.
But since I have two DirWatcher threads now, that was not good, and could
perhaps explain the MVar problem I saw yesterday. In any case, fixed this
part of the code by making the DirWatcher return a handle that can be used
to stop it, and now the main Assistant thread is the only one calling
waitForTermination.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs index b61270613..2a11741b4 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -73,6 +73,7 @@ import Assistant.Threads.Merger import Assistant.Threads.SanityChecker import qualified Utility.Daemon import Utility.LogFile +import Utility.ThreadScheduler import Control.Concurrent @@ -99,8 +100,8 @@ startDaemon assistant foreground _ <- forkIO $ mergeThread st _ <- forkIO $ daemonStatusThread st dstatus _ <- forkIO $ sanityCheckerThread st dstatus changechan - -- Does not return. - watchThread st dstatus changechan + _ <- forkIO $ watchThread st dstatus changechan + waitForTermination stopDaemon :: Annex () stopDaemon = liftIO . Utility.Daemon.stopDaemon =<< fromRepo gitAnnexPidFile |