From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8EMYOwYipF/4GwAA0tVLHw (envelope-from ) for ; Thu, 05 Nov 2020 16:02:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eD3hNgYipF+QSQAAB5/wlQ (envelope-from ) for ; Thu, 05 Nov 2020 16:02:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6913C9403D3 for ; Thu, 5 Nov 2020 16:02:14 +0000 (UTC) Received: from localhost ([::1]:35956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kahiH-0007tk-AN for larch@yhetil.org; Thu, 05 Nov 2020 11:02:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kahi6-0007tW-TO for guix-patches@gnu.org; Thu, 05 Nov 2020 11:02:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kahi6-0003qE-Jq for guix-patches@gnu.org; Thu, 05 Nov 2020 11:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kahi6-0007FI-Hr for guix-patches@gnu.org; Thu, 05 Nov 2020 11:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44460] Fixup the output of Session References: <87o8kcv30a.fsf@asu.edu> In-Reply-To: <87o8kcv30a.fsf@asu.edu> Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Nov 2020 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44460@debbugs.gnu.org Received: via spool by 44460-submit@debbugs.gnu.org id=B44460.160459211127831 (code B ref 44460); Thu, 05 Nov 2020 16:02:02 +0000 Received: (at 44460) by debbugs.gnu.org; 5 Nov 2020 16:01:51 +0000 Received: from localhost ([127.0.0.1]:53915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kahhu-0007Eo-M3 for submit@debbugs.gnu.org; Thu, 05 Nov 2020 11:01:51 -0500 Received: from mail-pg1-f169.google.com ([209.85.215.169]:38620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kahhs-0007Ea-Pr for 44460@debbugs.gnu.org; Thu, 05 Nov 2020 11:01:49 -0500 Received: by mail-pg1-f169.google.com with SMTP id i26so1685245pgl.5 for <44460@debbugs.gnu.org>; Thu, 05 Nov 2020 08:01:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=syArphyHccnKoqq1cGTJIOEdrhue1AJ1hneCKW1wfdA=; b=gW2QK7M65j2EJw/ZokAXzgBH254WkiHd7QA59utCqH925GHdYUn2nVvwRV5m+LiADo k2q0sDM8m1tigoPr84GKXFi1qvhL9FzdpUEUBJ3ez4UL7bqB0MwJ9kEr8DDD0Cmqa92T qzI3ZpZvsyoALSQFm9gv5Avyxu623QhMeFmLHtNFNwUg4KBSECG/CV7qrX9dX6CTKysK UMLmx3MalLGWIjO2IJdBlRetiaM/OQ5Q1KZWnZp6o6i5pmaOGb33izQquB7HEcX+wGuV oOa/f80bSURTXl+jZRe+cVvMF6IsZdxD7Y6hr1J5xmKWRDCyktFCoVyARQGjzIOgxVpv 2qMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=syArphyHccnKoqq1cGTJIOEdrhue1AJ1hneCKW1wfdA=; b=Vt3KbZUrDCMACfay9HzImm3r1NfNYSE/lpQMiRhyHR7o9cKwFntpgcaNJU9bgEM7LT tLIRTIphCqYHv480aqFjvp6nMokkauWmEwdMIF3XS8JHKYiYJnjH9OhLNirLI5oHu4KC O2YggmK1P4mTxw3Uf/LSTuJZFTW8wbcnNY4DfEyqwkB7HyH5CmLL4V00egpMaQjdNzTK uyt3fT9+BICa/AnnR5l7wt8PLUZ0LB2FgHDwNt7SiZRHtjFMyoax0MtdCJvtP2UyDoyJ eHJwnctFHGlf1we6BAQDjSw4RtU8wIbs9zeVnYkLUZY3p+Q716bnC7XC/eeVl/zv0HGN LTkw== X-Gm-Message-State: AOAM530O9BE4XKO2OzEVdOztayNTeZ/AuAv8VUu2Dv4QstpXq2tT9HW/ Fev2yYiK+/oz6arwIu/5O+730gacKbDQXQ== X-Google-Smtp-Source: ABdhPJwwcSGFfjWhNlCDadGhF0IItPOrfbR0lv64KX608YNea+zJWqE4n0+DAzgfWopvfejBnt5Aow== X-Received: by 2002:a63:af08:: with SMTP id w8mr3037067pge.419.1604592102495; Thu, 05 Nov 2020 08:01:42 -0800 (PST) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id js7sm2660555pjb.46.2020.11.05.08.01.41 for <44460@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Nov 2020 08:01:41 -0800 (PST) From: John Soo Date: Thu, 05 Nov 2020 08:01:40 -0800 Message-ID: <87h7q3vlln.fsf@asu.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=asu-edu.20150623.gappssmtp.com header.s=20150623 header.b=gW2QK7M6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=asu.edu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: ZYfg/bUbarnY --=-=-= Content-Type: text/plain I had too many newlines after the session recordset and too few between session records. - John --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-processes-Optionally-normalize-recutils-output.patch >From 26ed1a755966d20cb5f2cd8a77d55a981fe6e965 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 4 Nov 2020 07:51:52 -0800 Subject: [PATCH] processes: Optionally normalize recutils output. * guix/scripts/processes.scm: Add "normalize" flag --- doc/guix.texi | 26 ++++++++++ guix/scripts/processes.scm | 104 ++++++++++++++++++++++++++++++++----- 2 files changed, 118 insertions(+), 12 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5e3e0435b4..ed54c26072 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12691,6 +12691,32 @@ ClientPID: 19419 ClientCommand: cuirass --cache-directory /var/cache/cuirass @dots{} @end example +Additional options are listed below. + +@table @code +@item --normalize +Normalize the output records into record sets (@pxref{Record Sets,,, +recutils, GNU recutils manual}). Normalizing into record sets allows +joins across record types. + +@example +$ guix processes --normalize | \ + recsel \ + -j Session \ + -t ChildProcess \ + -p Session.PID,PID \ + -e 'Session.ClientCommand ~ build' +Session_PID: 4278 +PID: 4435 + +Session_PID: 4278 +PID: 4554 + +Session_PID: 4278 +PID: 4646 +@end example +@end table + @node System Configuration @chapter System Configuration diff --git a/guix/scripts/processes.scm b/guix/scripts/processes.scm index b4ca7b1687..6497cd5c2f 100644 --- a/guix/scripts/processes.scm +++ b/guix/scripts/processes.scm @@ -176,6 +176,9 @@ active sessions, and the master 'guix-daemon' process." (values (filter-map child-process->session children) master))) +(define (lock->record lock port) + (format port "LockHeld: ~a~%" lock)) + (define (daemon-session->recutils session port) "Display SESSION information in recutils format on PORT." (format port "SessionPID: ~a~%" @@ -184,8 +187,7 @@ active sessions, and the master 'guix-daemon' process." (process-id (daemon-session-client session))) (format port "ClientCommand:~{ ~a~}~%" (process-command (daemon-session-client session))) - (for-each (lambda (lock) - (format port "LockHeld: ~a~%" lock)) + (for-each (lambda (lock) (lock->record lock port)) (daemon-session-locks-held session)) (for-each (lambda (process) (format port "ChildProcess: ~a:~{ ~a~}~%" @@ -193,6 +195,81 @@ active sessions, and the master 'guix-daemon' process." (process-command process))) (daemon-session-children session))) +(define (format-single-record port) + "Display denormalized session information to PORT." + (for-each (lambda (session) + (daemon-session->recutils session port) + (newline port)) + (daemon-sessions))) + +(define session-rec-type + ;; Also includes ClientCommand and LockHeld but it doesn't seem to be + ;; possible to express a plain string field (the default) without further + ;; restrictions + "%rec: Session +%type: PID int +%type: ClientPID int +%key: PID") + +(define child-process-rec-type + ;; Also includes Command but it doesn't seem to be possible to + ;; express a plain string field (the default) without further restrictions + "%rec: ChildProcess +%type: Session rec Session +%type: PID int +%key: PID") + +(define (session-key->field session port) + "Display SESSION PID as field on PORT." + (format + port "Session: ~a" + (process-id (daemon-session-process session)))) + +(define (session-scalars->normalized-record session port) + "Display SESSION scalar fields to PORT in normalized form." + (format port "PID: ~a~%" + (process-id (daemon-session-process session))) + (format port "ClientPID: ~a~%" + (process-id (daemon-session-client session))) + (format port "ClientCommand:~{ ~a~}~%" + (process-command (daemon-session-client session)))) + +(define (child-process->normalized-record process port) + "Display PROCESS record on PORT in normalized form" + (format port "PID: ~a" (process-id process)) + (newline port) + (format port "Command:~{ ~a~}" (process-command process))) + +(define (format-normalized port) + (define sessions (daemon-sessions)) + + (format port session-rec-type) + (newline port) + (newline port) + (for-each + (lambda (session) + (session-scalars->normalized-record session port) + (for-each + (lambda (lock) (lock->record lock port)) + (daemon-session-locks-held session)) + (newline port)) + sessions) + + (format port child-process-rec-type) + (newline port) + (newline port) + (for-each + (lambda (session) + (for-each + (lambda (process) + (session-key->field session port) + (newline port) + (child-process->normalized-record process port) + (newline port) + (newline port)) + (daemon-session-children session))) + sessions)) + ;;; ;;; Options. @@ -205,7 +282,10 @@ active sessions, and the master 'guix-daemon' process." (exit 0))) (option '(#\V "version") #f #f (lambda args - (show-version-and-exit "guix processes"))))) + (show-version-and-exit "guix processes"))) + (option '("normalize") #f #f + (lambda (opt name arg result) + (alist-cons 'normalize #t result))))) (define (show-help) (display (G_ "Usage: guix processes @@ -216,8 +296,13 @@ List the current Guix sessions and their processes.")) (display (G_ " -V, --version display version information and exit")) (newline) + (display (G_ " + --normalize display results as normalized record sets")) + (newline) (show-bug-report-information)) +(define %default-options '()) + ;;; ;;; Entry point. @@ -227,17 +312,12 @@ List the current Guix sessions and their processes.")) (category plumbing) (synopsis "list currently running sessions") (define options - (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - cons - '())) + (parse-command-line args %options (list %default-options))) (with-paginated-output-port port - (for-each (lambda (session) - (daemon-session->recutils session port) - (newline port)) - (daemon-sessions)) + (match (assoc-ref options 'normalize) + (#t (format-normalized port)) + (_ (format-single-record port))) ;; Pass 'R' (instead of 'r') so 'less' correctly estimates line length. #:less-options "FRX")) -- 2.29.1 --=-=-=--