Changeset 168 in code for trunk/user.go

Timestamp:

Mar 27, 2020, 6:17:58 PM (5 years ago)

Author:

contact

Message:

Nuke user.lock

Split user.register into two functions, one to make sure the user is
authenticated, the other to send our current state. This allows to get
rid of data races by doing the second part in the user goroutine.

Closes: ​https://todo.sr.ht/~emersion/soju/22

File:

• trunk/user.go (modified) (8 diffs)

trunk/user.go

@@ -92 +92 @@
         events chan event
 
-        lock            sync.Mutex
         networks        []*network
         downstreamConns []*downstreamConn
@@ -106 +105 @@
 
 func (u *user) forEachNetwork(f func(*network)) {
-        u.lock.Lock()
         for _, network := range u.networks {
                 f(network)
         }
-        u.lock.Unlock()
 }
 
 func (u *user) forEachUpstream(f func(uc *upstreamConn)) {
-        u.lock.Lock()
         for _, network := range u.networks {
                 uc := network.upstream()
@@ -122 +118 @@
                 f(uc)
         }
-        u.lock.Unlock()
 }
 
 func (u *user) forEachDownstream(f func(dc *downstreamConn)) {
-        u.lock.Lock()
         for _, dc := range u.downstreamConns {
                 f(dc)
         }
-        u.lock.Unlock()
 }
 
@@ -149 +142 @@
         }
 
-        u.lock.Lock()
         for _, record := range networks {
                 network := newNetwork(u, &record)
@@ -156 +148 @@
                 go network.run()
         }
-        u.lock.Unlock()
 
         for e := range u.events {
@@ -171 +162 @@
                 case eventDownstreamConnected:
                         dc := e.dc
-                        u.lock.Lock()
+
+                        if err := dc.welcome(); err != nil {
+                                dc.logger.Printf("failed to handle new registered connection: %v", err)
+                                break
+                        }
+
                         u.downstreamConns = append(u.downstreamConns, dc)
-                        u.lock.Unlock()
                 case eventDownstreamDisconnected:
                         dc := e.dc
-                        u.lock.Lock()
                         for i := range u.downstreamConns {
                                 if u.downstreamConns[i] == dc {
@@ -183 +177 @@
                                 }
                         }
-                        u.lock.Unlock()
                 case eventDownstreamMessage:
                         msg, dc := e.msg, e.dc
@@ -221 +214 @@
         })
 
-        u.lock.Lock()
         u.networks = append(u.networks, network)
-        u.lock.Unlock()
 
         go network.run()