From 22d2e260a6ee7a28e635ac9a60b18cc9cdf8ba7e Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sat, 23 Mar 2024 10:25:20 +0000
Subject: Rename with-fibers-port-timeouts to with-port-timeouts

As it works with or without fibers.
---
 nar-herder/cached-compression.scm |  2 +-
 nar-herder/mirror.scm             |  2 +-
 nar-herder/server.scm             |  2 +-
 nar-herder/storage.scm            |  4 ++--
 nar-herder/utils.scm              | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nar-herder/cached-compression.scm b/nar-herder/cached-compression.scm
index 6148c7e..e4fa52f 100644
--- a/nar-herder/cached-compression.scm
+++ b/nar-herder/cached-compression.scm
@@ -474,7 +474,7 @@
                     (delete-file filename)
                     (raise-exception exn))
                 (lambda ()
-                  (with-fibers-port-timeouts
+                  (with-port-timeouts
                    (lambda ()
                      (call-with-values
                          (lambda ()
diff --git a/nar-herder/mirror.scm b/nar-herder/mirror.scm
index bf5c11e..47ae549 100644
--- a/nar-herder/mirror.scm
+++ b/nar-herder/mirror.scm
@@ -69,7 +69,7 @@
            (lambda ()
              (log-msg 'INFO "querying for recent changes since "
                       latest-recent-change)
-             (with-fibers-port-timeouts
+             (with-port-timeouts
               (lambda ()
                 (let ((port
                        socket
diff --git a/nar-herder/server.scm b/nar-herder/server.scm
index 745cfa5..7d6e834 100644
--- a/nar-herder/server.scm
+++ b/nar-herder/server.scm
@@ -508,7 +508,7 @@
            (string->uri
             (string-append (assq-ref opts 'mirror)
                            "/latest-database-dump"))))
-      (with-fibers-port-timeouts
+      (with-port-timeouts
        (lambda ()
          (call-with-values
              (lambda ()
diff --git a/nar-herder/storage.scm b/nar-herder/storage.scm
index c1db3f5..a40e125 100644
--- a/nar-herder/storage.scm
+++ b/nar-herder/storage.scm
@@ -391,7 +391,7 @@ When VERIFY-CERTIFICATE? is true, verify HTTPS server certificates."
                                   (store-path-hash-part
                                    (assq-ref narinfo 'store-path))
                                   ".narinfo/info"))))
-         (with-fibers-port-timeouts
+         (with-port-timeouts
           (lambda ()
             (call-with-values
                 (lambda ()
@@ -559,7 +559,7 @@ When VERIFY-CERTIFICATE? is true, verify HTTPS server certificates."
 
             (raise-exception exn))
         (lambda ()
-          (with-fibers-port-timeouts
+          (with-port-timeouts
            (lambda ()
              (call-with-values
                  (lambda ()
diff --git a/nar-herder/utils.scm b/nar-herder/utils.scm
index 92584d9..26d10bc 100644
--- a/nar-herder/utils.scm
+++ b/nar-herder/utils.scm
@@ -70,7 +70,7 @@
 
             port-read-timeout-error?
             port-write-timeout-error?
-            with-fibers-port-timeouts))
+            with-port-timeouts))
 
 (define* (retry-on-error f #:key times delay ignore error-hook)
   (let loop ((attempt 1))
@@ -769,10 +769,10 @@ If already in the worker thread, call PROC immediately."
 (define port-write-timeout-error?
   (record-predicate &port-write-timeout))
 
-(define* (with-fibers-port-timeouts thunk
-                                    #:key timeout
-                                    (read-timeout timeout)
-                                    (write-timeout timeout))
+(define* (with-port-timeouts thunk
+                             #:key timeout
+                             (read-timeout timeout)
+                             (write-timeout timeout))
   (define (no-fibers-wait port mode timeout)
     (define poll-timeout-ms 200)
 
-- 
cgit v1.2.3