mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor ref change watching

Browse source 
Added to change notification to P2P protocol.

Switched to a TBChan so that a single long-running thread can be
started, and serve perhaps intermittent requests for change
notifications, without buffering all changes in memory.

The P2P runner currently starts up a new thread each times it waits
for a change, but that should allow later reusing a thread. Although
each connection from a peer will still need a new watcher thread to run.

The dependency on stm-chans is more or less free; some stuff in yesod
uses it, so it was already indirectly pulled in when building with the
webapp.

This commit was sponsored by Francois Marier on Patreon.
This commit is contained in:
Joey Hess 2016-12-09 14:52:38 -04:00
parent 596e1685a6
commit e152c322f8
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
9 changed files with 142 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

3
RemoteDaemon/Transport/Ssh.hs
View file

@ -17,6 +17,7 @@ import Utility.SimpleProtocol
import qualified Git
import Git.Command
import Utility.ThreadScheduler
import Annex.ChangedRefs
import Control.Concurrent.STM
import Control.Concurrent.Async
@ -73,7 +74,7 @@ transportUsingCmd' cmd params (RemoteRepo r _) url transporthandle ichan ochan =
Just SshRemote.READY -> do
send (CONNECTED url)
handlestdout fromh
Just (SshRemote.CHANGED shas) -> do
Just (SshRemote.CHANGED (ChangedRefs shas)) -> do
whenM (checkNewShas transporthandle shas) $
fetch
handlestdout fromh