deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2026-03-14 14:35:44 +01:00
Code Issues Releases Wiki Activity

Use "sync.Cond" instead of SingleNotifier.

Browse source
This commit is contained in:
Joachim Bauch 2026-03-10 08:36:50 +01:00
commit f195492f8e
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
sfu/proxy/proxy.go
View file

@ -390,7 +390,8 @@ type proxyConnection struct {
// +checklocks:mu // +checklocks:mu
conn *websocket.Conn conn *websocket.Conn
helloProcessed atomic.Bool // +checklocks:mu
helloProcessed bool
connectedSince atomic.Int64 connectedSince atomic.Int64
reconnectTimer *time.Timer reconnectTimer *time.Timer
reconnectInterval atomic.Int64 reconnectInterval atomic.Int64
@ -399,7 +400,7 @@ type proxyConnection struct {
trackClose atomic.Bool trackClose atomic.Bool
temporary atomic.Bool temporary atomic.Bool
connectedNotifier async.SingleNotifier connectedCond sync.Cond
msgId atomic.Int64 msgId atomic.Int64
helloMsgId string helloMsgId string
@ -444,6 +445,7 @@ func newProxyConnection(proxy *proxySFU, baseUrl string, ip net.IP, token string
publisherIds: make(map[sfu.StreamId]api.PublicSessionId), publisherIds: make(map[sfu.StreamId]api.PublicSessionId),
subscribers: make(map[string]*proxySubscriber), subscribers: make(map[string]*proxySubscriber),
} }
conn.connectedCond.L = &conn.mu
conn.reconnectInterval.Store(int64(initialReconnectInterval)) conn.reconnectInterval.Store(int64(initialReconnectInterval))
conn.load.Store(loadNotConnected) conn.load.Store(loadNotConnected)
conn.bandwidth.Store(nil) conn.bandwidth.Store(nil)
@ -588,7 +590,7 @@ func (c *proxyConnection) SessionId() api.PublicSessionId {
func (c *proxyConnection) IsConnected() bool { func (c *proxyConnection) IsConnected() bool {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
return c.conn != nil && c.helloProcessed.Load() && c.SessionId() != "" return c.conn != nil && c.helloProcessed && c.SessionId() != ""
} }
func (c *proxyConnection) IsTemporary() bool { func (c *proxyConnection) IsTemporary() bool {
@ -746,12 +748,10 @@ func (c *proxyConnection) stop(ctx context.Context) {
} }
func (c *proxyConnection) close() { func (c *proxyConnection) close() {
c.helloProcessed.Store(false)
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
c.connectedNotifier.Reset() c.helloProcessed = false
if c.conn != nil { if c.conn != nil {
c.conn.Close() c.conn.Close()
@ -857,10 +857,10 @@ func (c *proxyConnection) reconnect() {
c.logger.Printf("Connected to %s", c) c.logger.Printf("Connected to %s", c)
c.closed.Store(false) c.closed.Store(false)
c.helloProcessed.Store(false)
c.connectedSince.Store(time.Now().UnixMicro()) c.connectedSince.Store(time.Now().UnixMicro())
c.mu.Lock() c.mu.Lock()
c.helloProcessed = false
c.conn = conn c.conn = conn
c.mu.Unlock() c.mu.Unlock()
@ -887,12 +887,20 @@ func (c *proxyConnection) waitUntilConnected(ctx context.Context) error {
return nil return nil
} }
waiter := c.connectedNotifier.NewWaiter() stop := context.AfterFunc(ctx, func() {
defer c.connectedNotifier.Release(waiter) c.connectedCond.Broadcast()
})
defer stop()
c.mu.Unlock() for !c.helloProcessed {
defer c.mu.Lock() if err := ctx.Err(); err != nil {
return waiter.Wait(ctx) return err
}
c.connectedCond.Wait()
}
return nil
} }
func (c *proxyConnection) removePublisher(publisher *proxyPublisher) { func (c *proxyConnection) removePublisher(publisher *proxyPublisher) {
@ -1057,8 +1065,10 @@ func (c *proxyConnection) processMessage(msg *proxy.ServerMessage) {
statsConnectedProxyBackendsCurrent.WithLabelValues(string(c.Country())).Inc() statsConnectedProxyBackendsCurrent.WithLabelValues(string(c.Country())).Inc()
} }
c.helloProcessed.Store(true) c.mu.Lock()
c.connectedNotifier.Notify() c.helloProcessed = true
c.connectedCond.Broadcast()
c.mu.Unlock()
default: default:
c.logger.Printf("Received unsupported hello response %+v from %s, reconnecting", msg, c) c.logger.Printf("Received unsupported hello response %+v from %s, reconnecting", msg, c)
c.scheduleReconnect() c.scheduleReconnect()