unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Christopher Baines <mail@cbaines.net>
To: 70494@debbugs.gnu.org
Cc: "Christopher Baines" <guix@cbaines.net>,
	"Josselin Poiret" <dev@jpoiret.xyz>,
	"Ludovic Courtès" <ludo@gnu.org>,
	"Mathieu Othacehe" <othacehe@gnu.org>,
	"Ricardo Wurmus" <rekado@elephly.net>,
	"Simon Tournier" <zimon.toutoune@gmail.com>,
	"Tobias Geerinckx-Rice" <me@tobias.gr>
Subject: [bug#70494] [PATCH 06/23] store: Export protocol related constants.
Date: Sun, 21 Apr 2024 10:42:24 +0100	[thread overview]
Message-ID: <b444b76b857ac9f50bc3fe038fc2a583981de6a0.1713692561.git.mail@cbaines.net> (raw)
In-Reply-To: <87bk632h36.fsf@cbaines.net>

* guix/store.scm (%protocol-version, %worker-magic-1, %worker-magic-2): Export
variables.
(protocol-major, protocol-minor, protocol-version): Export procedures.
(%stderr-next, %stderr-read, %stderr-write, %stderr-last, %stderr-error):
Move from process-stderr and export variables.

Change-Id: Id0b1b5e6feeac5260875558f33aa5d923d5e0903
---
 guix/store.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/guix/store.scm b/guix/store.scm
index c3b58090e5..578e46507e 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -206,18 +206,25 @@ (define-module (guix store)
             derivation-log-file
             log-file))
 
-(define %protocol-version #x164)
+(define-public %protocol-version #x164)
 
-(define %worker-magic-1 #x6e697863)               ; "nixc"
-(define %worker-magic-2 #x6478696f)               ; "dxio"
+(define-public %worker-magic-1 #x6e697863)               ; "nixc"
+(define-public %worker-magic-2 #x6478696f)               ; "dxio"
 
-(define (protocol-major magic)
+(define-public (protocol-major magic)
   (logand magic #xff00))
-(define (protocol-minor magic)
+(define-public (protocol-minor magic)
   (logand magic #x00ff))
-(define (protocol-version major minor)
+(define-public (protocol-version major minor)
   (logior major minor))
 
+;; magic cookies from worker-protocol.hh
+(define-public %stderr-next  #x6f6c6d67)          ; "olmg", build log
+(define-public %stderr-read  #x64617461)          ; "data", data needed from source
+(define-public %stderr-write #x64617416)          ; "dat\x16", data for sink
+(define-public %stderr-last  #x616c7473)          ; "alts", we're done
+(define-public %stderr-error #x63787470)          ; "cxtp", error reporting
+
 (define-syntax define-enumerate-type
   (syntax-rules ()
     ((_ name->int (name id) ...)
@@ -709,13 +716,6 @@ (define* (process-stderr server #:optional user-port)
   (define p
     (store-connection-socket server))
 
-  ;; magic cookies from worker-protocol.hh
-  (define %stderr-next  #x6f6c6d67)          ; "olmg", build log
-  (define %stderr-read  #x64617461)          ; "data", data needed from source
-  (define %stderr-write #x64617416)          ; "dat\x16", data for sink
-  (define %stderr-last  #x616c7473)          ; "alts", we're done
-  (define %stderr-error #x63787470)          ; "cxtp", error reporting
-
   (let ((k (read-int p)))
     (cond ((= k %stderr-write)
            ;; Write a byte stream to USER-PORT.
-- 
2.41.0





  parent reply	other threads:[~2024-04-21  9:45 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-21  9:35 [bug#70494] [PATCH 00/23] Groundwork for the Guile guix-daemon Christopher Baines
2024-04-21  9:42 ` [bug#70494] [PATCH 01/23] store: database: Register derivation outputs Christopher Baines
2024-05-07 14:30   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 02/23] gnu: linux-container: Make it more suitable for derivation-building Christopher Baines
2024-05-07 14:28   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 03/23] syscalls: Add missing pieces for derivation build environment Christopher Baines
2024-05-07 14:27   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 04/23] guix: store: environment: New module Christopher Baines
2024-05-13 15:10   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 05/23] store: build-derivations: " Christopher Baines
2024-05-13 15:22   ` Ludovic Courtès
2024-04-21  9:42 ` Christopher Baines [this message]
2024-05-13 15:58   ` [bug#70494] [PATCH 06/23] store: Export protocol related constants Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 07/23] serialization: Export read-byte-string Christopher Baines
2024-05-13 15:58   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 08/23] store: Add text-output-path and text-output-path-from-hash Christopher Baines
2024-05-13 15:59   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 09/23] store: Add validate-store-name Christopher Baines
2024-05-13 16:04   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 10/23] store: database: Add procedures for querying valid paths Christopher Baines
2024-05-16 16:04   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 11/23] scripts: substitute: Untangle selecting fast vs small compressions Christopher Baines
2024-05-16 16:08   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 12/23] scripts: substitute: Extract script specific output from download-nar Christopher Baines
2024-05-16 16:13   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 13/23] syscalls: Add unshare Christopher Baines
2024-05-16 16:14   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 14/23] scripts: perform-download: Support configuring the %store-prefix Christopher Baines
2024-05-16 16:17   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 15/23] store: Export operation-id Christopher Baines
2024-05-16 16:18   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 16/23] store: database: Log when aborting transactions Christopher Baines
2024-05-16 16:20   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 17/23] store: database: Export transaction helpers Christopher Baines
2024-05-16 16:21   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 18/23] guix: http-client: Add network-error? Christopher Baines
2024-05-16 16:23   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 19/23] http-client: Include EPIPE in network-error? Christopher Baines
2024-05-16 16:23   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 20/23] scripts: substitute: Simplify with-timeout usage Christopher Baines
2024-05-16 16:27   ` Ludovic Courtès
2024-04-21  9:42 ` [bug#70494] [PATCH 21/23] scripts: substitute: Don't enforce cached connections in download-nar Christopher Baines
2024-04-21  9:42 ` [bug#70494] [PATCH 22/23] substitutes: Move download-nar from substitutes script to here Christopher Baines
2024-04-21  9:42 ` [bug#70494] [PATCH 23/23] substitutes: Add #:keep-alive? keyword argument to download-nar Christopher Baines
2024-05-16 16:29   ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b444b76b857ac9f50bc3fe038fc2a583981de6a0.1713692561.git.mail@cbaines.net \
    --to=mail@cbaines.net \
    --cc=70494@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    --cc=guix@cbaines.net \
    --cc=ludo@gnu.org \
    --cc=me@tobias.gr \
    --cc=othacehe@gnu.org \
    --cc=rekado@elephly.net \
    --cc=zimon.toutoune@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).