From d3a6f04abfd6cc1eb51b9311382fe143579fbed2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Jun 2012 15:41:26 -0400 Subject: [PATCH] update --- Command/Watch.hs | 15 ++++++++------- git-annex.cabal | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Command/Watch.hs b/Command/Watch.hs index 5c354cace9..e049591e9c 100644 --- a/Command/Watch.hs +++ b/Command/Watch.hs @@ -2,12 +2,17 @@ {-# LANGUAGE BangPatterns #-} {- git-annex watch daemon + - + - Copyright 2012 Joey Hess + - + - Licensed under the GNU GPL version 3 or higher. - - Overview of threads and MVars, etc: - - - Thread 1: Parent + - Thread 1: parent - The initial thread run, double forks to background, starts other - - threads, and then stops, waiting for them to terminate. + - threads, and then stops, waiting for them to terminate, + - or for a ctrl-c. - Thread 2: inotify - Notices new files, and calls handlers for events, queuing changes. - Thread 3: inotify internal @@ -18,17 +23,13 @@ - index, then commits. - - State MVar: - - The Annex state is stored here, which allows recuscitating the + - The Annex state is stored here, which allows resuscitating the - Annex monad in IO actions run by the inotify and committer - threads. Thus, a single state is shared amoung the threads, and - only one at a time can access it. - ChangeChan STM TChan: - Changes are indicated by writing to this channel. The committer - reads from it. - - - - Copyright 2012 Joey Hess - - - - Licensed under the GNU GPL version 3 or higher. -} module Command.Watch where diff --git a/git-annex.cabal b/git-annex.cabal index 3459eaae03..5f94392f53 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120611 +Version: 3.20120612 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess