From patchwork Tue May 14 13:37:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 90117 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 78A143875411 for ; Tue, 14 May 2024 13:38:00 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by sourceware.org (Postfix) with ESMTPS id 0DEB6384AB64 for ; Tue, 14 May 2024 13:37:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0DEB6384AB64 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0DEB6384AB64 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::132 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715693858; cv=none; b=UQ68SyC7j07w1gZR22wlQ2MCkT6xVM56brEK9pDBg47EqnQwJjiN1s76F5IsT6/23t+kgGVT6+xzW8k5ei3ezSJIFAk7UE6GatYIx7aFdNT96Jnhuzw9aES1QSSlwILKvqC1aKrou0h9Ul+zWULkYzUIxN63+UsLspp+u4zQx6c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715693858; c=relaxed/simple; bh=nCrb7JGjcKK2hJ+eflGaXYZsTB5OPxByg6Mly/MQXuk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=pNNqYHDbL0t92NK0QNC+cjB7+mLJOCeGVKtEoC9Hy2XF3kkkJmlr+sKoehTurkn2oEZWZ6P47/Ucsxs0piyxtWxow/ni9yXYCBBj4MV+1wlU1uQYw/1fRD4x9xhHrm6icUjGqnPY8PMSrC7JA+vkWlGXDCdwbLKmGsXHOtO4l5A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-36cc8dbe09aso18390055ab.2 for ; Tue, 14 May 2024 06:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1715693855; x=1716298655; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/RBRod1h7/oZCaxFJIwqzZmSfcZLW1XVintXuXdn9ws=; b=Nc9/QD0JBv0vLRVS+SmA17luVsfDiw/wwmv7hpH+a7ZpEyC4LF+2ZZFK+GRJ+f2/da UJDCH344Il3dPdZ6BopczG0qvx3/qlBegVxMh+AMUyQBy/twY+syKVtoUrPehP3s/eY7 qnTdJtiNJW44G3jHpKJZWMgVP34gnI7YPKN+dhzSJ78KnBqe0d6rZ1bRtxJ8RIy48mZO qSUOfPO9wTxUxcKx/zN63NHPti2EAO7qOHlgoKfBBOVcdVqqKlz2prwCJ1LTFh2AAnKg oO6Vh1eMNtj+GItcGkoMPmMM84Q9kZfEjqr83kB28gaEDalTvqgbC5WelrFCA2ovnsX7 AmaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715693855; x=1716298655; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/RBRod1h7/oZCaxFJIwqzZmSfcZLW1XVintXuXdn9ws=; b=qd2H7MshDmAnVkRfVHOXctjxuCk8lZNFBS8lHt4D3mOChYT6QZG71l1qNwhcU0C6Ra 0miK5PLHl5slkAGVRXr1MeN7/iz5vIApHMS9PqxcQ9zhYh9lK/psOKHBxhPIP/yupWi/ 73Iwq9Y+Auq85aVtGobBm6VRKdrNBIIGciy6uNhKbpLTxIT6M/lMMkTFgRx9Auwvw+C1 9suCc7MAAY5jSFMV44/3RCyU7VfeK+ejRIhfP8NHl9vZHGyrQ6M4Gx1zwy8KzByU/S+L ocgWnDquYq1kR/EGeYfnPANBBTBv81ZHNw/IfACafzQytVvl2k2wyKQXnCHtddk++3jy H4bg== X-Gm-Message-State: AOJu0YyXH8b0Avi0ZFuF7k+Y4T0Pd+OQ4pcdAq+eNFF7+aT/ngEpLvwM I8OU7PjuQzo6SGNj0DpaPJi6jTSEtFDfP4WobSnpwsnAR9vV2bd42ASdyKtKcyA2cvflE9bkaQo = X-Google-Smtp-Source: AGHT+IG1HkuGfcEi+w+rQM1DA5y6+OejW+1avHPKt5827yoDQAz13FYptXKZfy7M1rb+Bd7fp9iLzA== X-Received: by 2002:a05:6e02:12ce:b0:36d:b36e:3c6d with SMTP id e9e14a558f8ab-36db36e4345mr5660245ab.10.1715693855112; Tue, 14 May 2024 06:37:35 -0700 (PDT) Received: from localhost.localdomain (75-166-134-4.hlrn.qwest.net. [75.166.134.4]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-36cb9d8dcf8sm26193765ab.39.2024.05.14.06.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 06:37:34 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Don't allow new-ui to start the TUI Date: Tue, 14 May 2024 07:37:24 -0600 Message-ID: <20240514133724.3726920-1-tromey@adacore.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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 The TUI can't really work properly with new-ui, at least not as currently written. This patch changes new-ui to reject an attempt. Attempting to make a DAP ui this way is also now rejected. Regression tested on x86-64 Fedora 38. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29273 --- gdb/interps.c | 5 ++++- gdb/interps.h | 10 ++++++++-- gdb/main.c | 2 +- gdb/python/py-dap.c | 3 +++ gdb/testsuite/gdb.base/new-ui.exp | 5 +++++ gdb/tui/tui-interp.c | 3 +++ gdb/ui.c | 2 +- 7 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 94a982e97ab..59c4ec532a7 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -187,13 +187,16 @@ interp_lookup (struct ui *ui, const char *name) /* See interps.h. */ void -set_top_level_interpreter (const char *name) +set_top_level_interpreter (const char *name, bool for_new_ui) { /* Find it. */ struct interp *interp = interp_lookup (current_ui, name); if (interp == NULL) error (_("Interpreter `%s' unrecognized"), name); + if (for_new_ui && !interp->supports_new_ui ()) + error (_("interpreter '%s' cannot be used with a new UI"), name); + /* Install it. */ interp_set (interp, true); } diff --git a/gdb/interps.h b/gdb/interps.h index bd435d734af..8d80c005ded 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -84,6 +84,10 @@ class interp : public intrusive_list_node virtual bool supports_command_editing () { return false; } + /* Returns true if this interpreter supports new UIs. */ + virtual bool supports_new_ui () const + { return true; } + const char *name () const { return m_name; } @@ -201,8 +205,10 @@ extern struct interp *interp_lookup (struct ui *ui, const char *name); /* Set the current UI's top level interpreter to the interpreter named NAME. Throws an error if NAME is not a known interpreter or the - interpreter fails to initialize. */ -extern void set_top_level_interpreter (const char *name); + interpreter fails to initialize. FOR_NEW_UI is true when called + from the 'new-ui' command, and causes an extra check to ensure the + interpreter is valid for a new UI. */ +extern void set_top_level_interpreter (const char *name, bool for_new_ui); /* Temporarily set the current interpreter, and reset it on destruction. */ diff --git a/gdb/main.c b/gdb/main.c index 8b81640e8d2..efc04a66bbb 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1147,7 +1147,7 @@ captured_main_1 (struct captured_main_args *context) /* Install the default UI. All the interpreters should have had a look at things by now. Initialize the default interpreter. */ - set_top_level_interpreter (interpreter_p.c_str ()); + set_top_level_interpreter (interpreter_p.c_str (), false); /* The interpreter should have installed the real uiout by now. */ gdb_assert (current_uiout != temp_uiout.get ()); diff --git a/gdb/python/py-dap.c b/gdb/python/py-dap.c index 861514d9002..d5555c90a11 100644 --- a/gdb/python/py-dap.c +++ b/gdb/python/py-dap.c @@ -62,6 +62,9 @@ class dap_interp final : public interp void pre_command_loop () override; + bool supports_new_ui () const override + { return false; } + private: std::unique_ptr m_ui_out; diff --git a/gdb/testsuite/gdb.base/new-ui.exp b/gdb/testsuite/gdb.base/new-ui.exp index 97166925c1b..2dfcbf7e108 100644 --- a/gdb/testsuite/gdb.base/new-ui.exp +++ b/gdb/testsuite/gdb.base/new-ui.exp @@ -183,6 +183,11 @@ proc_with_prefix do_test_invalid_args {} { "Interpreter `bloop' unrecognized" \ "new-ui with bad interpreter name" + # Test that the TUI cannot be used for a new UI. + gdb_test "new-ui tui $extra_tty_name" \ + "interpreter 'tui' cannot be used with a new UI" \ + "new-ui with tui" + # Test that we can continue working normally. if ![runto_main] { return diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c index a75708ba662..7ebaf8f83f7 100644 --- a/gdb/tui/tui-interp.c +++ b/gdb/tui/tui-interp.c @@ -50,6 +50,9 @@ class tui_interp final : public cli_interp_base void suspend () override; void exec (const char *command_str) override; ui_out *interp_ui_out () override; + + bool supports_new_ui () const override + { return false; } }; /* Cleanup the tui before exiting. */ diff --git a/gdb/ui.c b/gdb/ui.c index 80ee67dbae5..e5c7965d8dc 100644 --- a/gdb/ui.c +++ b/gdb/ui.c @@ -224,7 +224,7 @@ new_ui_command (const char *args, int from_tty) current_ui = ui.get (); - set_top_level_interpreter (interpreter_name); + set_top_level_interpreter (interpreter_name, true); top_level_interpreter ()->pre_command_loop ();