Changeset 137 in code for trunk

Timestamp:

Mar 23, 2020, 3:05:00 PM (5 years ago)

Author:

contact

Message:

Add user.{add,remove}Downstream

Location:

trunk

Files:

• downstream.go (modified) (5 diffs)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -305 +305 @@
 
         if u := dc.user; u != nil {
-                u.lock.Lock()
-                for i := range u.downstreamConns {
-                        if u.downstreamConns[i] == dc {
-                                u.downstreamConns = append(u.downstreamConns[:i], u.downstreamConns[i+1:]...)
-                                break
-                        }
-                }
-                u.lock.Unlock()
+                u.removeDownstream(dc)
         }
 
@@ -661 +654 @@
         dc.logger.Printf("registration complete for user %q", dc.username)
 
-        dc.user.lock.Lock()
-        firstDownstream := len(dc.user.downstreamConns) == 0
-        dc.user.downstreamConns = append(dc.user.downstreamConns, dc)
-        dc.user.lock.Unlock()
+        firstDownstream := dc.user.addDownstream(dc)
 
         dc.SendMessage(&irc.Message{
@@ -708 +698 @@
                 historyName := dc.rawUsername
 
+                // TODO: need to take dc.network into account here
                 var seqPtr *uint64
                 if firstDownstream {
@@ -718 +709 @@
                 }
 
+                // TODO: we need to create a consumer when adding networks on-the-fly
                 consumer, ch := uc.ring.NewConsumer(seqPtr)
                 go func() {
@@ -735 +727 @@
                         seq := consumer.Close()
 
+                        // TODO: need to take dc.network into account here
                         dc.user.lock.Lock()
                         lastDownstream := len(dc.user.downstreamConns) == 0

trunk/user.go

@@ -177 +177 @@
 }
 
+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()
+        for i := range u.downstreamConns {
+                if u.downstreamConns[i] == dc {
+                        u.downstreamConns = append(u.downstreamConns[:i], u.downstreamConns[i+1:]...)
+                        break
+                }
+        }
+        u.lock.Unlock()
+}
+
 func (u *user) createNetwork(net *Network) (*network, error) {
         network := newNetwork(u, net)