apps/mochi-mqtt
1
0
Fork 0
mirror of https://github.com/mochi-mqtt/server.git synced 2025-12-24 12:58:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid race condition when closing listeners

Browse Source 
"Atomic load" followed by "atomic store" is not itself an atomic
operation. This commit replaces that sequence with CompareAndSwap
instead.
This commit is contained in:
Rob Kennedy
2022-01-25 00:00:43 -06:00
parent 471ca00a64
commit fce495f83e
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/listeners/http_sysinfo.go
View File

@@ -98,9 +98,7 @@ func (l *HTTPStats) Close(closeClients CloseFunc) {
l.Lock()
defer l.Unlock()
if atomic.LoadUint32(&l.end) == 0 {
atomic.StoreUint32(&l.end, 1)
if atomic.CompareAndSwapUint32(&l.end, 0, 1) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
l.listen.Shutdown(ctx)

3
server/listeners/tcp.go
View File

@@ -106,8 +106,7 @@ func (l *TCP) Close(closeClients CloseFunc) {
l.Lock()
defer l.Unlock()
if atomic.LoadUint32(&l.end) == 0 {
atomic.StoreUint32(&l.end, 1)
if atomic.CompareAndSwapUint32(&l.end, 0, 1) {
closeClients(l.id)
}

3
server/listeners/websocket.go
View File

@@ -162,8 +162,7 @@ func (l *Websocket) Close(closeClients CloseFunc) {
l.Lock()
defer l.Unlock()
if atomic.LoadUint32(&l.end) == 0 {
atomic.StoreUint32(&l.end, 1)
if atomic.CompareAndSwapUint32(&l.end, 0, 1) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
l.listen.Shutdown(ctx)