From patchwork Wed Oct 23 19:59:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. Arne Babenhauserheide" X-Patchwork-Id: 15811 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 1FCF517642; Wed, 23 Oct 2019 21:27:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D52211763D for ; Wed, 23 Oct 2019 21:27:20 +0100 (BST) Received: from localhost ([::1]:47074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNNDz-0003Ei-KE for patchwork@mira.cbaines.net; Wed, 23 Oct 2019 16:27:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33803) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNMnc-0006TM-Ck for guix-patches@gnu.org; Wed, 23 Oct 2019 16:00:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNMnb-0006xK-DD for guix-patches@gnu.org; Wed, 23 Oct 2019 16:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54467) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNMna-0006wt-Pe for guix-patches@gnu.org; Wed, 23 Oct 2019 16:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iNMna-000571-Lp for guix-patches@gnu.org; Wed, 23 Oct 2019 16:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36630] [PATCH] use two threads to build man-pages and secure output msgs with mutex References: <20190712214245.23857-1-arne_bab@web.de> In-Reply-To: <20190712214245.23857-1-arne_bab@web.de> Resent-From: Arne Babenhauserheide Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Oct 2019 20:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36630@debbugs.gnu.org Cc: Arne Babenhauserheide Received: via spool by 36630-submit@debbugs.gnu.org id=B36630.157186078219593 (code B ref 36630); Wed, 23 Oct 2019 20:00:02 +0000 Received: (at 36630) by debbugs.gnu.org; 23 Oct 2019 19:59:42 +0000 Received: from localhost ([127.0.0.1]:35055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iNMnG-00055w-2u for submit@debbugs.gnu.org; Wed, 23 Oct 2019 15:59:42 -0400 Received: from mout.web.de ([212.227.15.14]:56111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iNMnE-00055j-9N for 36630@debbugs.gnu.org; Wed, 23 Oct 2019 15:59:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1571860769; bh=pqxV/DTGr4V8YDf4swbiSrj5VJ0+V4lecEdV1REM3Mo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Reply-To; b=jzKJIbb5R3S49V1f/Smt6hWyt69z1OjdN3m8gMoz/OWmrVVE02bRKtM1n4fEwDRid ZWkV89fe5hPGqCy4S+dPr5jnzGjD2mDUXWX825Pkllz/XR4jrcdxFsq8yIT6aLSIYx DU8k6N/ePUMs+978xeh0/S20dFu7SsRyXsfNzEMc= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from fluss.speedport.ip ([80.136.28.233]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0Lpyh5-1hlXs62hvj-00fhPa; Wed, 23 Oct 2019 21:59:29 +0200 From: Arne Babenhauserheide Date: Wed, 23 Oct 2019 21:59:18 +0200 Message-Id: <20191023195918.26514-1-arne_bab@web.de> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:QVHHxoGzswf3MQ+89avBnUIW9/QYe8oHGjoaYSHcVY2yqjiEjkz io+0RmEoIGJa/Is3pKfMTq5vFu78sl9No4hR+sW1slm3TsmQhuFQxRN5hyuBO57e4JaEIRv rSlw/qrE0B0OAmiHdj5Or+eNto95reA9OyYuy5f7bVAO45r5xZsE8iM0MeMswE3hkVKRJsx u5LtkRaWXLorUpmSDIeBQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:7htekj3tE2U=:hgN19edpyHpr47v/Q+k+Gn i4MuZ1OLKvt+s6zYia7uQn+U6PV9PQM1cKzR4yXAc3NuOMAb8PxVn7q+kZEnYX7qXfTntKWPk 3eoS7xu0T2YlWxqg3l1cEux73QAs4hWRm9HBRhRRtXg3zCEYRK+G0x1RHO6EzyovdAGw435Aq nrs/ZGvQKkROxGxJ4cN17ZRhwCnOOvE01M70gJDQty3kY2cFjmkl3rGRPE4N1venTnDWp+Xk2 W/ekKwM8+qgv4dc05ky7GXFkGAitAuGARaA6N8QbEEi5J6FeQFB08o9cx40wt3qxUDfI8op3w 6ru94rUC7NCBA41V9gw8+LpIwd7CVV124oIGZUlQtDJQoF1H5UlvR/pkjd4EjKzfGe0lpKrX3 egAFYhCdc6mkP+GegO8osk69lbPTsFUbT18DuDRwjaoKvC/9Ho2pEv4Vl817A1mptN697ONyV g1Dey90SG+3tMafV5KNVMRMZpl+Rs0gxUFlRsXRpV4JY09AbAADtn0UUdGinSsUHCXwin9K0F +6R5ZcIWkMvhntBTy2mrKfcuURIq1J6q/PTUMmKxKjDybtVz+SPl2kQ0O/MuBZ80YQVDbqJIl Rssue75xDg9MkGtOeoBhULQClST+pAMHxNHCT3yr0aQlC1gMuWf9oAZXYHeCLaB2GkIxpaJij fo9kGhKFCSsckbMxY/4oP7pU5BFWVJfPIMaQJ8C7aY2JQAEqlUMuHq0k2zCJMhYW3Z5Yk5JGZ PFtgQcCQ/2zV4t32W4s2KL90zj7esCqowi2dgxOxYIjywGJ3yfjMZrpxHXlWL+jsgNHnd4Ql+ uGOx9KbYikzUDYx7q5riCfuP+Aaxtxbcm4kiBMjV2R2WszBNjP4KrU6kCiQs4zmOMQYdbgI2Z aQ8LU1ja4dF3hQnFCTOdsvxjbBiLLAqAlQLg3246jYGzwdfVDwm49NOlZT97UIUXXb97VwPzF x5a/t8JMsCyvmVja9vFS7tZXkEkmAiaUThGBSZ9ZMrhCGeF5LpP3lo/3axIldhUpFaNskIyv3 zYIkekTE6jtpZarHxbHtonBxFBqj8fzHwsyQD73DwQZpl+Qo1/nkgzrL+OJTwQqxGqkQs53vZ XlbjEkW0AOTpYTtv4jlgvr9PAK4ZFAL+evLaHqfunPbqisNfm2s1AUa5L7DZY4EKHlBRyd6wa mM3pT1DA2oqVSiZDjeD7i6CE/GOtdTyawHf99+A1V4KZa01TVD/wh9xdktwvBSMLXZ6csja38 9JSzOYv+WxK/Be6qTb6rDq/WS65OL4Xb4O0apBg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arne_bab@web.de Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- guix/profiles.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) --- 2.23.0 diff --git a/guix/profiles.scm b/guix/profiles.scm index a0ae9a4c7e..9d2133df2d 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1315,11 +1315,18 @@ the entries in MANIFEST." (ice-9 threads) (srfi srfi-1) (srfi srfi-19)) + ;; ensure conflict free user-output + (define status-output-mutex (make-mutex)) + + (define (status-message msg) + (lock-mutex status-output-mutex) + (display msg) + (unlock-mutex status-output-mutex)) (define (compute-entry directory count total) - (format #t "\r[~3d/~3d] building list of \ + (status-message (format #f "\r[~3d/~3d] building list of \ man-db entries..." - count total) + count total)) (force-output) (let ((man (string-append directory "/share/man"))) @@ -1332,7 +1339,9 @@ man-db entries..." ;; decompression), so report progress as we traverse INPUTS. (let* ((inputs '#$(manifest-inputs manifest)) (total (length inputs))) - (apply append (par-map compute-entry + ;; experimenting shows that two threads suffice to remove most + ;; waiting + (apply append (n-par-map 2 compute-entry inputs (iota total 1) (make-list total total)))))