nse/client: Stop reconnecting when a disconnect is requested.

* gnu/gnunet/nse/client.scm
  (<server>)[request-close?/box]: New field.
  (disconnect!): Set new box before signalling the condition.
  (reconnect)[error-handler]{input:regular-end-of-file,input:premature-end-of-file}:
  When the new box holds #t as value, don't reconnect.
  (connect): Adjust callers.
* tests/network-size.scm
  ("close, connected --> all fibers stop, two callbacks called"): New test.

1 files changed, 20 insertions, 5 deletions

diff --git a/gnu/gnunet/nse/client.scm b/gnu/gnunet/nse/client.scm
index 006d533..21af1bb 100644
--- a/gnu/gnunet/nse/client.scm
+++ b/gnu/gnunet/nse/client.scm
@@ -38,7 +38,7 @@
                 begin define quote lambda case values expt = else apply
                 and >=)
           (only (rnrs control)
-                when)
+                when unless)
           (only (rnrs records syntactic)
                 define-record-type)
           (only (ice-9 atomic)
@@ -83,6 +83,10 @@
     (define-record-type (<server> %make-server server?)
       ;; Atomic box of <estimate>
       (fields (immutable estimate/box server-estimate/box)
+              ;; Atomic box of boolean.  Initially #f.  Set this
+              ;; to #t before signalling request-close-condition.
+              (immutable request-close?/box
+                         server-request-close?/box)
               (immutable request-close-condition
                          server-request-close-condition)))
 
@@ -117,10 +121,12 @@ timestamp."
     (define (disconnect! server)
       "Asynchronuously disconnect from the NSE server and stop reconnecting,
 even if not connected.  This is an idempotent operation."
+      (atomic-box-set! (server-request-close?/box server) #t)
       (signal-condition! (server-request-close-condition server)))
 
     ;; See 'connect'.
-    (define* (reconnect estimate/box request-close-condition config #:key
+    (define* (reconnect estimate/box request-close?/box request-close-condition config
+                        #:key
                         updated connected disconnected spawn #:rest rest)
       (define (handle-estimate! estimate-slice)
         (define estimate
@@ -169,7 +175,15 @@ even if not connected.  This is an idempotent operation."
            ;; be confusing.
            (signal-condition! mq-closed)
            (when disconnected (disconnected))
-           (apply reconnect estimate/box request-close-condition config rest))
+           ;; Don't reconnect after 'close-queue!'.  About races: it's not
+           ;; paramount we stop reconnecting immediately, but we should stop
+           ;; eventually after 'request-close?/box' is set and
+           ;; 'request-close-condition' is signalled, and 'request-close-handler'
+           ;; will take care of closing the new queue if it shouldn't have been
+           ;; created.
+           (unless (atomic-box-ref request-close?/box)
+             (apply reconnect estimate/box request-close?/box request-close-condition
+                    config rest)))
           ((connection:interrupted)
            (values))
           (else
@@ -205,8 +219,9 @@ shortly after calling @var{disconnected}.
 
 The procedures @var{updated}, @var{connected} and @var{disconnected} are optional."
       (define estimate/box (make-atomic-box #f))
+      (define request-close?/box (make-atomic-box #f))
       (define request-close-condition (make-condition))
-      (reconnect estimate/box request-close-condition config
+      (reconnect estimate/box request-close?/box request-close-condition config
                  #:updated updated #:connected connected #:disconnected disconnected
                  #:spawn spawn)
-      (%make-server estimate/box request-close-condition))))
+      (%make-server estimate/box request-close?/box request-close-condition))))