perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify locking in protocol.Index

Browse Source
This commit is contained in:
Jakob Borg
2014-07-02 21:49:24 +02:00
parent 6ade27641d
commit 381795d6d0
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
protocol/protocol.go
View File

@@ -88,10 +88,10 @@ type rawConnection struct {
xw *xdr.Writer xw *xdr.Writer
wmut sync.Mutex wmut sync.Mutex
indexSent map[string]map[string]uint64
awaiting []chan asyncResult awaiting []chan asyncResult
imut sync.Mutex imut sync.Mutex
idxSent map[string]map[string]uint64
idxMut sync.Mutex // ensures serialization of Index calls idxMut sync.Mutex // ensures serialization of Index calls
nextID chan int nextID chan int
@@ -132,7 +132,7 @@ func NewConnection(nodeID string, reader io.Reader, writer io.Writer, receiver M
wb: wb, wb: wb,
xw: xdr.NewWriter(wb), xw: xdr.NewWriter(wb),
awaiting: make([]chan asyncResult, 0x1000), awaiting: make([]chan asyncResult, 0x1000),
indexSent: make(map[string]map[string]uint64), idxSent: make(map[string]map[string]uint64),
outbox: make(chan []encodable), outbox: make(chan []encodable),
nextID: make(chan int), nextID: make(chan int),
closed: make(chan struct{}), closed: make(chan struct{}),
@@ -156,29 +156,27 @@ func (c *rawConnection) Index(repo string, idx []FileInfo) {
c.idxMut.Lock() c.idxMut.Lock()
defer c.idxMut.Unlock() defer c.idxMut.Unlock()
c.imut.Lock()
var msgType int var msgType int
if c.indexSent[repo] == nil { if c.idxSent[repo] == nil {
// This is the first time we send an index. // This is the first time we send an index.
msgType = messageTypeIndex msgType = messageTypeIndex
c.indexSent[repo] = make(map[string]uint64) c.idxSent[repo] = make(map[string]uint64)
for _, f := range idx { for _, f := range idx {
c.indexSent[repo][f.Name] = f.Version c.idxSent[repo][f.Name] = f.Version
} }
} else { } else {
// We have sent one full index. Only send updates now. // We have sent one full index. Only send updates now.
msgType = messageTypeIndexUpdate msgType = messageTypeIndexUpdate
var diff []FileInfo var diff []FileInfo
for _, f := range idx { for _, f := range idx {
if vs, ok := c.indexSent[repo][f.Name]; !ok || f.Version != vs { if vs, ok := c.idxSent[repo][f.Name]; !ok || f.Version != vs {
diff = append(diff, f) diff = append(diff, f)
c.indexSent[repo][f.Name] = f.Version c.idxSent[repo][f.Name] = f.Version
} }
} }
idx = diff idx = diff
} }
c.imut.Unlock()
if len(idx) > 0 { if len(idx) > 0 {
c.send(header{0, -1, msgType}, IndexMessage{repo, idx}) c.send(header{0, -1, msgType}, IndexMessage{repo, idx})