Changeset 167 in code for trunk

Timestamp:

Mar 27, 2020, 4:55:03 PM (5 years ago)

Author:

contact

Message:

Add eventDownstreamDisconnected

This should remove the need for protecting user.downstreamConns with a
mutex.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -309 +309 @@
         if dc.isClosed() {
                 return fmt.Errorf("downstream connection already closed")
-        }
-
-        if u := dc.user; u != nil {
-                u.removeDownstream(dc)
         }
 
@@ -758 +754 @@
                 seq := consumer.Close()
 
-                // TODO: need to take dc.network into account here
-                dc.user.lock.Lock()
-                lastDownstream := len(dc.user.downstreamConns) == 0
-                dc.user.lock.Unlock()
-
-                if lastDownstream {
-                        net.lock.Lock()
-                        net.history[historyName] = seq
-                        net.lock.Unlock()
-                }
+                net.lock.Lock()
+                net.history[historyName] = seq
+                net.lock.Unlock()
         }()
 }

trunk/server.go

@@ -124 +124 @@
                                         dc.logger.Print(err)
                                 }
+                                dc.user.events <- eventDownstreamDisconnected{dc}
                         }
                         dc.Close()

trunk/user.go

@@ -21 +21 @@
 
 type eventDownstreamConnected struct {
+        dc *downstreamConn
+}
+
+type eventDownstreamDisconnected struct {
         dc *downstreamConn
 }
@@ -170 +174 @@
                         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 {
+                                        u.downstreamConns = append(u.downstreamConns[:i], u.downstreamConns[i+1:]...)
+                                        break
+                                }
+                        }
+                        u.lock.Unlock()
                 case eventDownstreamMessage:
                         msg, dc := e.msg, e.dc
@@ -190 +204 @@
 }
 
-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) {
         if net.ID != 0 {