Changeset 406 in code for trunk

Timestamp:

Aug 20, 2020, 3:38:57 PM (5 years ago)

Author:

contact

Message:

Replace networkHistory.offlineClients with clients

Keep the ring buffer alive even if all clients are connected. Keep the
ID of the latest delivered message even for online clients.

As-is, this is a net downgrade: memory usage increases because ring
buffers aren't free'd anymore. However upcoming commits will replace the
ring buffer with log files. This change makes reading from log files
easier.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -865 +865 @@
                 }
 
-                seq, ok := history.offlineClients[dc.clientName]
+                seq, ok := history.clients[dc.clientName]
                 if !ok {
                         continue
                 }
-                delete(history.offlineClients, dc.clientName)
-
-                // If all clients have received history, no need to keep the
-                // ring buffer around
-                if len(history.offlineClients) == 0 {
-                        delete(net.history, target)
-                }
+                history.clients[dc.clientName] = history.ring.Cur()
 
                 consumer := history.ring.NewConsumer(seq)

trunk/upstream.go

@@ -1636 +1636 @@
         }
 
-        // If no client is offline, no need to append the message to the buffer
-        if len(uc.network.offlineClients) == 0 && !detached {
-                return
-        }
-
         history, ok := uc.network.history[entity]
         if !ok {
                 history = &networkHistory{
-                        offlineClients: make(map[string]uint64),
-                        ring:           NewRing(uc.srv.RingCap),
+                        clients: make(map[string]uint64),
+                        ring:    NewRing(uc.srv.RingCap),
                 }
                 uc.network.history[entity] = history
 
                 for clientName, _ := range uc.network.offlineClients {
-                        history.offlineClients[clientName] = 0
+                        history.clients[clientName] = 0
                 }
 
@@ -1657 +1652 @@
                         // clients too
                         uc.forEachDownstream(func(dc *downstreamConn) {
-                                history.offlineClients[dc.clientName] = 0
+                                history.clients[dc.clientName] = 0
                         })
                 }
@@ -1663 +1658 @@
 
         history.ring.Produce(msg)
+
+        if !detached {
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        history.clients[dc.clientName] = history.ring.Cur()
+                })
+        }
 }
 

trunk/user.go

@@ -52 +52 @@
 
 type networkHistory struct {
-        offlineClients map[string]uint64 // indexed by client name
-        ring           *Ring             // can be nil if there are no offline clients
+        clients map[string]uint64 // indexed by client name
+        ring    *Ring             // can be nil if there are no offline clients
 }
 
@@ -194 +194 @@
                         net.forEachDownstream(func(dc *downstreamConn) {
                                 net.offlineClients[dc.clientName] = struct{}{}
-                                if history != nil {
-                                        history.offlineClients[dc.clientName] = history.ring.Cur()
-                                }
 
                                 dc.SendMessage(&irc.Message{
@@ -424 +421 @@
 
                                 net.offlineClients[dc.clientName] = struct{}{}
-                                for target, history := range net.history {
-                                        if ch, ok := net.channels[target]; ok && ch.Detached {
-                                                continue
-                                        }
-                                        history.offlineClients[dc.clientName] = history.ring.Cur()
-                                }
                         })