p2p: use safe atomic operations when changing connFlags (#17325)

2018-08-06 14:46:30 +02:00 · 2018-08-06 14:46:30 +02:00 · eef65b20fc
commit eef65b20fc
parent c4df67461f
1 changed files with 11 additions and 6 deletions
--- a/p2p/server.go
+++ b/p2p/server.go
@ -258,13 +258,18 @@ func (c *conn) is(f connFlag) bool {
 }

 func (c *conn) set(f connFlag, val bool) {
-	flags := connFlag(atomic.LoadInt32((*int32)(&c.flags)))
-	if val {
-		flags |= f
-	} else {
-		flags &= ^f
+	for {
+		oldFlags := connFlag(atomic.LoadInt32((*int32)(&c.flags)))
+		flags := oldFlags
+		if val {
+			flags |= f
+		} else {
+			flags &= ^f
+		}
+		if atomic.CompareAndSwapInt32((*int32)(&c.flags), int32(oldFlags), int32(flags)) {
+			return
+		}
 	}
-	atomic.StoreInt32((*int32)(&c.flags), int32(flags))
 }

 // Peers returns all connected peers.