From patchwork Sun Apr 21 09:42:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 63258 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0D0DC27BBEA; Sun, 21 Apr 2024 10:45:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 76DC127BBE2 for ; Sun, 21 Apr 2024 10:45:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryTk8-0005qY-3B; Sun, 21 Apr 2024 05:44:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ryTjj-0005PG-EH for guix-patches@gnu.org; Sun, 21 Apr 2024 05:43:51 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ryTji-0002kB-7A; Sun, 21 Apr 2024 05:43:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryTjw-0006Tj-PV; Sun, 21 Apr 2024 05:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70494] [PATCH 06/23] store: Export protocol related constants. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 21 Apr 2024 09:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70494 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70494@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 70494-submit@debbugs.gnu.org id=B70494.171369260324436 (code B ref 70494); Sun, 21 Apr 2024 09:44:04 +0000 Received: (at 70494) by debbugs.gnu.org; 21 Apr 2024 09:43:23 +0000 Received: from localhost ([127.0.0.1]:41762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryTjG-0006Ly-TR for submit@debbugs.gnu.org; Sun, 21 Apr 2024 05:43:23 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryTix-0006Hz-KG for 70494@debbugs.gnu.org; Sun, 21 Apr 2024 05:43:05 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 59ED627BBED for <70494@debbugs.gnu.org>; Sun, 21 Apr 2024 10:42:47 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7d2b5572 for <70494@debbugs.gnu.org>; Sun, 21 Apr 2024 09:42:46 +0000 (UTC) From: Christopher Baines Date: Sun, 21 Apr 2024 10:42:24 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <87bk632h36.fsf@cbaines.net> References: <87bk632h36.fsf@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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.