Changeset 231 in code for trunk

Timestamp:

Apr 6, 2020, 4:31:48 PM (5 years ago)

Author:

contact

Message:

Remove downstreamConn.ringConsumers

We no longer need long-lived ring buffer consumers now that
upstreamConn.produce dispatches messages to downstream connections.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -67 +67 @@
         network     *network // can be nil
 
-        ringConsumers map[*network]*RingConsumer
         ourMessages map[*irc.Message]struct{}
         caps        map[string]bool
@@ -80 +79 @@
         logger := &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())}
         dc := &downstreamConn{
-                conn:          *newConn(srv, netConn, logger),
-                id:            id,
-                ringConsumers: make(map[*network]*RingConsumer),
-                ourMessages:   make(map[*irc.Message]struct{}),
-                caps:          make(map[string]bool),
+                conn:        *newConn(srv, netConn, logger),
+                id:          id,
+                ourMessages: make(map[*irc.Message]struct{}),
+                caps:        make(map[string]bool),
         }
         dc.hostname = netConn.RemoteAddr().String()
@@ -684 +682 @@
 
                 consumer := net.ring.NewConsumer(seqPtr)
-                dc.ringConsumers[net] = consumer
 
                 // TODO: this means all history is lost when trying to send it while the

trunk/ring.go

@@ -35 +35 @@
         r.buffer[i] = msg
         r.cur++
+}
+
+func (r *Ring) Cur() uint64 {
+        return r.cur
 }
 

trunk/upstream.go

@@ -1368 +1368 @@
 
         uc.forEachDownstream(func(dc *downstreamConn) {
-                dc.sendFromUpstream(dc.ringConsumers[uc.network].Consume(), uc)
+                dc.sendFromUpstream(msg, uc)
         })
 }

trunk/user.go

@@ -304 +304 @@
                         dc := e.dc
 
-                        for net, rc := range dc.ringConsumers {
-                                seq := rc.Close()
+                        dc.forEachNetwork(func(net *network) {
+                                seq := net.ring.Cur()
                                 net.history[dc.clientName] = seq
-                        }
+                        })
 
                         for i := range u.downstreamConns {
@@ -350 +350 @@
         }
 
-        u.forEachDownstream(func(dc *downstreamConn) {
-                if dc.network == nil {
-                        dc.ringConsumers[network] = network.ring.NewConsumer(nil)
-                }
-        })
-
         u.networks = append(u.networks, network)
 
@@ -376 +370 @@
                                 dc.Close()
                         }
-                        delete(dc.ringConsumers, net)
                 })