Changeset 109 in code for trunk

Timestamp:

Mar 16, 2020, 2:08:56 PM (5 years ago)

Author:

contact

Message:

Protect upstreamConn.history with a lock

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• upstream.go (modified) (2 diffs)

trunk/downstream.go

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

trunk/upstream.go

@@ -9 +9 @@
         "strconv"
         "strings"
+        "sync"
         "time"
 
@@ -49 +50 @@
         modes      modeSet
         channels   map[string]*upstreamChannel
-        history    map[string]uint64
         caps       map[string]string
 
         saslClient  sasl.Client
         saslStarted bool
+
+        lock    sync.Mutex
+        history map[string]uint64 // TODO: move to network
 }