octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-25 16:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some places should use RLock instead of Lock (ref #169)

Browse Source
This commit is contained in:
Jakob Borg 2014-05-02 17:14:53 +02:00
parent b374ec9355
commit 699ecc7140
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/syncthing/model.go
View File

@ -80,8 +80,8 @@ func NewModel(maxChangeBw int) *Model {
// read/write mode the model will attempt to keep in sync with the cluster by // read/write mode the model will attempt to keep in sync with the cluster by
// pulling needed files from peer nodes. // pulling needed files from peer nodes.
func (m *Model) StartRepoRW(repo string, threads int) { func (m *Model) StartRepoRW(repo string, threads int) {
m.rmut.Lock() m.rmut.RLock()
defer m.rmut.Unlock() defer m.rmut.RUnlock()
if dir, ok := m.repoDirs[repo]; !ok { if dir, ok := m.repoDirs[repo]; !ok {
panic("cannot start without repo") panic("cannot start without repo")
@ -561,7 +561,7 @@ func (m *Model) ScanRepos() {
func (m *Model) ScanRepo(repo string) { func (m *Model) ScanRepo(repo string) {
sup := &suppressor{threshold: int64(cfg.Options.MaxChangeKbps)} sup := &suppressor{threshold: int64(cfg.Options.MaxChangeKbps)}
m.rmut.Lock() m.rmut.RLock()
w := &scanner.Walker{ w := &scanner.Walker{
Dir: m.repoDirs[repo], Dir: m.repoDirs[repo],
IgnoreFile: ".stignore", IgnoreFile: ".stignore",
@ -570,7 +570,7 @@ func (m *Model) ScanRepo(repo string) {
Suppressor: sup, Suppressor: sup,
CurrentFiler: cFiler{m, repo}, CurrentFiler: cFiler{m, repo},
} }
m.rmut.Unlock() m.rmut.RUnlock()
m.setState(repo, RepoScanning) m.setState(repo, RepoScanning)
fs, _ := w.Walk() fs, _ := w.Walk()
m.ReplaceLocal(repo, fs) m.ReplaceLocal(repo, fs)
@ -650,7 +650,7 @@ func (m *Model) clusterConfig(node string) protocol.ClusterConfigMessage {
ClientVersion: Version, ClientVersion: Version,
} }
m.rmut.Lock() m.rmut.RLock()
for _, repo := range m.nodeRepos[node] { for _, repo := range m.nodeRepos[node] {
cr := protocol.Repository{ cr := protocol.Repository{
ID: repo, ID: repo,
@ -664,7 +664,7 @@ func (m *Model) clusterConfig(node string) protocol.ClusterConfigMessage {
} }
cm.Repositories = append(cm.Repositories, cr) cm.Repositories = append(cm.Repositories, cr)
} }
m.rmut.Unlock() m.rmut.RUnlock()
return cm return cm
} }
@ -676,9 +676,9 @@ func (m *Model) setState(repo string, state repoState) {
} }
func (m *Model) State(repo string) string { func (m *Model) State(repo string) string {
m.rmut.Lock() m.rmut.RLock()
state := m.repoState[repo] state := m.repoState[repo]
m.rmut.Unlock() m.rmut.RUnlock()
switch state { switch state {
case RepoIdle: case RepoIdle:
return "idle" return "idle"