Changeset 203 in code for trunk

Timestamp:

Apr 1, 2020, 1:48:56 PM (5 years ago)

Author:

contact

Message:

Stop ring consumers when deleting network

Location:

trunk

Files:

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

trunk/downstream.go

@@ -740 +740 @@
                         var closed bool
                         select {
-                        case <-ch:
+                        case _, ok := <-ch:
+                                if !ok {
+                                        closed = true
+                                        break
+                                }
+
                                 uc := net.upstream()
                                 if uc == nil {

trunk/ring.go

@@ -17 +17 @@
         cur       uint64
         consumers []*RingConsumer
+        closed    bool
 }
 
@@ -32 +33 @@
         defer r.lock.Unlock()
 
+        if r.closed {
+                panic("soju: Ring.Produce called after Close")
+        }
+
         i := int(r.cur % r.cap)
         r.buffer[i] = msg
@@ -44 +49 @@
                 }
         }
+}
+
+func (r *Ring) Close() {
+        r.lock.Lock()
+        defer r.lock.Unlock()
+
+        if r.closed {
+                panic("soju: Ring.Close called twice")
+        }
+
+        for _, rc := range r.consumers {
+                close(rc.ch)
+        }
+
+        r.closed = true
 }
 

trunk/user.go

@@ -306 +306 @@
 
                 net.Stop()
+                net.ring.Close()
                 u.networks = append(u.networks[:i], u.networks[i+1:]...)
                 return nil