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.129.124]) by sourceware.org (Postfix) with ESMTPS id 59DF6385843A for ; Fri, 17 Nov 2023 11:18:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 59DF6385843A 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 59DF6385843A 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=1700219935; cv=none; b=S7NaUC1so+5tKnK6TGibmqQoiznKdF6EsK5UYClN5sZ3zW8WikWHQ6oLx/tfZIcQnRImqZY5bVZn5AE9LNQZV/BHhbmGaH8BXP/O1AiBjy+lwtBg6sL2Kyz5/wlFIF6MCOhgZX1i2kq6sNr+SU3AEhLQ1qqqJLg4PC4OxSgS4ak= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700219935; c=relaxed/simple; bh=zl6SbykT0f8V4USPdRb345DkZGEgKjDIQ0F2k7OuWHA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=rrzif9xbl101XESkgm444p3nXHmp2iIVFnpwLZm3frS2ecklj7cHMPSeVDzXf40p+xmAi3CdAuLs6rKCKbvqVVHhBznYr2CabVMI2HwNEzIv8Xyo9tC/jfvxermTpV8KOGno+nIG183IJWgG4UCVX7/1NkYmxABhVgKa5THnVtg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700219934; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+blr+/wdIPf5QpJiVZT4tybQIN6EaOhjmxHqx2ll5cA=; b=NIZghobuTFfnO31UtyqzjE6ZHDpU/vQMzAAoUeJ3bEueji0iMrMAhAS7vBg2htCCuzsxTU iAdM3p5b8qmLLD37enJit8/LvwS2+LUsPwmtastWcmQH273wOJUo+t3dd+UkMVyyjYKAVU AcrMYHXeuvaLW9fTd/cbaDYBR2fxIcM= 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-479-8XGgJPP6PU-lv72pxHDN8Q-1; Fri, 17 Nov 2023 06:18:50 -0500 X-MC-Unique: 8XGgJPP6PU-lv72pxHDN8Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 B30A7185A780 for ; Fri, 17 Nov 2023 11:18:50 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.242.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC5482026D4C; Fri, 17 Nov 2023 11:18:49 +0000 (UTC) From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= To: gdb-patches@sourceware.org Cc: ahajkova@redhat.com Subject: [PATCH 5/6] remote.c: Add terminal handling functions Date: Fri, 17 Nov 2023 12:18:39 +0100 Message-ID: <20231117111840.2040709-6-ahajkova@redhat.com> In-Reply-To: <20231117111840.2040709-1-ahajkova@redhat.com> References: <20231117111840.2040709-1-ahajkova@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-10.2 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 List-Id: 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 27d053c367c..68835a29244 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; @@ -1732,6 +1744,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 * @@ -5029,6 +5071,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 @@ -7558,11 +7606,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 -- 2.41.0