amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

utils: Add #:sync? parameter to ‘with-atomic-file-output’.

Browse source 
* guix/utils.scm (with-atomic-file-output): Add #:sync? and honor it.
Add ‘force-output’ call.

Change-Id: I2479778ae55360c0fab3389ac9249045a27b3568
This commit is contained in:
Ludovic Courtès 2025-04-08 18:49:25 +02:00
parent c44495bb10
commit 5525315092
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
guix/utils.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2022, 2024-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2013, 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
@ -1057,16 +1057,22 @@ delete it when leaving the dynamic extent of this call."
(lambda () (lambda ()
(false-if-exception (delete-file-recursively tmp-dir)))))) (false-if-exception (delete-file-recursively tmp-dir))))))
(define (with-atomic-file-output file proc) (define* (with-atomic-file-output file proc #:key (sync? #t))
"Call PROC with an output port for the file that is going to replace FILE. "Call PROC with an output port for the file that is going to replace FILE.
Upon success, FILE is atomically replaced by what has been written to the Upon success, FILE is atomically replaced by what has been written to the
output port, and PROC's result is returned." output port, and PROC's result is returned.
When SYNC? is true, call 'fdatasync' on the temporary file before renaming it
to FILE; set it to #false for caches and temporary files to improve
performance."
(let* ((template (string-append file ".XXXXXX")) (let* ((template (string-append file ".XXXXXX"))
(out (mkstemp! template))) (out (mkstemp! template)))
(with-throw-handler #t (with-throw-handler #t
(lambda () (lambda ()
(let ((result (proc out))) (let ((result (proc out)))
(fdatasync out) (when sync?
(force-output out)
(fdatasync out))
(close-port out) (close-port out)
(rename-file template file) (rename-file template file)
result)) result))