branch wip-offload updated: tmp16

[Mathieu Othacehe]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch wip-offload
in repository guix-cuirass.

The following commit(s) were added to refs/heads/wip-offload by this push:
     new 71b118f  tmp16
71b118f is described below

commit 71b118f5a6c6debb519e72b123ae9e068a9baeea
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Thu Dec 17 17:22:07 2020 +0100

    tmp16
---
 src/cuirass/base.scm          | 1 +
 src/cuirass/remote-server.scm | 3 +--
 src/cuirass/remote-worker.scm | 1 +
 src/cuirass/remote.scm        | 8 ++++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index fb62771..114bcbf 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -466,6 +466,7 @@ in the database."
                                              (port-poll port "r")))
                       (current-write-waiter (lambda (port)
                                               (port-poll port "w"))))
+         (remote-build-init!)
          (let ((socket (remote-build-socket)))
            (let loop ()
              (remote-build-poll socket handle-build-event)
diff --git a/src/cuirass/remote-server.scm b/src/cuirass/remote-server.scm
index 4a4e1b1..9f4c700 100644
--- a/src/cuirass/remote-server.scm
+++ b/src/cuirass/remote-server.scm
@@ -451,8 +451,6 @@ frontend to the workers connected through the TCP backend."
     ;; Change frontend socket permissions.
     (chmod (zmq-frontend-socket-name) #o666)
 
-    (zmq-set-buffer-size (* 4096 3))
-
     ;; Do not use the built-in zmq-proxy as we want to edit the envelope of
     ;; frontend messages before forwarding them to the backend.
     (let loop ()
@@ -591,4 +589,5 @@ exiting."
                      (string-append "fetch-worker-" (number->string number))))
                   (iota 4))
 
+        (zmq-init!)
         (zmq-start-proxy backend-port)))))
diff --git a/src/cuirass/remote-worker.scm b/src/cuirass/remote-worker.scm
index 25b6ab3..7601982 100644
--- a/src/cuirass/remote-worker.scm
+++ b/src/cuirass/remote-worker.scm
@@ -235,6 +235,7 @@ and executing them.  The worker can reply on the same 
socket."
             (address (server-address server))
             (port (server-port server))
             (endpoint (zmq-backend-endpoint address port)))
+       (zmq-init!)
        (zmq-connect socket endpoint)
        (ready socket)
        (worker-ping worker server)
diff --git a/src/cuirass/remote.scm b/src/cuirass/remote.scm
index c6edf04..2589ea1 100644
--- a/src/cuirass/remote.scm
+++ b/src/cuirass/remote.scm
@@ -56,6 +56,7 @@
             publish-server
             add-substitute-url
 
+            zmq-init!
             zmq-frontend-socket-name
             zmq-frontend-endpoint
             zmq-poll*
@@ -75,6 +76,7 @@
             zmq-read-message
 
             remote-server-service-type
+            remote-build-init!
             remote-build-socket
             remote-send-workers
             remote-build
@@ -254,6 +256,9 @@ PRIVATE-KEY to sign narinfos."
 (define %zmq-context
   (zmq-create-context))
 
+(define (zmq-init!)
+  (zmq-set-buffer-size (* 4096 3)))
+
 (define (zmq-frontend-socket-name)
   "Return the name of the ZMQ frontend socket."
   (string-append %state-directory "/remote-build-socket"))
@@ -343,6 +348,9 @@ retries a call to PROC."
 (define remote-server-service-type
   "_remote-server._tcp")
 
+(define (remote-build-init!)
+  (zmq-init!))
+
 (define (remote-build-socket)
   "Return a socket used to communicate with the remote build server."
   (let ((socket (zmq-create-socket %zmq-context ZMQ_DEALER))