From patchwork Fri Dec 16 23:50:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 62038 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 7B7F23831E68 for ; Fri, 16 Dec 2022 23:52:14 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from qproxy2-pub.mail.unifiedlayer.com (qproxy2-pub.mail.unifiedlayer.com [69.89.16.161]) by sourceware.org (Postfix) with ESMTPS id 4000838378D0 for ; Fri, 16 Dec 2022 23:51:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4000838378D0 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by qproxy2.mail.unifiedlayer.com (Postfix) with ESMTP id 4C3FC8034407 for ; Fri, 16 Dec 2022 23:51:43 +0000 (UTC) Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 02B1910046FD7 for ; Fri, 16 Dec 2022 23:50:33 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6KTIpxzJBdq8T6KTIp2Gv4; Fri, 16 Dec 2022 23:50:32 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=bNfTnNyZ c=1 sm=1 tr=0 ts=639d0449 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=sHyYjHe8cH0A:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=S6_QSMFA2EAgCqZMrJAA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=JcHsvQH7jdiRqGk9Zz8GEd7PYfd1ciGPiTdmbZDQWtM=; b=i8hXt5B3tYxPbK746Itfmtk8gj DMSCzOSsf/Zcmn0LvR6hTvmMIaf/zgvd/T2ZSGGsxd6JPw2W6pZ9vGvMRdf1+ZoAU/l8+TaGvZrKw FDxAT8d7sNvp13SyTXoCyV7j9; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:49920 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1p6KTH-002Lmq-OC; Fri, 16 Dec 2022 16:50:31 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 4/7] Don't use struct buffer in handle_qxfer_threads Date: Fri, 16 Dec 2022 16:50:14 -0700 Message-Id: <20221216235017.3722833-5-tom@tromey.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221216235017.3722833-1-tom@tromey.com> References: <20221216235017.3722833-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1p6KTH-002Lmq-OC X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:49920 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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.29 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 Sender: "Gdb-patches" This changes handle_qxfer_threads, in gdbserver, to use std::string rather than struct buffer. --- gdbserver/server.cc | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 0f053559b77..902a2a94618 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -1633,7 +1633,7 @@ handle_qxfer_statictrace (const char *annex, Emit the XML to describe the thread of INF. */ static void -handle_qxfer_threads_worker (thread_info *thread, struct buffer *buffer) +handle_qxfer_threads_worker (thread_info *thread, std::string *buffer) { ptid_t ptid = ptid_of (thread); char ptid_s[100]; @@ -1652,34 +1652,34 @@ handle_qxfer_threads_worker (thread_info *thread, struct buffer *buffer) write_ptid (ptid_s, ptid); - buffer_xml_printf (buffer, "\n"); + string_xml_appendf (*buffer, "/>\n"); } /* Helper for handle_qxfer_threads. Return true on success, false otherwise. */ static bool -handle_qxfer_threads_proper (struct buffer *buffer) +handle_qxfer_threads_proper (std::string *buffer) { - buffer_grow_str (buffer, "\n"); + *buffer += "\n"; /* The target may need to access memory and registers (e.g. via libthread_db) to fetch thread properties. Even if don't need to @@ -1699,7 +1699,7 @@ handle_qxfer_threads_proper (struct buffer *buffer) if (non_stop) target_unpause_all (true); - buffer_grow_str0 (buffer, "\n"); + *buffer += "\n"; return true; } @@ -1710,8 +1710,7 @@ handle_qxfer_threads (const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST offset, LONGEST len) { - static char *result = 0; - static unsigned int result_length = 0; + static std::string result; if (writebuf != NULL) return -2; @@ -1721,37 +1720,27 @@ handle_qxfer_threads (const char *annex, if (offset == 0) { - struct buffer buffer; /* When asked for data at offset 0, generate everything and store into 'result'. Successive reads will be served off 'result'. */ - if (result) - free (result); - - buffer_init (&buffer); - - bool res = handle_qxfer_threads_proper (&buffer); + result.clear (); - result = buffer_finish (&buffer); - result_length = strlen (result); - buffer_free (&buffer); + bool res = handle_qxfer_threads_proper (&result); if (!res) return -1; } - if (offset >= result_length) + if (offset >= result.length ()) { /* We're out of data. */ - free (result); - result = NULL; - result_length = 0; + result.clear (); return 0; } - if (len > result_length - offset) - len = result_length - offset; + if (len > result.length () - offset) + len = result.length () - offset; - memcpy (readbuf, result + offset, len); + memcpy (readbuf, result.c_str () + offset, len); return len; }