From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 4Cp2JOREfmUjQAEAkFu2QA (envelope-from ) for ; Sun, 17 Dec 2023 01:46:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id MNWtH+REfmUqvwAA62LTzQ (envelope-from ) for ; Sun, 17 Dec 2023 01:46:28 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="O3k/T46V"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1702773988; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4Mk7jLFsb4QSOWC4RJ/CAAuNvvUY9wedxBZkZCM90jU=; b=Ly1kGwKoEXuWSIrooqN1dau3Mgticnu32ay7MOA0TCmH+c7hZoK9i/x0FWH+DFHoI5h2TJ 2X8EWK3B1TYmhUakn0QuhYTruqAc0saiNFi7We9Q4bCqFhRTOw8sgxvHRjfWwP9tUWmtpG pCvB5o27EZA4ngs1dv+d/90N85fRq/BxeajjkZGOmU6yic6L2x/LLbsivTcl2PSF6xTyod mA3JkDo05tuO6sRP01u465tRH9q1Xz/BqFEa6KRW6idugmz/WMIni/9GUgYZcIZcdjpZ76 Mr2avhBPCJoopLr59es97TSJNEzKSng+zhSHZS9leHHn+mCzGbQEOZILfNAkGg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702773988; a=rsa-sha256; cv=none; b=FJVR9PElRZiRBLEztxF7cg1cuVnNg3hUobGUMuYpEnO2BVWKGkwuT+TIG397cOgEZ8XGZi hGIjc/TiaWguFeMmkQGIjbBklRLeuolaXveB7HW6kmMOYcZ/tD5Kj/abOqIazbh4Dzl0Vp vLM7/l+zDsvZDvWqdq0kIcgJ8+6ig2pOrLgx8XaRQo8Y3hmLtO9uxGfgs8J8ZfE10HaEPe Ow2qu8dVLG9r90AZmQbKgimTs4Dt6APTiNZS9QhxXnEPXJkfx0tKNsstRL0TWoFwMygvYk +SJuNAvuia34zUaO+9L+hLLPP4KPIq1RQr711a0NR+hjl2i3kQ+bjhoMyHgReg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="O3k/T46V"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6F25C59624 for ; Sun, 17 Dec 2023 01:46:28 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEfIA-0002rt-Mt; Sat, 16 Dec 2023 19:46:02 -0500 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 1rEfI9-0002rb-Oy for bug-guix@gnu.org; Sat, 16 Dec 2023 19:46:01 -0500 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 1rEfI9-0003b3-GZ for bug-guix@gnu.org; Sat, 16 Dec 2023 19:46:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rEfIA-0000K0-1d for bug-guix@gnu.org; Sat, 16 Dec 2023 19:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#67839: [PATCH v2 1/2] shepherd: Make sure with-process-monitor covers everything needed. References: In-Reply-To: Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 17 Dec 2023 00:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67839 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 67839@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 67839-submit@debbugs.gnu.org id=B67839.170277390325165 (code B ref 67839); Sun, 17 Dec 2023 00:46:02 +0000 Received: (at 67839) by debbugs.gnu.org; 17 Dec 2023 00:45:03 +0000 Received: from localhost ([127.0.0.1]:56379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEfH9-0006T3-J7 for submit@debbugs.gnu.org; Sat, 16 Dec 2023 19:45:02 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:61528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEfH7-0006Sh-1p for 67839@debbugs.gnu.org; Sat, 16 Dec 2023 19:44:58 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3365e985c2cso439082f8f.2 for <67839@debbugs.gnu.org>; Sat, 16 Dec 2023 16:44:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702773890; x=1703378690; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4Mk7jLFsb4QSOWC4RJ/CAAuNvvUY9wedxBZkZCM90jU=; b=O3k/T46VKzAXPTpQInvbFo4RdnCpmR3v0/3kMQZLRU3BkHoDEd5BQXL4+gcc7vU+x7 7Fg4oEBasIu9Acz/MFXDxAqppwDRyu6Xe1TSJkge8QbEDSxhJTF+/R19JQVFJFRKyf9e Ne5d+qdqBrLnukI0imqL8TGaymE2+bRFHaU/8S+Came7CQ/6hxcKt8WWNquXxAmKcf+0 clU4n+QXDZxpOeuiVdnKmh55ykqGtplvgMJTEJKjBYQjydqJwx0NUMLf2qAE5dMK14o0 qeJaJCxfFBVQ3v6SCqtgBcoW+n1PaK8pk22y9ZRluJW5YJMokYJ0eOKIVrhgsh21TXah MIOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702773890; x=1703378690; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4Mk7jLFsb4QSOWC4RJ/CAAuNvvUY9wedxBZkZCM90jU=; b=Wc+LqlJacjV3KNETrciru0ZAhvVW0y848ZSFhv6ZiJZS8Hz2tRZ1oBcE6iV29gW1aE zObW5DWQhPjbkBYNSF0SDQaBKSBxiMYspwVg8quP4VVkKewaF3GdhJXbq2Xou/88J4no EAEkoVyUiEFSTsHSvnYxFb725N4sdEFgQ0VLIpou2/EkvhXlDcmCu3zbgnTCQPhKldxU NZhHdqCQ8w8XovUXkDiHUjXQ3/EPTrna8cp9EhT1vYKZin9OlIdr7N6ZScGqSff18KX8 Z8Pl9u/ti230g6Z+MDOxGz1b+1go6/8HPH5Z1QajgrYD7Ot7q9mWkzhmLIjmMZCN+wGk /97Q== X-Gm-Message-State: AOJu0Yz29H1HUaQ5ZD0BqpIBwRdNT3KoMG2mG37zL+hpW1dXQnkdpQTS 1J4nI7+4FrcWV4Y9yeO7lDA7FLDajeRWLA== X-Google-Smtp-Source: AGHT+IFJ3yVXKM2AQE3I/im+PTJLfN0alnqJsbSaNlaqKDrsW4AyZAfgVaTR2U/Mtyp4e71w7gKdTw== X-Received: by 2002:a5d:6847:0:b0:336:4420:948d with SMTP id o7-20020a5d6847000000b003364420948dmr3354770wrw.122.1702773889963; Sat, 16 Dec 2023 16:44:49 -0800 (PST) Received: from lelap.lan (2a00-1f40-b161-900-9180-9bd5-ff71-193b.pool6.panelnet.hu. [2a00:1f40:b161:900:9180:9bd5:ff71:193b]) by smtp.gmail.com with ESMTPSA id t16-20020a056402241000b00552743342c8sm2960258eda.59.2023.12.16.16.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 16:44:49 -0800 (PST) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Sun, 17 Dec 2023 01:44:24 +0100 Message-ID: <20231217004424.28303-2-attila@lendvai.name> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.57 X-Spam-Score: -4.57 X-Migadu-Queue-Id: 6F25C59624 X-Migadu-Scanner: mx11.migadu.com X-TUID: eMx8hdhMTLyJ * modules/shepherd.scm (main): Switch with-service-registry and with-process-monitor. This way the parameterize of the process monitor covers everything else. This fixes the bug that caused `guix system reconfigure` to hang in certain situations. Fix proposed by @emixa-d at: https://github.com/wingo/fibers/issues/29#issuecomment-1858922276. --- modules/shepherd.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/shepherd.scm b/modules/shepherd.scm index efc5517..3303de3 100644 --- a/modules/shepherd.scm +++ b/modules/shepherd.scm @@ -450,13 +450,13 @@ fork in the child process." ;; because POSIX threads and 'fork' cannot be used together. (run-fibers (lambda () - (with-service-registry + (with-process-monitor + (with-service-registry - ;; Register and start the 'root' service. - (register-services (list root-service)) - (start-service root-service) + ;; Register and start the 'root' service. + (register-services (list root-service)) + (start-service root-service) - (with-process-monitor ;; Replace the default 'system*' binding with one that ;; cooperates instead of blocking on 'waitpid'. Replace ;; 'primitive-load' (in C as of 3.0.9) with one that does -- 2.41.0