From patchwork Wed Apr 9 14:23:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 41498 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 B1AE027BC49; Wed, 9 Apr 2025 15:24:38 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 3EDAD27BC4B for ; Wed, 9 Apr 2025 15:24:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2WLh-0003hN-JI; Wed, 09 Apr 2025 10:24:17 -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 1u2WLX-0003cM-1l for guix-patches@gnu.org; Wed, 09 Apr 2025 10:24:11 -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 1u2WLW-0002qO-LJ; Wed, 09 Apr 2025 10:24:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=aGeG7j1Bmh1K9z0mhsJ66S4LuOy7cbMuuYtHZrDZ4qI=; b=nNc3KL2j6eXUY8s8k94g4nXtMnQHp7gAgujVbhlrGztYz2QDPLMvi2zVMsqClNJjq8dTnDPxW+zD2WGVn06Fr+a4BJ2ciMnm0KLoQ05p1IEogCQgWX1HgP0aX2LUjxohkrcIIH2RhFLJxAk7eLAbMjb1mvw8nJI7IBTd/GHFEUROmCOhUNOd93a69oev/LH00CJ7SjmbUC2y8rg0I0Nq2P+Lw4o1altjPl7X6X8Uw2DQAq6CmeE7dw4Wo/awr1f4MvOaejoAhGqvTtY3n7QTLx2SEOlZsUzzLS0vzwqPun8lS/lflAUJeyNHGT1GPprTV15Pfjnq1b9tW4tzZUAMXw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2WLV-0007TY-No; Wed, 09 Apr 2025 10:24:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77680] [PATCH 2/4] utils: Add #:sync? parameter to =?utf-8?b?4oCYd2l0aC1hdG9taWMtZmlsZS1vdXRwdXTigJku?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 14:24:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77680 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77680@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 77680-submit@debbugs.gnu.org id=B77680.174420864328716 (code B ref 77680); Wed, 09 Apr 2025 14:24:05 +0000 Received: (at 77680) by debbugs.gnu.org; 9 Apr 2025 14:24:03 +0000 Received: from localhost ([127.0.0.1]:40916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2WLR-0007Ss-6m for submit@debbugs.gnu.org; Wed, 09 Apr 2025 10:24:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51656) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2WLL-0007SK-Si for 77680@debbugs.gnu.org; Wed, 09 Apr 2025 10:23:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2WLG-0002o5-Ht; Wed, 09 Apr 2025 10:23:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=aGeG7j1Bmh1K9z0mhsJ66S4LuOy7cbMuuYtHZrDZ4qI=; b=MJ1DL1H7+txCwONAk5aX aRkDmkTreGMPgyJMnT5eNMTPI5FgjGeOgjCnnzMTJqE8rohIVpbqHgK5OqFf2m6LIefiCkp3EJaSw uHBLGJDzTDi05/OOpib2ixPA+SBXtCK+EqivaRE0wM31nllAo5wozzrWLaVVh/sKhY+QIP/9jUGu8 uu+hE1dFMqal4TJz4r9jf91wpz/aTHD2rgvbnGrSHmkaTSeQmhT/S4XXVSN9NMF6//fmQJxsuJRhx HOtojnONCLwNzTgjGAudo7pYIgLy4E5zR+h9Mk38aNKGVhuZilsu8vqOY6k9HjUNTg+gCL3+RAFCB 7pzH4oOCbHV29g==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 9 Apr 2025 16:23:37 +0200 Message-ID: <0b4f5c1d6e1be1ed563be7aca347817f725a6b10.1744208418.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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/utils.scm (with-atomic-file-output): Add #:sync? and honor it. Add ‘force-output’ call. Change-Id: I2479778ae55360c0fab3389ac9249045a27b3568 --- guix/utils.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/guix/utils.scm b/guix/utils.scm index c7c23d9d5b..7ae98096c2 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2022, 2024 Ludovic Courtès +;;; Copyright © 2012-2022, 2024-2025 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014 Ian Denhardt @@ -1057,16 +1057,22 @@ (define (call-with-temporary-directory proc) (lambda () (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. 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")) (out (mkstemp! template))) (with-throw-handler #t (lambda () (let ((result (proc out))) - (fdatasync out) + (when sync? + (force-output out) + (fdatasync out)) (close-port out) (rename-file template file) result))