Changeset 485 in code

Timestamp:

Mar 29, 2021, 3:49:50 PM (4 years ago)

Author:

contact

Message:

Introduce deliveredStore

This hides the double-map complexity behind a dedicated type.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -362 +362 @@
         }
 
-        delivered := network.delivered.Value(entity)
-        if delivered == nil {
-                return
-        }
-
-        delivered[dc.clientName] = id
+        network.delivered.StoreID(entity, dc.clientName, id)
 }
 
@@ -998 +993 @@
                 })
                 if firstClient {
-                        dc.sendNetworkBacklog(net)
+                        net.delivered.ForEachTarget(func(target string) {
+                                dc.sendTargetBacklog(net, target)
+                        })
                 }
 
                 // Fast-forward history to last message
-                for targetCM, entry := range net.delivered.innerMap {
-                        delivered := entry.value.(deliveredClientMap)
-                        ch := net.channels.Value(targetCM)
+                net.delivered.ForEachTarget(func(target string) {
+                        ch := net.channels.Value(target)
                         if ch != nil && ch.Detached {
-                                continue
-                        }
-
+                                return
+                        }
+
+                        targetCM := net.casemap(target)
                         lastID, err := dc.user.msgStore.LastMsgID(net, targetCM, time.Now())
                         if err != nil {
                                 dc.logger.Printf("failed to get last message ID: %v", err)
-                                continue
-                        }
-                        delivered[dc.clientName] = lastID
-                }
+                                return
+                        }
+
+                        net.delivered.StoreID(target, dc.clientName, lastID)
+                })
         })
 
@@ -1035 +1033 @@
 }
 
-func (dc *downstreamConn) sendNetworkBacklog(net *network) {
-        for _, entry := range net.delivered.innerMap {
-                target := entry.originalKey
-                dc.sendTargetBacklog(net, target)
-        }
-}
-
 func (dc *downstreamConn) sendTargetBacklog(net *network, target string) {
         if dc.caps["draft/chathistory"] || dc.user.msgStore == nil {
@@ -1049 +1040 @@
                 return
         }
-        delivered := net.delivered.Value(target)
-        if delivered == nil {
-                return
-        }
-        lastDelivered, ok := delivered[dc.clientName]
-        if !ok {
+
+        lastDelivered := net.delivered.LoadID(target, dc.clientName)
+        if lastDelivered == "" {
                 return
         }

trunk/upstream.go

@@ -1741 +1741 @@
         }
 
-        delivered := uc.network.delivered.Value(entity)
         entityCM := uc.network.casemap(entity)
-        if delivered == nil {
+
+        if !uc.network.delivered.HasTarget(entity) {
                 // This is the first message we receive from this target. Save the last
                 // message ID in delivery receipts, so that we can send the new message
@@ -1753 +1753 @@
                 }
 
-                delivered = make(deliveredClientMap)
-                uc.network.delivered.SetValue(entity, delivered)
-
                 for clientName, _ := range uc.user.clients {
-                        delivered[clientName] = lastID
+                        uc.network.delivered.StoreID(entity, clientName, lastID)
                 }
         }

trunk/user.go

@@ -58 +58 @@
 type deliveredClientMap map[string]string // client name -> msg ID
 
+type deliveredStore struct {
+        m deliveredCasemapMap
+}
+
+func newDeliveredStore() deliveredStore {
+        return deliveredStore{deliveredCasemapMap{newCasemapMap(0)}}
+}
+
+func (ds deliveredStore) HasTarget(target string) bool {
+        return ds.m.Value(target) != nil
+}
+
+func (ds deliveredStore) LoadID(target, clientName string) string {
+        clients := ds.m.Value(target)
+        if clients == nil {
+                return ""
+        }
+        return clients[clientName]
+}
+
+func (ds deliveredStore) StoreID(target, clientName, msgID string) {
+        clients := ds.m.Value(target)
+        if clients == nil {
+                clients = make(deliveredClientMap)
+                ds.m.SetValue(target, clients)
+        }
+        clients[clientName] = msgID
+}
+
+func (ds deliveredStore) ForEachTarget(f func(target string)) {
+        for _, entry := range ds.m.innerMap {
+                f(entry.originalKey)
+        }
+}
+
 type network struct {
         Network
@@ -65 +100 @@
         conn      *upstreamConn
         channels  channelCasemapMap
-        delivered deliveredCasemapMap
+        delivered deliveredStore
         lastError error
         casemap   casemapping
@@ -82 +117 @@
                 stopped:   make(chan struct{}),
                 channels:  m,
-                delivered: deliveredCasemapMap{newCasemapMap(0)},
+                delivered: newDeliveredStore(),
                 casemap:   casemapRFC1459,
         }
@@ -254 +289 @@
         net.casemap = newCasemap
         net.channels.SetCasemapping(newCasemap)
-        net.delivered.SetCasemapping(newCasemap)
+        net.delivered.m.SetCasemapping(newCasemap)
         if net.conn != nil {
                 net.conn.channels.SetCasemapping(newCasemap)