From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6D0123858C5F for ; Thu, 8 Feb 2024 11:18:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6D0123858C5F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6D0123858C5F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707391123; cv=none; b=iCpxkE1/OPRNQtVHjMggZGnx7QbvEg5RfCL8NDEgrWTEYJ4W7xl9yTGKoLrfF2RM+t2IMY48fPJLiwacXt2Ci+Fr9wVmBSpjbFHWxWyU8br/zWnlxcWNv8gNT3eui/gG/L4cWRsX4XRFi6o9cFg70wpEKs3ewcOE5ItQ9IAx3LQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707391123; c=relaxed/simple; bh=IHIruR61s9vmnVDXoUSFpazTuqYJtg9x1rQftNAn9ag=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=pOUQfbjyF8XgyKNG/wX54y4+zkO2JURQcACrjEfgQyr7p/82UTk/QOromliVcTOLG9GpSbUbrrMIxLcWar+0Q3iXr+m5n5IDukFJkEVkxEeepvDcZ22OSqN41JoDVhd9ZeEH32HYS3Y1gK6R0EDFbMp5LGJuh+KxfYPwekxqOVA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707391120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ym3Znp6pBhqn4hRFNfWEuJVavTLPb3iwrmnR+r4k/sk=; b=X+YK6Bk1SECWIFxLw6af/B3j5ZlTw1U6KyscNYJNbOWCyh0Su+c6dSSgk+JQ9rtxVRBpZc nOUmyvC84jU+lUucA7LsvGA8NaVRLYAZKDoMslc/pHnSnXlzxVFeYCg1jLckuEXdGuEHJO URiYwm0ow5LUUa5r6V6dQDZ329DvYbA= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-70-y0F1D67WPAqmitpX_VZPBQ-1; Thu, 08 Feb 2024 06:18:38 -0500 X-MC-Unique: y0F1D67WPAqmitpX_VZPBQ-1 Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-51147e15397so1649328e87.3 for ; Thu, 08 Feb 2024 03:18:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707391116; x=1707995916; h=mime-version: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=Ym3Znp6pBhqn4hRFNfWEuJVavTLPb3iwrmnR+r4k/sk=; b=AaMtPGJgWrn0MiR8NggnMtqBmVhLN1O749QZ3bz1ZE9uOTA6nI6flSUpP0y5t5Q4IY TyQAIU+g94snJWWK/pHHbvG9RNCn4RHk2n7dXEkHxoWSkdXXLi8H/ZqWOcv+0GkJoCc1 rVDGs5jPyikZgQwY94jW+p3o/SrI4iBZJrdLC6uGm+PpwmwN+N5mDSgHS7qcU61nmTHG LikssOVWui2z0W6lfqv8W48IUzrL9Ae1olBEaGAqVVG4yvf8rNBb+8hYT4Be4P/An3+R f5xjANuHlX0KpBwaAn4+6/RZsCEuTlb2rBGyLyhbtvVLv5tMdeKe3kFH+5tylpOuttLz rzjA== X-Gm-Message-State: AOJu0Yz7lo8viVf7ivPEOFy4Nl2ffs+JFWriqu+tNCCROxJBLU0UdEKc e4NI349ETn987DAYmjvC1xzkc6iK9tlLrrqnNoJNTAWjfRweo5j+/S73CIFGot6geGDthUWbiaF sxl4XX9XwdoSycEMqEjIGxifQS3yOnKd4v+ypUrAKiOrMma1RK+m3yaW1vBBqp6dBTWU= X-Received: by 2002:ac2:42c5:0:b0:511:531f:1d9 with SMTP id n5-20020ac242c5000000b00511531f01d9mr5548033lfl.21.1707391116538; Thu, 08 Feb 2024 03:18:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbIRnCESYY5D7sFspuPV0FdZWgNXp5NqjN/CRt00olv2QL3ZR1L5974mfXjBA0KHinOzsolA== X-Received: by 2002:ac2:42c5:0:b0:511:531f:1d9 with SMTP id n5-20020ac242c5000000b00511531f01d9mr5548025lfl.21.1707391116120; Thu, 08 Feb 2024 03:18:36 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXiUP+3mI+1obAFayCZIiJW/Pxvwh4zHxEqIBV0OEDmYIZNRzt6ynZ6yaMEC2NlNGpUIHL8cYiYtsjy5G7XDdvvyrQCGEdg5UFoBw== Received: from localhost ([62.31.95.162]) by smtp.gmail.com with ESMTPSA id l5-20020a05600002a500b0033b45bdb2a1sm3452370wry.4.2024.02.08.03.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 03:18:35 -0800 (PST) From: Andrew Burgess To: Tom Tromey , gdb-patches@sourceware.org Cc: Tom de Vries Subject: Re: [PATCH v2 08/14] Remove the TUI register window rerender overload In-Reply-To: <20240120-tui-regs-cleanup-v2-8-a3cccc6a3573@tromey.com> References: <20240120-tui-regs-cleanup-v2-0-a3cccc6a3573@tromey.com> <20240120-tui-regs-cleanup-v2-8-a3cccc6a3573@tromey.com> Date: Thu, 08 Feb 2024 11:18:34 +0000 Message-ID: <878r3v8ar9.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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: Tom Tromey writes: > After these restructurings, it should be clear that the rerender > overload can be removed from the TUI register window. This is done by > moving a bit more logic from show_registers into update_register_data. > After this, update_register_data simply updates the internal state, > and rerender will write to the screen. All the actual rendering work > is done, ultimately, by display_registers_from. This split between > updating the mode and rendering makes it clear that the recursive case I think you mean 'updating the model' here? Thanks, Andrew > can't happen any longer. > > Tested-By: Tom de Vries > Reviewed-By: Andrew Burgess > --- > gdb/tui/tui-regs.c | 51 ++++++++++++++++++++++----------------------------- > gdb/tui/tui-regs.h | 14 ++++++-------- > 2 files changed, 28 insertions(+), 37 deletions(-) > > diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c > index 7af572c9da4..52cf6b7efdf 100644 > --- a/gdb/tui/tui-regs.c > +++ b/gdb/tui/tui-regs.c > @@ -165,30 +165,32 @@ tui_data_window::first_reg_element_no_inline (int line_no) const > and refresh the window. */ > void > tui_data_window::show_registers (const reggroup *group) > +{ > + update_register_data (group); > + rerender (); > +} > + > +/* Set the data window to display the registers of the register group > + using the given frame. */ > + > +void > +tui_data_window::update_register_data (const reggroup *group) > { > if (group == nullptr) > group = general_reggroup; > > - if (target_has_registers () && target_has_stack () && target_has_memory ()) > - update_register_data (group, get_selected_frame (nullptr)); > - else > + if (!target_has_registers () > + || !target_has_stack () > + || !target_has_memory ()) > { > set_title (_("Registers")); > m_current_group = nullptr; > m_regs_content.clear (); > + return; > } > > - rerender (false); > -} > - > + frame_info_ptr frame = get_selected_frame (nullptr); > > -/* Set the data window to display the registers of the register group > - using the given frame. */ > - > -void > -tui_data_window::update_register_data (const reggroup *group, > - frame_info_ptr frame) > -{ > m_current_group = group; > > /* Make a new title showing which group we display. */ > @@ -221,6 +223,9 @@ tui_data_window::update_register_data (const reggroup *group, > void > tui_data_window::display_registers_from (int start_element_no) > { > + werase (handle.get ()); > + check_and_display_highlight_if_needed (); > + > /* In case the regs window is not boxed, we'll write the last char in the > last line here, causing a scroll, so prevent that. */ > scrollok (handle.get (), FALSE); > @@ -357,29 +362,18 @@ tui_data_window::erase_data_content (const char *prompt) > x_pos = half_width - strlen (prompt); > display_string (height / 2, x_pos, prompt); > } > - tui_wrefresh (handle.get ()); > } > > /* See tui-regs.h. */ > > void > -tui_data_window::rerender (bool toplevel) > +tui_data_window::rerender () > { > if (m_regs_content.empty ()) > - { > - if (toplevel && has_stack_frames ()) > - { > - frame_info_ptr fi = get_selected_frame (NULL); > - check_register_values (fi); > - } > - else > - erase_data_content (_("[ Register Values Unavailable ]")); > - } > + erase_data_content (_("[ Register Values Unavailable ]")); > else > - { > - erase_data_content (NULL); > - display_registers_from (0); > - } > + display_registers_from (0); > + tui_wrefresh (handle.get ()); > } > > > @@ -401,7 +395,6 @@ tui_data_window::do_scroll_vertical (int num_to_scroll) > if (first_line >= 0) > { > first_line += num_to_scroll; > - erase_data_content (NULL); > display_registers_from_line (first_line); > } > } > diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h > index 1b0eaa2033b..7f1c30ca5d6 100644 > --- a/gdb/tui/tui-regs.h > +++ b/gdb/tui/tui-regs.h > @@ -62,7 +62,10 @@ struct tui_register_info > /* The TUI registers window. */ > struct tui_data_window : public tui_win_info > { > - tui_data_window () = default; > + tui_data_window () > + { > + update_register_data (nullptr); > + } > > DISABLE_COPY_AND_ASSIGN (tui_data_window); > > @@ -87,11 +90,7 @@ struct tui_data_window : public tui_win_info > { > } > > - void rerender (bool toplevel); > - void rerender () override > - { > - rerender (true); > - } > + void rerender () override; > > private: > > @@ -116,8 +115,7 @@ struct tui_data_window : public tui_win_info > display off the end of the register display. */ > void display_reg_element_at_line (int start_element_no, int start_line_no); > > - void update_register_data (const reggroup *group, > - frame_info_ptr frame); > + void update_register_data (const reggroup *group); > > /* Answer the number of the last line in the regs display. If there > are no registers (-1) is returned. */ > > -- > 2.43.0