Changeset 131 in code for trunk

Timestamp:

Mar 20, 2020, 9:48:17 PM (5 years ago)

Author:

contact

Message:

Move upstreamConn.history to network

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• upstream.go (modified) (3 diffs)
• user.go (modified) (5 diffs)

trunk/downstream.go

@@ -709 +709 @@
                 var seqPtr *uint64
                 if firstDownstream {
-                        uc.lock.Lock()
-                        seq, ok := uc.history[historyName]
-                        uc.lock.Unlock()
+                        uc.network.lock.Lock()
+                        seq, ok := uc.network.history[historyName]
+                        uc.network.lock.Unlock()
                         if ok {
                                 seqPtr = &seq
@@ -739 +739 @@
 
                         if lastDownstream {
-                                uc.lock.Lock()
-                                uc.history[historyName] = seq
-                                uc.lock.Unlock()
+                                uc.network.lock.Lock()
+                                uc.network.history[historyName] = seq
+                                uc.network.lock.Unlock()
                         }
                 }()

trunk/upstream.go

@@ -9 +9 @@
         "strconv"
         "strings"
-        "sync"
         "time"
 
@@ -54 +53 @@
         saslClient  sasl.Client
         saslStarted bool
-
-        lock    sync.Mutex
-        history map[string]uint64 // TODO: move to network
 }
 
@@ -86 +82 @@
                 ring:     NewRing(network.user.srv.RingCap),
                 channels: make(map[string]*upstreamChannel),
-                history:  make(map[string]uint64),
                 caps:     make(map[string]string),
         }

trunk/user.go

@@ -21 +21 @@
         Network
         user *user
-        conn *upstreamConn
+
+        lock    sync.Mutex
+        conn    *upstreamConn
+        history map[string]uint64
 }
 
@@ -28 +31 @@
                 Network: *record,
                 user:    user,
+                history: make(map[string]uint64),
         }
 }
@@ -49 +53 @@
                 uc.register()
 
-                net.user.lock.Lock()
+                net.lock.Lock()
                 net.conn = uc
-                net.user.lock.Unlock()
+                net.lock.Unlock()
 
                 if err := uc.readMessages(net.user.upstreamIncoming); err != nil {
@@ -58 +62 @@
                 uc.Close()
 
-                net.user.lock.Lock()
+                net.lock.Lock()
                 net.conn = nil
-                net.user.lock.Unlock()
+                net.lock.Unlock()
         }
 }
@@ -96 +100 @@
         u.lock.Lock()
         for _, network := range u.networks {
+                network.lock.Lock()
                 uc := network.conn
+                network.lock.Unlock()
+
                 if uc == nil || !uc.registered || uc.closed {
                         continue