From patchwork Sat Dec 9 08:24:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 81780 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2BC793858409 for ; Sat, 9 Dec 2023 08:25:19 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id F21853858CD1 for ; Sat, 9 Dec 2023 08:24:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F21853858CD1 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 F21853858CD1 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=1702110290; cv=none; b=hzC0Ipiqw+FAikM9lX78ITjyzzqNAkGWuVlxgTAre2ryoUnPTc9tBEnUq12+Q6pmdh3sBvEYayD1/UDJPPY9IS5/+B5bmvg1214UE3is/wotLGWykALVDkpVAyHWRM0p7JYDFcMSHfiIZN3Fa6Q+KYKxjaPi/kbKG/e9P5sWPFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702110290; c=relaxed/simple; bh=T7ynXZKWNm35gStvZJId3I5n7P5SBlOFeEEeMgZvXGA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=AMTkOCrMwwGlTeCLxiz9e+2bLqkRAnBiJ+yQC8FQ5WYbVuekVzTLptW/ZJWUO4+w6eQapkyyoQ5yZtf75NvoxVJ8C3VHYFlMQOOInDF454Q3wHz+6LPUp24m2S7A2lBF3WqhqiGYtC74CCl/+NaonUorAoOIHMP8LnWsbYHF9r0= 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 802DB21A9A; Sat, 9 Dec 2023 08:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702110284; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vvwjuHJRPgbSio/S/Ds9dn2GWGFUZoKIij3ZuSmiUEk=; b=UdKZnGJhN4IE7Ayolay33Clz5vAmamR56HoLtE2uUFJHbJ773TFgh8/gwzHydE7QPu1E4s plU3lWqc+XDlmnSEMMwnZP5jMH5vgIDKRyJD0q2Ihv/RcQYMKwKtRaNKLXQ7kL1UXUagXX k7Ot8dIjHmBuNz0qI7rbqX7JY35fWD0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702110284; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vvwjuHJRPgbSio/S/Ds9dn2GWGFUZoKIij3ZuSmiUEk=; b=QosL1h0v4Kp399R/MJE3hLuePDNPYIKRWi7y8+30K4Cn/zUlROdTO0GGGqxVPwst6JqY+Q y0m49TtcNw1GgeCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702110284; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vvwjuHJRPgbSio/S/Ds9dn2GWGFUZoKIij3ZuSmiUEk=; b=UdKZnGJhN4IE7Ayolay33Clz5vAmamR56HoLtE2uUFJHbJ773TFgh8/gwzHydE7QPu1E4s plU3lWqc+XDlmnSEMMwnZP5jMH5vgIDKRyJD0q2Ihv/RcQYMKwKtRaNKLXQ7kL1UXUagXX k7Ot8dIjHmBuNz0qI7rbqX7JY35fWD0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702110284; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vvwjuHJRPgbSio/S/Ds9dn2GWGFUZoKIij3ZuSmiUEk=; b=QosL1h0v4Kp399R/MJE3hLuePDNPYIKRWi7y8+30K4Cn/zUlROdTO0GGGqxVPwst6JqY+Q y0m49TtcNw1GgeCg== 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 5EB9C136D6; Sat, 9 Dec 2023 08:24:44 +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 GRMIFUwkdGWZeAAAD6G6ig (envelope-from ); Sat, 09 Dec 2023 08:24:44 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] [gdb/tui] Assert on tui_refreshing_registers recursion Date: Sat, 9 Dec 2023 09:24:53 +0100 Message-Id: <20231209082453.21019-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: 18.27 X-Spamd-Bar: + Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=UdKZnGJh; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=QosL1h0v; dmarc=pass (policy=none) header.from=suse.de; spf=softfail (smtp-out1.suse.de: 2a07:de40:b281:104:10:150:64:97 is neither permitted nor denied by domain of tdevries@suse.de) smtp.mailfrom=tdevries@suse.de X-Rspamd-Server: rspamd2 X-Spamd-Result: default: False [1.09 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; BAYES_SPAM(5.10)[100.00%]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[suse.de:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(0.00)[suse.de,none]; MX_GOOD(-0.01)[]; DMARC_POLICY_ALLOW_WITH_FAILURES(-0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; WHITELIST_DMARC(-7.00)[suse.de:D:+]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: 1.09 X-Rspamd-Queue-Id: 802DB21A9A X-Spam-Flag: NO X-Spam-Status: No, score=-12.4 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org In gdb/tui/tui-hooks.c, we have a variable: ... /* Prevent recursion of deprecated_register_changed_hook(). */ static bool tui_refreshing_registers = false; ... I tried to detect the moment it's preventing recursion, both by running the TUI testsuite and test-driving TUI, but didn't manage. Change the behaviour from preventing recursion to asserting on detecting recursion. Also as a cleanup, fold usage of the variable into a single function. Tested on x86_64-linux. --- gdb/tui/tui-hooks.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) base-commit: 95385060771b0cac95a39320c44eca857fb177ae diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c index 6525f0f2b6c..fa9fd443db2 100644 --- a/gdb/tui/tui-hooks.c +++ b/gdb/tui/tui-hooks.c @@ -63,8 +63,28 @@ static void tui_all_objfiles_removed (program_space *pspace) { tui_on_objfiles_changed (); } -/* Prevent recursion of deprecated_register_changed_hook(). */ -static bool tui_refreshing_registers = false; +/* As TUI_DATA_WIN->check_register_values, but with recursion detection. */ + +static void +check_register_values (frame_info_ptr fi) +{ + static bool tui_refreshing_registers = false; + + if (tui_refreshing_registers) + { + /* Recursion detected. We used to stop recursion here, but we + think it no longer occurs, so instead we detect it verbosely. + If we don't manage to trigger it for a while, we can just remove the + detection. */ + gdb_assert_not_reached ("recursion detected in check_register_values"); + } + else + { + tui_refreshing_registers = true; + TUI_DATA_WIN->check_register_values (fi); + tui_refreshing_registers = false; + } +} /* Observer for the register_changed notification. */ @@ -82,12 +102,7 @@ tui_register_changed (frame_info_ptr frame, int regno) up in the other. So we always use the selected frame here, and ignore FRAME. */ fi = get_selected_frame (NULL); - if (!tui_refreshing_registers) - { - tui_refreshing_registers = true; - TUI_DATA_WIN->check_register_values (fi); - tui_refreshing_registers = false; - } + check_register_values (fi); } /* Breakpoint creation hook. @@ -145,11 +160,7 @@ tui_refresh_frame_and_register_information () /* Refresh the register window if it's visible. */ if (tui_is_window_visible (DATA_WIN) && (frame_info_changed_p || from_stack)) - { - tui_refreshing_registers = true; - TUI_DATA_WIN->check_register_values (fi); - tui_refreshing_registers = false; - } + check_register_values (fi); } else if (!from_stack) {