roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

event: make Unsubscribe idempotent

Browse Source
This commit is contained in:
Felix Lange 2014-10-16 18:08:48 +02:00
parent dac4a8f113
commit 10bbf265b2
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
event/event.go
View File

@ -124,14 +124,16 @@ func posdelete(slice []*muxsub, pos int) []*muxsub {
type muxsub struct { type muxsub struct {
mux *TypeMux mux *TypeMux
mutex sync.RWMutex closeMu sync.Mutex
closing chan struct{} closing chan struct{}
closed bool
// these two are the same channel. they are stored separately so // these two are the same channel. they are stored separately so
// postC can be set to nil without affecting the return value of // postC can be set to nil without affecting the return value of
// Chan. // Chan.
readC <-chan interface{} postMu sync.RWMutex
postC chan<- interface{} readC <-chan interface{}
postC chan<- interface{}
} }
func newsub(mux *TypeMux) *muxsub { func newsub(mux *TypeMux) *muxsub {
@ -154,18 +156,25 @@ func (s *muxsub) Unsubscribe() {
} }
func (s *muxsub) closewait() { func (s *muxsub) closewait() {
s.closeMu.Lock()
defer s.closeMu.Unlock()
if s.closed {
return
}
close(s.closing) close(s.closing)
s.mutex.Lock() s.closed = true
s.postMu.Lock()
close(s.postC) close(s.postC)
s.postC = nil s.postC = nil
s.mutex.Unlock() s.postMu.Unlock()
} }
func (s *muxsub) deliver(ev interface{}) { func (s *muxsub) deliver(ev interface{}) {
s.mutex.RLock() s.postMu.RLock()
select { select {
case s.postC <- ev: case s.postC <- ev:
case <-s.closing: case <-s.closing:
} }
s.mutex.RUnlock() s.postMu.RUnlock()
} }