Changeset 228 in code for trunk

Timestamp:

Apr 6, 2020, 4:13:46 PM (5 years ago)

Author:

contact

Message:

Remove channel from ring buffer consumers

This is unused.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -695 +695 @@
                 }
 
-                consumer, _ := net.ring.NewConsumer(seqPtr)
-
-                if _, ok := dc.ringConsumers[net]; ok {
-                        panic("network has been added twice")
-                }
+                consumer := net.ring.NewConsumer(seqPtr)
                 dc.ringConsumers[net] = consumer
 

trunk/ring.go

@@ -40 +40 @@
         r.buffer[i] = msg
         r.cur++
-
-        for _, consumer := range r.consumers {
-                select {
-                case consumer.ch <- struct{}{}:
-                        // This space is intentionally left blank
-                default:
-                        // The channel already has a pending item
-                }
-        }
 }
 
@@ -57 +48 @@
         if r.closed {
                 panic("soju: Ring.Close called twice")
-        }
-
-        for _, rc := range r.consumers {
-                close(rc.ch)
         }
 
@@ -72 +59 @@
 // from the specified history sequence number (see RingConsumer.Close).
 //
-// The returned channel yields a value each time the consumer has a new message
-// available. Consume should be called to drain the consumer.
-//
 // The consumer can only be used from a single goroutine.
-func (r *Ring) NewConsumer(seq *uint64) (*RingConsumer, <-chan struct{}) {
-        consumer := &RingConsumer{
-                ring: r,
-                ch:   make(chan struct{}, 1),
-        }
+func (r *Ring) NewConsumer(seq *uint64) *RingConsumer {
+        consumer := &RingConsumer{ring: r}
 
         r.lock.Lock()
@@ -88 +69 @@
                 consumer.cur = r.cur
         }
-        if consumer.diff() > 0 {
-                consumer.ch <- struct{}{}
-        }
         r.consumers = append(r.consumers, consumer)
         r.lock.Unlock()
 
-        return consumer, consumer.ch
+        return consumer
 }
 
@@ -101 +79 @@
         ring   *Ring
         cur    uint64
-        ch     chan struct{}
         closed bool
 }
@@ -162 +139 @@
         rc.ring.lock.Unlock()
 
-        close(rc.ch)
         rc.closed = true
         return rc.cur

trunk/user.go

@@ -352 +352 @@
         u.forEachDownstream(func(dc *downstreamConn) {
                 if dc.network == nil {
-                        consumer, _ := network.ring.NewConsumer(nil)
-                        dc.ringConsumers[network] = consumer
+                        dc.ringConsumers[network] = network.ring.NewConsumer(nil)
                 }
         })