[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-offload updated: tmp23
From: |
Mathieu Othacehe |
Subject: |
branch wip-offload updated: tmp23 |
Date: |
Fri, 18 Dec 2020 04:55:13 -0500 |
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 1b94791 tmp23
1b94791 is described below
commit 1b9479121a8ee44c20b6c1a8746fc0b3af53c3f0
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Fri Dec 18 10:55:05 2020 +0100
tmp23
---
src/cuirass/remote-server.scm | 5 +----
src/cuirass/remote.scm | 12 +++---------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/cuirass/remote-server.scm b/src/cuirass/remote-server.scm
index 45170a7..79c7417 100644
--- a/src/cuirass/remote-server.scm
+++ b/src/cuirass/remote-server.scm
@@ -474,13 +474,10 @@ frontend to the workers connected through the TCP
backend."
(poll-item build-socket ZMQ_POLLIN)
(poll-item fetch-socket ZMQ_POLLIN))))
- (zmq-bind-socket client-socket (zmq-frontend-endpoint))
+ (zmq-bind-socket client-socket zmq-frontend-endpoint)
(zmq-bind-socket build-socket (zmq-backend-endpoint backend-port))
(zmq-bind-socket fetch-socket (zmq-fetch-workers-endpoint))
- ;; Change frontend socket permissions.
- (chmod (zmq-frontend-socket-name) #o666)
-
;; 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 ()
diff --git a/src/cuirass/remote.scm b/src/cuirass/remote.scm
index 95137e7..616d498 100644
--- a/src/cuirass/remote.scm
+++ b/src/cuirass/remote.scm
@@ -57,7 +57,6 @@
add-substitute-url
zmq-init!
- zmq-frontend-socket-name
zmq-frontend-endpoint
zmq-poll*
zmq-socket-ready?
@@ -259,13 +258,8 @@ PRIVATE-KEY to sign narinfos."
(define (zmq-init!)
(zmq-set-buffer-size (* 4096 16)))
-(define (zmq-frontend-socket-name)
- "Return the name of the ZMQ frontend socket."
- (string-append %state-directory "/remote-build-socket"))
-
-(define (zmq-frontend-endpoint)
- "Return a ZMQ endpoint allowing client connections using the IPC transport."
- (string-append "ipc://" (zmq-frontend-socket-name)))
+(define zmq-frontend-endpoint
+ "ipc://@remote-build-socket")
(define (EINTR-safe proc)
"Return a variant of PROC that catches EINTR 'zmq-error' exceptions and
@@ -354,7 +348,7 @@ retries a call to PROC."
(define (remote-build-socket)
"Return a socket used to communicate with the remote build server."
(let ((socket (zmq-create-socket %zmq-context ZMQ_DEALER))
- (endpoint (zmq-frontend-endpoint)))
+ (endpoint zmq-frontend-endpoint))
(zmq-connect socket endpoint)
socket))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-offload updated: tmp23,
Mathieu Othacehe <=