Changeset 166 in code for trunk/user.go

Timestamp:

Mar 27, 2020, 4:21:05 PM (5 years ago)

Author:

contact

Message:

Add eventDownstreamConnected

In a later commit, we'll be able to move part of downstreamConn.register
into the user goroutine to prevent races.

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

File:

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

trunk/user.go

@@ -18 +18 @@
         msg *irc.Message
         dc  *downstreamConn
+}
+
+type eventDownstreamConnected struct {
+        dc *downstreamConn
 }
 
@@ -161 +165 @@
                                 uc.logger.Printf("failed to handle message %q: %v", msg, err)
                         }
+                case eventDownstreamConnected:
+                        dc := e.dc
+                        u.lock.Lock()
+                        u.downstreamConns = append(u.downstreamConns, dc)
+                        u.lock.Unlock()
                 case eventDownstreamMessage:
                         msg, dc := e.msg, e.dc
@@ -181 +190 @@
 }
 
-func (u *user) addDownstream(dc *downstreamConn) (first bool) {
-        u.lock.Lock()
-        first = len(dc.user.downstreamConns) == 0
-        u.downstreamConns = append(u.downstreamConns, dc)
-        u.lock.Unlock()
-        return first
-}
-
 func (u *user) removeDownstream(dc *downstreamConn) {
         u.lock.Lock()