1 files changed, 6 insertions, 48 deletions

diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm
index 1bb1942..d747962 100644
--- a/guix-build-coordinator/utils.scm
+++ b/guix-build-coordinator/utils.scm
@@ -63,7 +63,7 @@
 
             read-derivation-from-file*
 
-            with-store/non-blocking
+            non-blocking-port
 
             substitute-derivation
             read-derivation-through-substitutes
@@ -83,9 +83,6 @@
             create-work-queue
             create-thread-pool
 
-            with-timeout
-            reset-timeout
-
             throttle
 
             get-load-average
@@ -218,7 +215,7 @@
 (define port-write-timeout-error?
   (record-predicate &port-write-timeout))
 
-(define* (with-port-timeouts thunk #:key (timeout (* 120 1000)))
+(define* (with-port-timeouts thunk #:key (timeout 120))
 
   ;; When the GC runs, it restarts the poll syscall, but the timeout remains
   ;; unchanged! When the timeout is longer than the time between the syscall
@@ -230,8 +227,7 @@
   (define (wait port mode)
     (let ((timeout-internal
            (+ (get-internal-real-time)
-              (* internal-time-units-per-second
-                 (/ timeout 1000)))))
+              (* internal-time-units-per-second timeout))))
       (let loop ((poll-value
                   (port-poll port mode poll-timeout-ms)))
         (if (= poll-value 0)
@@ -396,23 +392,6 @@
       (fcntl port F_SETFL (logior O_NONBLOCK flags)))
     port))
 
-(define (ensure-non-blocking-store-connection store)
-  "Mark the file descriptor that backs STORE, a <store-connection>, as
-O_NONBLOCK."
-  (match (store-connection-socket store)
-    ((? file-port? port)
-     (non-blocking-port port))
-    (_ #f)))
-
-(define-syntax-rule (with-store/non-blocking store exp ...)
-  "Like 'with-store', bind STORE to a connection to the store, but ensure that
-said connection is non-blocking (O_NONBLOCK).  Evaluate EXP... in that
-context."
-  (with-store store
-    (ensure-non-blocking-store-connection store)
-    (let ()
-      exp ...)))
-
 (define* (substitute-derivation store
                                 derivation-name
                                 #:key substitute-urls)
@@ -587,9 +566,9 @@ context."
   (define* (store-item->recutils compression file-size)
     (let ((url (encode-and-join-uri-path
                 `(,@(split-and-decode-uri-path nar-path)
-                  ,@(if compression
-                        (list (symbol->string compression))
-                        '())
+                  ,@(if (eq? compression 'none)
+                        '()
+                        (list (symbol->string compression)))
                   ,(basename store-path)))))
       (format #f "URL: ~a~%Compression: ~a~%~@[FileSize: ~a~%~]"
               url
@@ -1264,27 +1243,6 @@ References: ~a~%"
 
     (values pool-mutex job-available count-threads list-jobs)))
 
-;; copied from (guix scripts substitute)
-(define-syntax-rule (with-timeout duration handler body ...)
-  "Run BODY; when DURATION seconds have expired, call HANDLER, and run BODY
-again."
-  (begin
-    (sigaction SIGALRM
-      (lambda (signum)
-        (sigaction SIGALRM SIG_DFL)
-        handler))
-    (alarm duration)
-    (call-with-values
-        (lambda ()
-          body ...)
-      (lambda result
-        (alarm 0)
-        (sigaction SIGALRM SIG_DFL)
-        (apply values result)))))
-
-(define (reset-timeout duration)
-  (alarm duration))
-
 (define (throttle min-duration thunk)
   (let ((next-min-runtime 0))
     (lambda ()