Browse Source

substitute-binary: Work around thread-unsafe `regexp-exec'.

* guix/scripts/substitute-binary.scm (%regexp-exec-mutex): New variable.
  (string->uri): New procedure.
  (fields->alist): Wrap `regexp-exec' call in `with-mutex'.
gn-latest-20200428
Ludovic Courtès 8 years ago
parent
commit
0332386251
2 changed files with 16 additions and 2 deletions
  1. +2
    -1
      .dir-locals.el
  2. +14
    -1
      guix/scripts/substitute-binary.scm

+ 2
- 1
.dir-locals.el View File

@ -15,7 +15,8 @@
(eval . (put 'with-directory-excursion 'scheme-indent-function 1))
(eval . (put 'package 'scheme-indent-function 1))
(eval . (put 'substitute-keyword-arguments 'scheme-indent-function 1))
(eval . (put 'with-error-handling 'scheme-indent-function 0))))
(eval . (put 'with-error-handling 'scheme-indent-function 0))
(eval . (put 'with-mutex 'scheme-indent-function 1))))
(emacs-lisp-mode . ((indent-tabs-mode . nil)))
(texinfo-mode . ((indent-tabs-mode . nil)
(fill-column . 72))))

+ 14
- 1
guix/scripts/substitute-binary.scm View File

@ -84,6 +84,18 @@ output port, and PROC's result is returned."
(lambda (key . args)
(false-if-exception (delete-file template))))))
(define %regexp-exec-mutex
;; In Guile 2.0.9, `regexp-exec' is thread-unsafe, so work around it.
;; See <http://bugs.gnu.org/14404>.
(make-mutex))
(define string->uri
(let ((real (@ (web uri) string->uri)))
(lambda (uri)
"A thread-safe `string->uri'."
(with-mutex %regexp-exec-mutex
(real uri)))))
(define (fields->alist port)
"Read recutils-style record from PORT and return them as a list of key/value
pairs."
@ -94,7 +106,8 @@ pairs."
(result '()))
(cond ((eof-object? line)
(reverse result))
((regexp-exec field-rx line)
((with-mutex %regexp-exec-mutex
(regexp-exec field-rx line))
=>
(lambda (match)
(loop (read-line port)


Loading…
Cancel
Save