libp2p/go-eventbus
1
0
Fork 0
mirror of https://github.com/libp2p/go-eventbus.git synced 2025-01-14 02:10:06 +08:00
Code Issues Projects Releases Wiki Activity

nit: fix with-node

Browse Source 
1. It doesn't return an error and we weren't checking it anyways.
2. Avoid a goroutine unless we need it.
This commit is contained in:
Steven Allen 2019-06-27 20:01:51 +02:00
parent df5be7d7dd
commit 7b280b5c1b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
basic.go
View File

@ -51,7 +51,7 @@ func NewBus() event.Bus {
} }
} }
func (b *basicBus) withNode(typ reflect.Type, cb func(*node), async func(*node)) error { func (b *basicBus) withNode(typ reflect.Type, cb func(*node), async func(*node)) {
b.lk.Lock() b.lk.Lock()
n, ok := b.nodes[typ] n, ok := b.nodes[typ]
@ -65,12 +65,14 @@ func (b *basicBus) withNode(typ reflect.Type, cb func(*node), async func(*node))
cb(n) cb(n)
go func() { if async == nil {
defer n.lk.Unlock() n.lk.Unlock()
async(n) } else {
}() go func() {
defer n.lk.Unlock()
return nil async(n)
}()
}
} }
func (b *basicBus) tryDropNode(typ reflect.Type) { func (b *basicBus) tryDropNode(typ reflect.Type) {
@ -173,7 +175,7 @@ func (b *basicBus) Subscribe(evtTypes interface{}, opts ...event.SubscriptionOpt
for i, etyp := range types { for i, etyp := range types {
typ := reflect.TypeOf(etyp) typ := reflect.TypeOf(etyp)
err = b.withNode(typ.Elem(), func(n *node) { b.withNode(typ.Elem(), func(n *node) {
n.sinks = append(n.sinks, out.ch) n.sinks = append(n.sinks, out.ch)
out.nodes[i] = n out.nodes[i] = n
}, func(n *node) { }, func(n *node) {
@ -215,11 +217,11 @@ func (b *basicBus) Emitter(evtType interface{}, opts ...event.EmitterOpt) (e eve
} }
typ = typ.Elem() typ = typ.Elem()
err = b.withNode(typ, func(n *node) { b.withNode(typ, func(n *node) {
atomic.AddInt32(&n.nEmitters, 1) atomic.AddInt32(&n.nEmitters, 1)
n.keepLast = n.keepLast || settings.makeStateful n.keepLast = n.keepLast || settings.makeStateful
e = &emitter{n: n, typ: typ, dropper: b.tryDropNode} e = &emitter{n: n, typ: typ, dropper: b.tryDropNode}
}, func(_ *node) {}) }, nil)
return return
} }