From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id EDF38385E00B for ; Mon, 8 Jan 2024 15:25:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EDF38385E00B 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 EDF38385E00B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704727524; cv=none; b=xbvc0lIFzTyvfaVCMJ6FvAd9q2FOdufYXo3peDZmjHPz8Fif2eRCyauzvSOgo7OTDjm2jE35gCUoN8UsvtsAHSEnBQ1iaXiZ4BhFGAEhs+IzL26TQyvlE8IfNXJ04sZNKa15W0fbgfpMwWNviC4wo5vBtt9J/EeU0DbOad6New8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704727524; c=relaxed/simple; bh=apNACL0gCmwL60/wYEBjthmJT3PLOAHmRGgIM1oWRg8=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=Red+UsAv4bdcfEzm+N7VEDaqfmbIXqsrSaaoo+CayuHBU0569fr6p8fPPCLG0oMFF7HEQ7sYq7QI+nSi2uXKnDRnRHar/kjdW4YtLtDDqjwnjQnbVLMEC7T4R0SjLjHNRAOXCc/BlGjrUZiS6tP/qZjC8NDRpMLLR50TnFd46vE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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-out2.suse.de (Postfix) with ESMTPS id CD07B1F7A7 for ; Mon, 8 Jan 2024 15:25:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704727521; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Tfj4PmmFGT+ZfFKJ+lepFhY1IENKK7QQhCXAejsdS6s=; b=eupBophsgLmaLuFneCuNY6x6qtaxS1MFdqIjtR3sbPLvMiKf3aZAK5XK9VBDFeL1m43uh9 EliwlFMZvIvN16v8qfN9txvg8JVFAIgEBwmgUmc2Z8F8qzYyT8xaKieDkI7V+olnGSQmck yb5+rXTNijowKTf/LNlAEAERPE0o1j0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704727521; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Tfj4PmmFGT+ZfFKJ+lepFhY1IENKK7QQhCXAejsdS6s=; b=KCgSIEbHjCYFLV0V4k9PZWFB777Lltk5wbEUyuk2jV3xH9B42l5FT4BZxW/uqvY3jsD8g4 bpQzzLjjAId8z3Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1704727521; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Tfj4PmmFGT+ZfFKJ+lepFhY1IENKK7QQhCXAejsdS6s=; b=eupBophsgLmaLuFneCuNY6x6qtaxS1MFdqIjtR3sbPLvMiKf3aZAK5XK9VBDFeL1m43uh9 EliwlFMZvIvN16v8qfN9txvg8JVFAIgEBwmgUmc2Z8F8qzYyT8xaKieDkI7V+olnGSQmck yb5+rXTNijowKTf/LNlAEAERPE0o1j0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1704727521; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Tfj4PmmFGT+ZfFKJ+lepFhY1IENKK7QQhCXAejsdS6s=; b=KCgSIEbHjCYFLV0V4k9PZWFB777Lltk5wbEUyuk2jV3xH9B42l5FT4BZxW/uqvY3jsD8g4 bpQzzLjjAId8z3Ag== 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 B50E313CA7 for ; Mon, 8 Jan 2024 15:25:21 +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 oDrcKuETnGWgUQAAD6G6ig (envelope-from ) for ; Mon, 08 Jan 2024 15:25:21 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 3/3] [gdb] Fix assertion failure for checkpoint delete 0 Date: Mon, 8 Jan 2024 16:25:53 +0100 Message-Id: <20240108152553.4578-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240108152553.4578-1-tdevries@suse.de> References: <20240108152553.4578-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 3.66 X-Spamd-Result: default: False [3.66 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.04)[57.75%] X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,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: When doing "checkpoint delete 0" we run into an assertion failure: ... +delete checkpoint 0 inferior.c:406: internal-error: find_inferior_pid: Assertion `pid != 0' failed. ... Fix this by handling the "pptid == null_ptid" case in delete_checkpoint_command. Tested on x86_64-linux. PR gdb/31209 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id --- gdb/linux-fork.c | 11 +++++++++++ gdb/testsuite/gdb.base/checkpoint.exp | 14 ++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index 659264ab712..64b83e79204 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -537,6 +537,17 @@ Please switch to another checkpoint before deleting the current one")); delete_fork (ptid); + if (pptid == null_ptid) + { + int status; + /* Wait to collect the inferior's exit status. Do not check whether + this succeeds though, since we may be dealing with a process that we + attached to. Such a process will only report its exit status to its + original parent. */ + waitpid (ptid.pid (), &status, 0); + return; + } + /* If fi->parent_ptid is not a part of lwp but it's a part of checkpoint list, waitpid the ptid. If fi->parent_ptid is a part of lwp and it is stopped, waitpid the diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp index 9ba5b3e82ec..d318fc785b8 100644 --- a/gdb/testsuite/gdb.base/checkpoint.exp +++ b/gdb/testsuite/gdb.base/checkpoint.exp @@ -336,3 +336,17 @@ verbose "Timeout now $timeout sec." # # Finished: cleanup # + +# +# Now let's try to delete checkpoint 0. +# + +with_test_prefix "delete checkpoint 0" { + clean_restart $binfile + runto_main + + gdb_test "checkpoint" "checkpoint 1: fork returned pid $decimal\\." + gdb_test "restart 1" "Switching to process $decimal\r\n.*" + gdb_test "delete checkpoint 0" "Killed process $decimal" + gdb_test "info checkpoints" [string_to_regexp "No checkpoints."] +} -- 2.35.3