From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gerd =?UTF-8?Q?M=C3=B6llmann?= Newsgroups: gmane.emacs.bugs Subject: bug#72496: 31.0.50; macOS: freezes without beach ball Date: Thu, 08 Aug 2024 07:24:57 +0200 Message-ID: References: <865xsdpusi.fsf@gnu.org> <86wmkto7dh.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14743"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 72496@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 08 07:26:48 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sbvfk-0003fL-9k for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 08 Aug 2024 07:26:48 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbvfa-0004pR-U4; Thu, 08 Aug 2024 01:26:38 -0400 Original-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 1sbvfY-0004p6-0P for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2024 01:26:36 -0400 Original-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 1sbvfX-0003yD-O7 for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2024 01:26:35 -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:Date:References:In-Reply-To:From:To:Subject; bh=AZaygRDVDWgT1DJoBxfVJM8urYw2ew99cd2EgkLsQuo=; b=nKs++gvI6Tc769nhhhf5nQ6YIXS+RhAeLU/9HuonwI7ACB15OzXW0vBXzeHtjNMmH8Yx0J4+jzSzT8NHM58i4EGMMQEXouMUoCyCXQKz45UWQqjc6ISh3ayexAQhfJ7S6l0xy/3jz1RE9p6mGIeVDtS3kF76nZUZC1HHkpEQ1Fsvx0Sr8pVJ+ULXimxWKF2Lr9RIr9uTl3l2m6k23EQzn+EPkypzrGwxJ+miVNSRtfye4stXNomV5Hq7SUOJMVfvDT2MRUh6ZaMHjRXYJ95ubBMwFgLnwxek3ZGdkZeYl2uQYumgZOjjj4rd3+Sjl1CIEnHu9q6/KGaWz3eke/85nQ==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sbvfx-000724-Pv for bug-gnu-emacs@gnu.org; Thu, 08 Aug 2024 01:27:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Gerd =?UTF-8?Q?M=C3=B6llmann?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 08 Aug 2024 05:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72496 X-GNU-PR-Package: emacs Original-Received: via spool by 72496-submit@debbugs.gnu.org id=B72496.172309479426989 (code B ref 72496); Thu, 08 Aug 2024 05:27:01 +0000 Original-Received: (at 72496) by debbugs.gnu.org; 8 Aug 2024 05:26:34 +0000 Original-Received: from localhost ([127.0.0.1]:35333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbvfW-00071F-4R for submit@debbugs.gnu.org; Thu, 08 Aug 2024 01:26:34 -0400 Original-Received: from mail-ej1-f49.google.com ([209.85.218.49]:47488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbvfU-000711-8z for 72496@debbugs.gnu.org; Thu, 08 Aug 2024 01:26:32 -0400 Original-Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a7d2a9a23d9so62361566b.3 for <72496@debbugs.gnu.org>; Wed, 07 Aug 2024 22:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723094700; x=1723699500; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=AZaygRDVDWgT1DJoBxfVJM8urYw2ew99cd2EgkLsQuo=; b=D02riPIfuOuNqlXvDKcFEgnbUggJnXt4MMm5Tj7N1/BNBA0HIOrywzhVtYHcTBWlcq tVdGrYcegqiYo2dlOxEzy6hY+leRyiLULjP+y72ed26Ei7b34BXX3X1KzEvBaggLcg1u S70PKmLXkT0+6xk4ry2Wfx99c3ZZbyRMTmjVOMAFzMsB1WYYOE2M0ENTShousB2Jim2O p0siuMjopsl4u79AsRyRMlKHf6864kFpjPI1Fmshach3IXsdDHzfYJ1Wqywh/yzZzxwB dHL7VYS+J42mn7CV1ymWnXJ1cyBYDIicfI3xDVZzurTb3lysqLnqTXml22+iUkgLi13G wkWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723094700; x=1723699500; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=AZaygRDVDWgT1DJoBxfVJM8urYw2ew99cd2EgkLsQuo=; b=VwM1ZKoEkkEqh6Ma0t0m2W3Lj6N3I7nqF9gZFjGwMmiBWUNr9FLVjpKQqBbRJUT9j1 1YK738xhJHHamWLGiHB0alFz4SiFdS7VD322nHryYz3nbIMT1qE7Gnt41Fp+0kGgurBl GRqSj5fOgfPwhJoWeL8/iLmb1C0hh5ZE6woPJpcEPGqCwQ6eb7pEz/6F4I6btfFMl/Gx UjUl3QcCG3w1fF++PLVZB/tWPdhU/yWBUtNcbB2r2AVwrMQPDB8xZTBvuf9m/8vhQQaG Fyjy23DG6Lx3asryvdVETTe+ZrkGe3MVNTeiNJm7EAbWObr/9ZO55TZbRl1Y0UxJSGlW UdCw== X-Gm-Message-State: AOJu0Ywg/ERX2DY3KQKKGsCNa7jwSEllfYqhuxzRW1zwPsl0cSMrMlCq WCq/L+dTnFLzZCjFw3Ek1taCjndYxzeknKV5iaDPsWndVteQAfP6tBoJEQ== X-Google-Smtp-Source: AGHT+IE1S5lU0U9sN3nS6GhrTwybiTnd4r8rn9zc5CqU3av5ZjBCOI5eEmpGfVZGFI6W26r+Vtk6HQ== X-Received: by 2002:a17:907:d581:b0:a77:bfca:da57 with SMTP id a640c23a62f3a-a8090e62284mr42513966b.44.1723094699699; Wed, 07 Aug 2024 22:24:59 -0700 (PDT) Original-Received: from pro2.fritz.box (p4fe3a254.dip0.t-ipconnect.de. [79.227.162.84]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7dc9bc3d77sm695741066b.43.2024.08.07.22.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 22:24:59 -0700 (PDT) In-Reply-To: ("Gerd =?UTF-8?Q?M=C3=B6llmann?="'s message of "Tue, 06 Aug 2024 20:37:40 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:289912 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gerd M=C3=B6llmann writes: > Eli Zaretskii writes: > >>> From: Gerd M=C3=B6llmann >>> Cc: 72496@debbugs.gnu.org >>> Date: Tue, 06 Aug 2024 18:36:39 +0200 >>>=20 >>> I've tried this >>>=20 >>> (when (fboundp 'ns-app-stop) >>> (defun sigusr1-handler () >>> (interactive) >>> (message "SIGUSR1 - stop event loop") >>> (ns-app-stop)) >>> (keymap-set special-event-map "" 'sigusr1-handler)) >>>=20 >>> where ns-app-stop does such a ns_send_appdefined, but that didn't work >>> for a reason unknown to me. >> >> Maybe the way SIGUSR1 is handled involves the same event queue that is >> botched in this scenario? > > Yes, that's quite likely. I had a little hope that a signal would maybe > handled in some special way, but apparently not. I'm now running locally with the attached change. This removes the global variable that can prevent sending app-defined events when set wrong. Instead, I'm using [NSApplication nextEventMatchingMask] to check if an app-defined event has already been posted. This is infinelty less dangerous. Let's see if that is the problem. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-NS-Send-application-defined-event-differently-bug-72.patch Content-Description: nsterm.m patch >From f48aafd73c7d2694bf2c9e980e9624bde9ab3b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerd=20M=C3=B6llmann?= Date: Thu, 8 Aug 2024 06:57:21 +0200 Subject: [PATCH] NS: Send application-defined event differently (bug#72496) * src/nsterm.m (send_appdefined): Global variable removed, all uses removed. (ns_send_appdefined): Check if an application-defined event is already queued with [NSApplicaton nextEventMatching]. Post an event if not. --- src/nsterm.m | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/nsterm.m b/src/nsterm.m index 5588425686b..594f7ba974b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -309,7 +309,6 @@ - (unsigned long)unsignedLong #endif /* event loop */ -static BOOL send_appdefined = YES; #define NO_APPDEFINED_DATA (-8) static int last_appdefined_event_data = NO_APPDEFINED_DATA; static NSTimer *timed_entry = 0; @@ -507,7 +506,6 @@ - (unsigned long)unsignedLong hold_event_q.q[hold_event_q.nr++] = *event; /* Make sure ns_read_socket is called, i.e. we have input. */ raise (SIGIO); - send_appdefined = YES; } static Lisp_Object @@ -4689,13 +4687,17 @@ Function modeled after x_draw_glyph_string_box (). /* Only post this event if we haven't already posted one. This will end the [NXApp run] main loop after having processed all events queued at this moment. */ - if (send_appdefined || value == -42) + + NSEvent *app_defined_event = + [NSApp nextEventMatchingMask: NSEventMaskApplicationDefined + untilDate: nil + inMode: NSDefaultRunLoopMode + dequeue: NO]; + + if (app_defined_event == nil) { NSEvent *nxev; - /* We only need one NX_APPDEFINED event to stop NXApp from running. */ - send_appdefined = NO; - /* Don't need wakeup timer any more. */ if (timed_entry) { @@ -4812,7 +4814,6 @@ Function modeled after x_draw_glyph_string_box (). { /* Run and wait for events. We must always send one NX_APPDEFINED event to ourself, otherwise [NXApp run] will never exit. */ - send_appdefined = YES; ns_send_appdefined (-1); [NSApp run]; @@ -4907,7 +4908,6 @@ Function modeled after x_draw_glyph_string_box (). // outerpool = [[NSAutoreleasePool alloc] init]; - send_appdefined = YES; if (nr > 0) { pthread_mutex_lock (&select_mutex); @@ -4951,7 +4951,6 @@ Function modeled after x_draw_glyph_string_box (). else /* No timeout and no file descriptors, can this happen? */ { /* Send appdefined so we exit from the loop. */ - ns_send_appdefined (-1); } block_input (); @@ -6051,10 +6050,6 @@ - (void)sendEvent: (NSEvent *)theEvent last_appdefined_event_data = [theEvent data1]; [self stop: self]; } - else - { - send_appdefined = YES; - } } @@ -7727,7 +7722,7 @@ - (void)mouseMoved: (NSEvent *)e help_echo_object, help_echo_pos); } - if ((*emacsframe)->mouse_moved && send_appdefined) + if ((*emacsframe)->mouse_moved) ns_send_appdefined (-1); } @@ -8336,8 +8331,7 @@ - (void)windowDidExpose: sender SET_FRAME_VISIBLE (*emacsframe, 1); SET_FRAME_GARBAGED (*emacsframe); - if (send_appdefined) - ns_send_appdefined (-1); + ns_send_appdefined (-1); } -- 2.46.0 --=-=-=--