luciano/htmgo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better code for deleting the listener

Browse source
This commit is contained in:
maddalax 2024-11-12 13:40:31 -06:00
parent 3fda1039a9
commit c593c466a3
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
extensions/websocket/ws/manager.go
View file

@ -55,15 +55,16 @@ type ManagerMetrics struct {
} }
type SocketManager struct { type SocketManager struct {
sockets *xsync.MapOf[string, *xsync.MapOf[string, SocketConnection]] sockets *xsync.MapOf[string, *xsync.MapOf[string, SocketConnection]]
idToRoom *xsync.MapOf[string, string] idToRoom *xsync.MapOf[string, string]
listeners []chan SocketEvent listeners []chan SocketEvent
goroutinesRunning atomic.Int32 listenersQueuedForDelete map[chan SocketEvent]bool
opts *opts.ExtensionOpts goroutinesRunning atomic.Int32
lock sync.Mutex opts *opts.ExtensionOpts
totalMessages atomic.Int64 lock sync.Mutex
messagesPerSecond int totalMessages atomic.Int64
secondsElapsed int messagesPerSecond int
secondsElapsed int
} }
func (manager *SocketManager) StartMetrics() { func (manager *SocketManager) StartMetrics() {
@ -127,10 +128,11 @@ func SocketManagerFromCtx(ctx *h.RequestContext) *SocketManager {
func NewSocketManager(opts *opts.ExtensionOpts) *SocketManager { func NewSocketManager(opts *opts.ExtensionOpts) *SocketManager {
return &SocketManager{ return &SocketManager{
sockets: xsync.NewMapOf[string, *xsync.MapOf[string, SocketConnection]](), sockets: xsync.NewMapOf[string, *xsync.MapOf[string, SocketConnection]](),
idToRoom: xsync.NewMapOf[string, string](), idToRoom: xsync.NewMapOf[string, string](),
opts: opts, listenersQueuedForDelete: make(map[chan SocketEvent]bool),
goroutinesRunning: atomic.Int32{}, opts: opts,
goroutinesRunning: atomic.Int32{},
} }
} }
@ -186,14 +188,7 @@ func (manager *SocketManager) Listen(listener chan SocketEvent) {
} }
func (manager *SocketManager) RemoveListener(listener chan SocketEvent) { func (manager *SocketManager) RemoveListener(listener chan SocketEvent) {
for i, l := range manager.listeners { manager.listenersQueuedForDelete[listener] = true
if l == listener {
slog.Debug("ws-extension: removed listener from manager")
manager.listeners = append(manager.listeners[:i], manager.listeners[i+1:]...)
slog.Debug("ws-extension: total listeners", slog.Int("count", len(manager.listeners)))
return
}
}
} }
func (manager *SocketManager) dispatch(event SocketEvent) { func (manager *SocketManager) dispatch(event SocketEvent) {
@ -208,9 +203,27 @@ func (manager *SocketManager) dispatch(event SocketEvent) {
} }
} }
}() }()
for _, listener := range manager.listeners {
listener <- event if len(manager.listenersQueuedForDelete) > 0 {
newListener := make([]chan SocketEvent, 0)
for _, listener := range manager.listeners {
if _, ok := manager.listenersQueuedForDelete[listener]; !ok {
newListener = append(newListener, listener)
}
}
manager.listeners = newListener
} }
wg := sync.WaitGroup{}
for _, listener := range manager.listeners {
wg.Add(1)
go func() {
defer wg.Done()
listener <- event
}()
}
wg.Wait()
done <- struct{}{} done <- struct{}{}
} }