From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#29347: 27.0.50; C-g doesn't quit minibuffer Date: Fri, 24 Nov 2017 23:41:11 +0200 Message-ID: <83o9nr8idk.fsf@gnu.org> References: <87shd8x1od.fsf@gnu.org> <83tvxodcg9.fsf@gnu.org> <87h8towvb7.fsf@gnu.org> <831sknabwp.fsf@gnu.org> <83po878jmf.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1511559728 18332 195.159.176.226 (24 Nov 2017 21:42:08 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 24 Nov 2017 21:42:08 +0000 (UTC) Cc: 29370@debbugs.gnu.org, 29347@debbugs.gnu.org, rms@gnu.org To: mtg@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 24 22:42:04 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eILjX-0004RC-FL for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 Nov 2017 22:42:03 +0100 Original-Received: from localhost ([::1]:51225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eILje-0002rq-Rg for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 Nov 2017 16:42:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eILjW-0002qy-Qx for bug-gnu-emacs@gnu.org; Fri, 24 Nov 2017 16:42:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eILjW-0003on-1x for bug-gnu-emacs@gnu.org; Fri, 24 Nov 2017 16:42:02 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:47840) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eILjV-0003oV-Ub for bug-gnu-emacs@gnu.org; Fri, 24 Nov 2017 16:42:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eILjV-00026y-Ke for bug-gnu-emacs@gnu.org; Fri, 24 Nov 2017 16:42:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 Nov 2017 21:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29347 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29347-submit@debbugs.gnu.org id=B29347.15115597168103 (code B ref 29347); Fri, 24 Nov 2017 21:42:01 +0000 Original-Received: (at 29347) by debbugs.gnu.org; 24 Nov 2017 21:41:56 +0000 Original-Received: from localhost ([127.0.0.1]:56521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eILjQ-00026c-3b for submit@debbugs.gnu.org; Fri, 24 Nov 2017 16:41:56 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:42508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eILjO-00026O-7F for 29347@debbugs.gnu.org; Fri, 24 Nov 2017 16:41:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eILjF-0003k5-So for 29347@debbugs.gnu.org; Fri, 24 Nov 2017 16:41:49 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eILjF-0003jq-Ot; Fri, 24 Nov 2017 16:41:45 -0500 Original-Received: from [176.228.60.248] (port=3468 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eILj7-0001k8-RC; Fri, 24 Nov 2017 16:41:38 -0500 In-reply-to: <83po878jmf.fsf@gnu.org> (message from Eli Zaretskii on Fri, 24 Nov 2017 23:14:16 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:140347 Archived-At: > Date: Fri, 24 Nov 2017 23:14:16 +0200 > From: Eli Zaretskii > Cc: 29370@debbugs.gnu.org, 29347@debbugs.gnu.org, rms@gnu.org > > > Date: Fri, 24 Nov 2017 18:17:58 +0200 > > From: Eli Zaretskii > > Cc: 29370@debbugs.gnu.org, 29347@debbugs.gnu.org, rms@gnu.org > > > > I think I fixed the problem which caused Emacs to hang in this > > particular scenario, but I'm not sure Richard is seeing the same > > problem. The change I installed on the emacs-26 branch is below; > > Richard, please try applying it, and see if your problems go away. > > Sorry, wrong patch. Please use the one below instead. Sorry again, that was not the best idea. Here is a better patch: diff --git a/src/thread.c b/src/thread.c index 9e799ce..dd46681 100644 --- a/src/thread.c +++ b/src/thread.c @@ -578,8 +573,15 @@ really_call_select (void *arg) sa->timeout, sa->sigmask); block_interrupt_signal (&oldset); - acquire_global_lock (self); - self->not_holding_lock = 0; + /* If we were interrupted by C-g while inside sa->func above, the + signal handler could have called maybe_reacquire_global_lock, in + which case we are already holding the lock and shouldn't try + taking it again, or else we will hang forever. */ + if (self->not_holding_lock) + { + acquire_global_lock (self); + self->not_holding_lock = 0; + } restore_signal_mask (&oldset); }