github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

pkg/watch: fix potential deadlock

Browse Source
This commit is contained in:
Andrew M Bursavich 2014-09-15 12:07:32 -07:00
parent 24b5b7e8d3
commit 435e0b73bb
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/watch/mux.go
View File

@ -57,6 +57,7 @@ func (m *Mux) Watch() Interface {
m.nextWatcher++ m.nextWatcher++
w := &muxWatcher{ w := &muxWatcher{
result: make(chan Event), result: make(chan Event),
stopped: make(chan struct{}),
id: id, id: id,
m: m, m: m,
} }
@ -119,13 +120,18 @@ func (m *Mux) distribute(event Event) {
m.lock.Lock() m.lock.Lock()
defer m.lock.Unlock() defer m.lock.Unlock()
for _, w := range m.watchers { for _, w := range m.watchers {
w.result <- event select {
case w.result <- event:
case <-w.stopped:
}
} }
} }
// muxWatcher handles a single watcher of a mux // muxWatcher handles a single watcher of a mux
type muxWatcher struct { type muxWatcher struct {
result chan Event result chan Event
stopped chan struct{}
stop sync.Once
id int64 id int64
m *Mux m *Mux
} }
@ -137,5 +143,8 @@ func (mw *muxWatcher) ResultChan() <-chan Event {
// Stop stops watching and removes mw from its list. // Stop stops watching and removes mw from its list.
func (mw *muxWatcher) Stop() { func (mw *muxWatcher) Stop() {
mw.stop.Do(func() {
close(mw.stopped)
mw.m.stopWatching(mw.id) mw.m.stopWatching(mw.id)
})
} }