From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id F18923858D28 for ; Mon, 4 Mar 2024 12:26:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F18923858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F18923858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709555180; cv=none; b=CtolQVvX6edTKXDAedq27wv8+zpxNMkdD7mb+mmw2JjC6hHI7+rWmR40yZsS6X5CmikU0yHsTFWBPFYhndv9AIfOZkVqlXxngo0DFK/6DYB1Qrw0zshxioWr1OY3DBVeE7Cz1A5M2yjKBfd4nvF8pksQsG9PlamLNlnnsModrRI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709555180; c=relaxed/simple; bh=XR+pJJbWydYWJsk0ngu9la2Np942OMlI8jGf4Cmawyo=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:From:To; b=uxFTL5+dBXXSLrb36P/J8SIpViJA2NehzZHU+SrAlszBVzxcQXNbQr3PKiq9T8hUNG9OTKDnkVpkV+87cnIzPdp29MbeTAzhQl2xJkJzPyHwuhUay9xPJhXkMr4fva2sRsBF7aIcBGXIPYt4rSvpB+HasyluROxZL9RBls8ZA84= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DBBB53F537 for ; Mon, 4 Mar 2024 12:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709555178; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DA1+aScIoQaYKRypfa2oYktPwg4q2AxHc608mApVaeI=; b=OdGbZcMn8SM+LhrygNPFu36Lvuqh3mYuiO/AcBStNYMu0wrWS0nDhQWhixntbhhW6gaXuC AkEQlix5xUW4zc0D3AbqF7OwJKO3ZQa2j/IoAZudbAJeC920ABc+4DkeSq8ahaxdxoI5M+ RHECXxsCFbZyHO1EV8twoSoO8abKTtE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709555178; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DA1+aScIoQaYKRypfa2oYktPwg4q2AxHc608mApVaeI=; b=Jt7qcbo/kTsQ9TUKsERBVTHELNK4VgpPFcZ8A/qIpv4DXLwryz1obHLvXghtpODneo18An JledBbbt8O4w9qBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709555177; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DA1+aScIoQaYKRypfa2oYktPwg4q2AxHc608mApVaeI=; b=MkiXSuZTOcXSdCvrJmzeYkCjXiweexYCwr/Qc1kpJ6YOVFCU+vVj/N2E5YiwBOsFdIIGJ1 WDpi3OtgEB6Qn6j1qCWktgWPZPnjaPtpP+942Td1wWPCvvQzU3TGRCZWVJw1NuMIGXL3B7 GkzfvKZrIw6Fp4slkMemRPhOLY1Z7U0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709555177; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DA1+aScIoQaYKRypfa2oYktPwg4q2AxHc608mApVaeI=; b=5Myt/Loutw51jdfZlsHQuHlcAtPBFdvqOtOUlWSIaXD6x/b1W7KnGCPiN9qBodJP3TZuYY TY6Q+cugvinRsEAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C9FBF13A58 for ; Mon, 4 Mar 2024 12:26:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id L7jZL+m95WX7NAAAD6G6ig (envelope-from ) for ; Mon, 04 Mar 2024 12:26:17 +0000 Message-ID: Date: Mon, 4 Mar 2024 13:26:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] [gdb] Prune inferior after switching inferior Content-Language: en-US From: Tom de Vries To: gdb-patches@sourceware.org References: <20240304122120.27659-1-tdevries@suse.de> In-Reply-To: <20240304122120.27659-1-tdevries@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=MkiXSuZT; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="5Myt/Lou" X-Spamd-Result: default: False [-3.30 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; XM_UA_NO_VERSION(0.01)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: DBBB53F537 X-Spam-Level: X-Spam-Score: -3.30 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 3/4/24 13:21, Tom de Vries wrote: > Usually with test-case gdb.python/py-progspace-events.exp I get: > ... > (gdb) inferior 1^M > [Switching to inferior 1 [process 4116] (py-progspace-events)]^M > [Switching to thread 1.1 (Thread 0xf77d0ce0 (LWP 4116))]^M > 28 { /* Nothing. */ }^M > (gdb) PASS: gdb.python/py-progspace-events.exp: inferior 1 > step^M > FreeProgspaceEvent: ^M > do_parent_stuff () at py-progspace-events.c:41^M > 41 ++global_var;^M > (gdb) PASS: gdb.python/py-progspace-events.exp: step > ... > > But occasionally I run into the following FAIL: > ... > (gdb) inferior 1^M > [Switching to inferior 1 [process 5199] (py-progspace-events)]^M > [Switching to thread 1.1 (Thread 0xf77d0ce0 (LWP 5199))]^M > 28 { /* Nothing. */ }^M > (gdb) FreeProgspaceEvent: ^M > FAIL: gdb.python/py-progspace-events.exp: inferior 1 (timeout) > ... > > This is caused by a race between the handling of an event, and the > "inferior 1" command. > > In the passing case, the event is handled first. During which prune_inferiors > is called, but it can't remove inferior 1, because it's still the current one. > I just spotted two mistakes in the commit log. -can't remove inferior 1 +can't remove inferior 2 > In the failing case, the "inferior 1" command is handled first. Then during > handling of the event, prune_inferiors is called, and it can remove inferior 1 > because it's no longer the current one. > -can remove inferior 1 +can remove inferior 2 I'll update this locally. Thanks, - Tom > This looks like a test-case issue to me, but ISTM that we can do better: by > calling prune_inferiors asap, at the end of the "inferior 1" command, we > stabilize the moment when the inferior is removed: > ... > (gdb) inferior 1^M > [Switching to inferior 1 [process 5199] (py-progspace-events)]^M > [Switching to thread 1.1 (Thread 0xf77d0ce0 (LWP 5199))]^M > 28 { /* Nothing. */ }^M > FreeProgspaceEvent: ^M > (gdb) PASS: gdb.python/py-progspace-events.exp: inferior 1 > ... > > Tested on x86_64-linux. > > PR gdb/31440 > Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31440 > --- > gdb/inferior.c | 4 +++ > .../gdb.python/py-progspace-events.exp | 31 +++---------------- > 2 files changed, 9 insertions(+), 26 deletions(-) > > diff --git a/gdb/inferior.c b/gdb/inferior.c > index 5ff5eb98955..4e179f7fb80 100644 > --- a/gdb/inferior.c > +++ b/gdb/inferior.c > @@ -791,6 +791,10 @@ inferior_command (const char *args, int from_tty) > notify_user_selected_context_changed > (USER_SELECTED_INFERIOR); > } > + > + /* Switching current inferior may have made one of the inferiors > + prunable, so prune it. */ > + prune_inferiors (); > } > } > > diff --git a/gdb/testsuite/gdb.python/py-progspace-events.exp b/gdb/testsuite/gdb.python/py-progspace-events.exp > index 95e4ca8da0b..9dfc7573d40 100644 > --- a/gdb/testsuite/gdb.python/py-progspace-events.exp > +++ b/gdb/testsuite/gdb.python/py-progspace-events.exp > @@ -79,37 +79,16 @@ gdb_test "continue" \ > "\\\[Inferior $decimal \[^\r\n\]+ exited normally\\\]"] \ > "continue until inferior 2 exits" > > -gdb_test "inferior 1" "\\\[Switching to inferior 1 .*" > - > -# Step the inferior. During this process GDB will prune the now > +# Switch to inferior 1. During this process GDB will prune the now > # defunct inferior, which deletes its program space, which should > # trigger the FreeProgspaceEvent. > # > -# However, there is a slight problem. When the target is remote, and > -# GDB is accessing files using remote fileio, then GDB will attempt to > -# prune the inferior at a point in time when the remote target is > -# waiting for a stop reply. Pruning an inferior causes GDB to close > -# files associated with that inferior. > -# > -# In non-async mode we can't send fileio packets while waiting for a > -# stop reply, so the attempts to close files fails, and this shows up > -# as an error. > -# > -# As this error has nothing to do with the feature being tested here, > -# we just accept the error message, the important part is the > -# 'FreeProgspaceEvent' string, so long as that appears (just once) > -# then the test is a success. > -set warning_msg \ > - [multi_line \ > - "warning: cannot close \"\[^\r\n\]+\": Cannot execute this command while the target is running\\." \ > - "Use the \"interrupt\" command to stop the target" \ > - "and then try again\\."] > > -gdb_test "step" \ > +gdb_test "inferior 1" \ > [multi_line \ > - "^FreeProgspaceEvent.*: (?:\r\n$warning_msg)*" \ > - "do_parent_stuff \\(\\) at \[^\r\n\]+" \ > - "$decimal\\s+\[^\r\n\]+"] > + "\\\[Switching to inferior 1 .*" \ > + ".*" \ > + "FreeProgspaceEvent.*: "] > > # Let this inferior run to completion. > gdb_continue_to_end > > base-commit: 1485a3fb63619cced99dd7a4a043cf01a0f423d9