summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-05 14:34:20 -0600
committerGravatar Joey Hess <joey@kitenet.net>2012-07-05 14:34:20 -0600
commit71b5ad8398c4d86d5e9b993e175b48f2c5f0861d (patch)
tree46bd1db5caa16256b948146ecd2d61057bed44fb /Assistant.hs
parente8df726d07657c82c012a02697282c2bc642e742 (diff)
wrote transfer thread
finally!
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs8
1 files changed, 6 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 82ac2037e..e751b4ae8 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -39,9 +39,11 @@
- and maintains the DaemonStatus currentTransfers map. This uses
- inotify on .git/annex/transfer/, so there are additional inotify
- threads associated with it, too.
- - Thread 10: status logger
+ - Thread 10: transferrer
+ - Waits for Transfers to be queued and does them.
+ - Thread 11: status logger
- Wakes up periodically and records the daemon's status to disk.
- - Thread 11: sanity checker
+ - Thread 12: sanity checker
- Wakes up periodically (rarely) and does sanity checks.
-
- ThreadState: (MVar)
@@ -80,6 +82,7 @@ import Assistant.Threads.Committer
import Assistant.Threads.Pusher
import Assistant.Threads.Merger
import Assistant.Threads.TransferWatcher
+import Assistant.Threads.Transferrer
import Assistant.Threads.SanityChecker
import qualified Utility.Daemon
import Utility.LogFile
@@ -114,6 +117,7 @@ startDaemon assistant foreground
, transferWatcherThread st dstatus
, daemonStatusThread st dstatus
, sanityCheckerThread st dstatus transferqueue changechan
+ , transfererThread st dstatus transferqueue
, watchThread st dstatus transferqueue changechan
]
waitForTermination