From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 3EDC63858288 for ; Wed, 7 Jun 2023 12:58:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3EDC63858288 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 54F27219FE; Wed, 7 Jun 2023 12:58:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686142712; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O0bCIPWkW8YwhW7DeAWIUDaCOnjrrMzaqPB22Mmuwt8=; b=vH9uU7EJU7UhY/DYlNnQ6CTgBTBxK9skOY5RHmR/Jt+r3QuZJEFdo+e0AvfqbgNMHpcsQr mNF8F7/RsPicsQejDklQM+lfDxm71QokGKwhMgDvYO4uX3Z2x35FLe7vOG9amyGVpXRyLX /WMXuxA6d+T8w3BTk/D5VGYwddktijU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686142712; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O0bCIPWkW8YwhW7DeAWIUDaCOnjrrMzaqPB22Mmuwt8=; b=RGxKbTiotUlOQuTREh0lc6tpBQw0s5TPSgO9gaQda1K+gkXfqLiQkTNQKBvdSLvA1yIuy4 QDnEuDhC0W8LR/Dw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 31AA71346D; Wed, 7 Jun 2023 12:58:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id NA60CPh+gGQOVwAAMHmgww (envelope-from ); Wed, 07 Jun 2023 12:58:32 +0000 Message-ID: <16ebf4ee-f5ea-89e8-0522-be79261c7e9d@suse.de> Date: Wed, 7 Jun 2023 14:58:36 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH] [gdb/cli] Handle pending ^C after rl_callback_read_char for readline 7 Content-Language: en-US To: gdb-patches@sourceware.org Cc: Simon Marchi References: <20230524104109.19357-1-tdevries@suse.de> From: Tom de Vries In-Reply-To: <20230524104109.19357-1-tdevries@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,DKIM_INVALID,DKIM_SIGNED,GIT_PATCH_0,KAM_DMARC_STATUS,KAM_NUMSUBJECT,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 5/24/23 12:41, Tom de Vries via Gdb-patches wrote: > In commit faf01aee1d0 ("[gdb] Handle pending ^C after rl_callback_read_char") > we handled a problem (described in detail in that commit) for readline >= 8 > using public readline functions rl_pending_signal and rl_check_signals. > > For readline 7 (note that we require at least readline 7 so there's no need to > worry about readline 6), there was no fix though, because rl_check_signals was > not available. > > Fix this by instead using the private readline function _rl_signal_handler. > > There is precedent for using private readline variables and functions, but > it's something we want to get rid of (PR build/10723). Nevertheless, I think > we can allow this specific instance because it's not used when building > against readline >= 8. > > [ In the meanwhile, a fix was committed in the devel branch of the readline > repo, contained in commit 8d0c439 ("rollup of changes since readline-8.2"), > first proposed here ( > https://lists.gnu.org/archive/html/bug-readline/2022-10/msg00008.html ). ] > Committed. Thanks, - Tom > Tested on x86_64-linux, against system readline 7.0 on openSUSE Leap 15.4. > > PR cli/27813 > Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27813 > --- > gdb/event-top.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/gdb/event-top.c b/gdb/event-top.c > index 193ea5363ff..005ef4b7054 100644 > --- a/gdb/event-top.c > +++ b/gdb/event-top.c > @@ -137,6 +137,9 @@ static struct async_signal_handler *async_sigterm_token; > character is processed. */ > void (*after_char_processing_hook) (void); > > +#if RL_VERSION_MAJOR == 7 > +EXTERN_C void _rl_signal_handler (int); > +#endif > > /* Wrapper function for calling into the readline library. This takes > care of a couple things: > @@ -203,8 +206,14 @@ gdb_rl_callback_read_char_wrapper_noexcept () noexcept > pending signal. I'm not sure if that's possible, but it seems > better to handle the scenario than to assert. */ > rl_check_signals (); > +#elif RL_VERSION_MAJOR == 7 > + /* Unfortunately, rl_check_signals is not available. Use private > + function _rl_signal_handler instead. */ > + > + while (rl_pending_signal () != 0) > + _rl_signal_handler (rl_pending_signal ()); > #else > - /* Unfortunately, rl_check_signals is not available. */ > +#error "Readline major version >= 7 expected" > #endif > if (after_char_processing_hook) > (*after_char_processing_hook) (); > > base-commit: 014a602b86f08de96fc80ef3f96a87db6cccad56