From patchwork Fri Jan 19 11:56:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandra Petlanova Hajkova X-Patchwork-Id: 84430 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 E80BA38582A1 for ; Fri, 19 Jan 2024 11:59:26 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id E786E385841C for ; Fri, 19 Jan 2024 11:57:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E786E385841C 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 E786E385841C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705665433; cv=none; b=A/7tH8cy+YN6k+HkyqC8A3iAb8MfJPU2PW0BHnYrjeSXVvW3wLKjtgLBAlnEVAWV96ZOJQCuOvyYL5TsGgtpSzZHwLJ18dZL35Mi278JbXWt5X0wrO9OMFvWBSOuX1SPRdJU56Gmq3+7iyoS3yi/KAYj/paUq9RKXx1UR3+FqtU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705665433; c=relaxed/simple; bh=NB7knEpu9tHmfKXS9koJRXQA0g85OhP/d/ioRItYsMg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=h95ZYPD/SYJdOeVJmLIaJnMIgmuWBFgraYr0Ioi9oQSwgTxcWRzWOFzpUepu7RFgXyXtELSQrtZGU7FpK+YSFoNwOuIEV+nwJIyA+BuW0RP5AzLA73iDVAYYvEPKT1KK39bZruad0BUj3ptg0gY4COXV2evVRRbfYNEYFvN5w9o= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705665431; h=from:from:reply-to:subject:subject: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=GnkS2p36HdxI+bD5NJKvcoCTcPNEY4j5zgAqXKGvXoQ=; b=SbqDuWMkEaGwSIDhv/wuyLDfXunyS7WU3L0nMrvDKa+OSwU608maaXNrx67NwCN7QCGGjz T6hlOthBtUp2y0Dumz0WYjHC/S3OS0LMQf0F2o9U/z6F6XjPR16E0VYUxhVg59VZkXZuFs GcRoHAJIJZAfDFb0j1HVNDFdz8ZOu4Y= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-281-y0TKgKzNOlmK54MzNrGXng-1; Fri, 19 Jan 2024 06:57:09 -0500 X-MC-Unique: y0TKgKzNOlmK54MzNrGXng-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8AA14881BC0 for ; Fri, 19 Jan 2024 11:57:09 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 058A44011FE7 for ; Fri, 19 Jan 2024 11:57:08 +0000 (UTC) From: =?utf-8?q?Alexandra_H=C3=A1jkov=C3=A1?= To: gdb-patches@sourceware.org Subject: [PATCH v2 5/6] remote.c: Add terminal handling functions Date: Fri, 19 Jan 2024 12:56:29 +0100 Message-ID: <20240119115659.491195-7-ahajkova@redhat.com> In-Reply-To: <20240119115659.491195-1-ahajkova@redhat.com> References: <20240119115659.491195-1-ahajkova@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.6 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_H4, 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 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 Re-use terminal handling functions from inf-child.c so GDBserver can call them. This helps local remote target to behave more like native target. --- gdb/remote.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gdb/remote.c b/gdb/remote.c index d90e071f4fb..3406eaf43e7 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -607,6 +607,10 @@ class remote_state qSupported. */ gdb_thread_options supported_thread_options = 0; + /* gdbserver accepted the file descriptor numbers of the terminal + GDB is connected to. */ + bool fds_accepted = false; + private: /* Asynchronous signal handle registered as event loop source for when we have pending events ready to be passed to the core. */ @@ -908,10 +912,18 @@ class remote_target : public process_stratum_target int can_do_single_step () override; + bool supports_terminal_ours () override; + + void terminal_init () override; + void terminal_inferior () override; + void terminal_save_inferior() override; + void terminal_ours () override; + void terminal_ours_for_output() override; + bool supports_non_stop () override; bool supports_multi_process () override; @@ -1731,6 +1743,36 @@ remote_target::get_remote_state () return &m_remote_state; } +bool +remote_target::supports_terminal_ours () +{ + return true; +} + +void +remote_target::terminal_init () +{ + struct remote_state *rs = get_remote_state (); + if (rs->fds_accepted) + child_terminal_init (this); +} + +void +remote_target::terminal_save_inferior () +{ + struct remote_state *rs = get_remote_state (); + if (rs->fds_accepted) + child_terminal_save_inferior (this); +} + +void +remote_target::terminal_ours_for_output () +{ + struct remote_state *rs = get_remote_state (); + if (rs->fds_accepted) + child_terminal_ours_for_output (this); +} + /* Fetch the remote exec-file from the current program space. */ static const char * @@ -5035,6 +5077,12 @@ remote_target::start_remote_1 (int from_tty, int extended_p) putpkt (rs->buf); getpkt (&rs->buf, 0); + + if (m_features.packet_ok (rs->buf, PACKET_vDefaultInferiorFd) == PACKET_OK) + rs->fds_accepted = true; + else + error (_("Remote replied unexpectedly to 'vDefaultInferiorFd': %s"), + rs->buf.data ()); } /* Check vCont support and set the remote state's vCont_action_support @@ -7565,11 +7613,18 @@ remote_target::terminal_inferior () /* NOTE: At this point we could also register our selves as the recipient of all input. Any characters typed could then be passed on down to the target. */ + + struct remote_state *rs = get_remote_state (); + if (rs->fds_accepted) + child_terminal_inferior (this); } void remote_target::terminal_ours () { + struct remote_state *rs = get_remote_state (); + if (rs->fds_accepted) + child_terminal_ours (this); } static void