TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-04 07:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/eventbus: track additional event context in subscribe queue

Browse Source 
Updates #15160

Signed-off-by: David Anderson <dave@tailscale.com>
This commit is contained in:
David Anderson 2025-03-05 10:42:08 -08:00 committed by Dave Anderson
parent a1192dd686
commit cf5c788cf1
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/eventbus/bus.go
View File

@ -8,6 +8,7 @@ import (
"reflect" "reflect"
"slices" "slices"
"sync" "sync"
"time"
"tailscale.com/util/set" "tailscale.com/util/set"
) )
@ -93,11 +94,18 @@ func (b *Bus) pump(ctx context.Context) {
for !vals.Empty() { for !vals.Empty() {
val := vals.Peek() val := vals.Peek()
dests := b.dest(reflect.ValueOf(val.Event).Type()) dests := b.dest(reflect.ValueOf(val.Event).Type())
routed := time.Now()
for _, d := range dests { for _, d := range dests {
evt := queuedEvent{
Event: val.Event,
From: val.From,
Published: val.Published,
Routed: routed,
}
deliverOne: deliverOne:
for { for {
select { select {
case d.write <- val.Event: case d.write <- evt:
break deliverOne break deliverOne
case <-d.closed(): case <-d.closed():
// Queue closed, don't block but continue // Queue closed, don't block but continue

28
util/eventbus/subscribe.go
View File

@ -8,8 +8,16 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"sync" "sync"
"time"
) )
type queuedEvent struct {
Event any
From *Client
Published time.Time
Routed time.Time
}
// subscriber is a uniformly typed wrapper around Subscriber[T], so // subscriber is a uniformly typed wrapper around Subscriber[T], so
// that debugging facilities can look at active subscribers. // that debugging facilities can look at active subscribers.
type subscriber interface { type subscriber interface {
@ -27,7 +35,7 @@ type subscriber interface {
// processing other potential sources of wakeups, which is how we end // processing other potential sources of wakeups, which is how we end
// up at this awkward type signature and sharing of internal state // up at this awkward type signature and sharing of internal state
// through dispatch. // through dispatch.
dispatch(ctx context.Context, vals *queue[any], acceptCh func() chan any) bool dispatch(ctx context.Context, vals *queue[queuedEvent], acceptCh func() chan queuedEvent) bool
Close() Close()
} }
@ -36,8 +44,8 @@ type subscribeState struct {
client *Client client *Client
dispatcher *worker dispatcher *worker
write chan any write chan queuedEvent
snapshot chan chan []any snapshot chan chan []queuedEvent
outputsMu sync.Mutex outputsMu sync.Mutex
outputs map[reflect.Type]subscriber outputs map[reflect.Type]subscriber
@ -46,8 +54,8 @@ type subscribeState struct {
func newSubscribeState(c *Client) *subscribeState { func newSubscribeState(c *Client) *subscribeState {
ret := &subscribeState{ ret := &subscribeState{
client: c, client: c,
write: make(chan any), write: make(chan queuedEvent),
snapshot: make(chan chan []any), snapshot: make(chan chan []queuedEvent),
outputs: map[reflect.Type]subscriber{}, outputs: map[reflect.Type]subscriber{},
} }
ret.dispatcher = runWorker(ret.pump) ret.dispatcher = runWorker(ret.pump)
@ -55,8 +63,8 @@ func newSubscribeState(c *Client) *subscribeState {
} }
func (q *subscribeState) pump(ctx context.Context) { func (q *subscribeState) pump(ctx context.Context) {
var vals queue[any] var vals queue[queuedEvent]
acceptCh := func() chan any { acceptCh := func() chan queuedEvent {
if vals.Full() { if vals.Full() {
return nil return nil
} }
@ -65,7 +73,7 @@ func (q *subscribeState) pump(ctx context.Context) {
for { for {
if !vals.Empty() { if !vals.Empty() {
val := vals.Peek() val := vals.Peek()
sub := q.subscriberFor(val) sub := q.subscriberFor(val.Event)
if sub == nil { if sub == nil {
// Raced with unsubscribe. // Raced with unsubscribe.
vals.Drop() vals.Drop()
@ -155,8 +163,8 @@ func (s *Subscriber[T]) subscribeType() reflect.Type {
return reflect.TypeFor[T]() return reflect.TypeFor[T]()
} }
func (s *Subscriber[T]) dispatch(ctx context.Context, vals *queue[any], acceptCh func() chan any) bool { func (s *Subscriber[T]) dispatch(ctx context.Context, vals *queue[queuedEvent], acceptCh func() chan queuedEvent) bool {
t := vals.Peek().(T) t := vals.Peek().Event.(T)
for { for {
// Keep the cases in this select in sync with subscribeState.pump // Keep the cases in this select in sync with subscribeState.pump
// above. The only different should be that this select // above. The only different should be that this select