Changeset 166 in code

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

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• server.go (modified) (1 diff)
• user.go (modified) (3 diffs)

trunk/downstream.go

@@ -661 +661 @@
         dc.logger.Printf("registration complete for user %q", dc.username)
 
-        firstDownstream := dc.user.addDownstream(dc)
+        dc.user.lock.Lock()
+        firstDownstream := len(dc.user.downstreamConns) == 0
+        dc.user.lock.Unlock()
 
         dc.SendMessage(&irc.Message{

trunk/server.go

@@ -120 +120 @@
                                 dc.logger.Print(err)
                         } else {
+                                dc.user.events <- eventDownstreamConnected{dc}
                                 if err := dc.readMessages(dc.user.events); err != nil {
                                         dc.logger.Print(err)

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()