From: Christopher Baines <mail@cbaines.net>
To: 38754@debbugs.gnu.org
Subject: [bug#38754] [PATCH 1/2] guix: lint: Add an optional parameter for a store connection.
Date: Thu, 26 Dec 2019 18:01:03 +0000 [thread overview]
Message-ID: <20191226180104.10888-1-mail@cbaines.net> (raw)
In-Reply-To: <8736d7rnzg.fsf@cbaines.net>
Previously, the derivation lint checker establishes a connection to the store
for each supported system of each package. This change uses the same store
connection for all supported systems, with the option of setting a parameter
for a store connection which will be used instead of establishing a new
connection.
Previously, running the derivation linter for all packages would take around 6
and a half minutes, with this change, without setting the
%lint-checker-store-connection parameter, the time is reduced to around 4
minutes.
* guix/lint.scm (%lint-checker-store-connection): New parameter.
(check-derivation): Arrange the code so that it's possible to either run with
the store from the new parameter, or open a new connection via the with-store
syntax.
---
guix/lint.scm | 42 ++++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/guix/lint.scm b/guix/lint.scm
index cd2ea571ed..19498db857 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -100,7 +100,9 @@
lint-checker?
lint-checker-name
lint-checker-description
- lint-checker-check))
+ lint-checker-check
+
+ %lint-checker-store-connection))
\f
;;;
@@ -142,6 +144,9 @@
((_ package (G_ message) rest ...)
(%make-warning package message rest ...))))
+(define %lint-checker-store-connection
+ (make-parameter #f))
+
\f
;;;
;;; Checkers
@@ -887,7 +892,7 @@ descriptions maintained upstream."
(define (check-derivation package)
"Emit a warning if we fail to compile PACKAGE to a derivation."
- (define (try system)
+ (define (try store system)
(catch #t
(lambda ()
(guard (c ((store-protocol-error? c)
@@ -900,25 +905,30 @@ descriptions maintained upstream."
(G_ "failed to create ~a derivation: ~a")
(list system
(condition-message c)))))
- (with-store store
- ;; Disable grafts since it can entail rebuilds.
- (parameterize ((%graft? #f))
- (package-derivation store package system #:graft? #f)
-
- ;; If there's a replacement, make sure we can compute its
- ;; derivation.
- (match (package-replacement package)
- (#f #t)
- (replacement
- (package-derivation store replacement system
- #:graft? #f)))))))
+ ;; Disable grafts since it can entail rebuilds.
+ (parameterize ((%graft? #f))
+ (package-derivation store package system #:graft? #f)
+
+ ;; If there's a replacement, make sure we can compute its
+ ;; derivation.
+ (match (package-replacement package)
+ (#f #t)
+ (replacement
+ (package-derivation store replacement system
+ #:graft? #f))))))
(lambda args
(make-warning package
(G_ "failed to create ~a derivation: ~s")
(list system args)))))
- (filter lint-warning?
- (map try (package-supported-systems package))))
+ (define (check-with-store store)
+ (filter lint-warning?
+ (map (cut try store <>) (package-supported-systems package))))
+
+ (or (and=> (%lint-checker-store-connection)
+ check-with-store)
+ (with-store store
+ (check-with-store store))))
(define (check-license package)
"Warn about type errors of the 'license' field of PACKAGE."
--
2.24.1
next prev parent reply other threads:[~2019-12-26 18:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-26 17:33 [bug#38754] [PATCH 0/2] Speed up the derivation linter Christopher Baines
2019-12-26 18:01 ` Christopher Baines [this message]
2019-12-26 18:01 ` [bug#38754] [PATCH 2/2] scripts: lint: Set the %link-checker-store-connection parameter Christopher Baines
2019-12-30 22:12 ` Ludovic Courtès
2019-12-30 23:34 ` Christopher Baines
2019-12-31 18:15 ` Ludovic Courtès
2020-03-15 21:06 ` [bug#38754] [PATCH 1/4] lint: Add a requires-store? field to the checker record Christopher Baines
2020-03-15 21:06 ` [bug#38754] [PATCH 2/4] lint: Mark the derivation checker as requiring a store connection Christopher Baines
2020-03-15 21:06 ` [bug#38754] [PATCH 3/4] lint: Add a #:store argument to check-derivation Christopher Baines
2020-03-15 21:06 ` [bug#38754] [PATCH 4/4] scripts: lint: Handle store connections for lint checkers Christopher Baines
2020-03-15 21:35 ` [bug#38754] [PATCH 2/2] scripts: lint: Set the %link-checker-store-connection parameter Christopher Baines
2020-03-24 10:20 ` Ludovic Courtès
2020-03-24 19:50 ` bug#38754: " Christopher Baines
2019-12-30 22:01 ` [bug#38754] [PATCH 0/2] Speed up the derivation linter 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=20191226180104.10888-1-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=38754@debbugs.gnu.org \
/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).