From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy3-pub.mail.unifiedlayer.com (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42]) by sourceware.org (Postfix) with ESMTPS id 88A9E38378F4 for ; Fri, 16 Dec 2022 23:50:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 88A9E38378F4 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 cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id B94C310047B11 for ; Fri, 16 Dec 2022 23:50:31 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6KTHpxzIndq8T6KTHp2Gug; Fri, 16 Dec 2022 23:50:31 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=bNfTnNyZ c=1 sm=1 tr=0 ts=639d0447 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=nhUq8SdgGP2KS3tbw_EA: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=h89IUkCDYbJCYQh86OqIPIrdUngiQAavz48cp3DTjSU=; b=F0o4iX2KU8yHV50kIZyZAsDSD5 hH9jOXJYNfUEs+Ecar0Sb86bLSKTQoZhMapICQpY4Clh+ahJYOyCt9f2i3Rm/jDC3SoyH9M80u/3N 31SWsdxiQOy+pzKbcBWq/sMDx; 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-AY; Fri, 16 Dec 2022 16:50:31 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/7] Don't use struct buffer in handle_qxfer_traceframe_info Date: Fri, 16 Dec 2022 16:50:12 -0700 Message-Id: <20221216235017.3722833-3-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 Content-Transfer-Encoding: 8bit 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-AY 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: 3 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 List-Id: This changes handle_qxfer_traceframe_info, in gdbserver, to use std::string rather than struct buffer. --- gdbserver/server.cc | 27 ++++++++------------------- gdbserver/tracepoint.cc | 20 ++++++++++---------- gdbserver/tracepoint.h | 2 +- 3 files changed, 19 insertions(+), 30 deletions(-) diff --git a/gdbserver/server.cc b/gdbserver/server.cc index aaef38e0062..58aeafe11d5 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -1764,8 +1764,7 @@ handle_qxfer_traceframe_info (const char *annex, ULONGEST offset, LONGEST len) { client_state &cs = get_client_state (); - static char *result = 0; - static unsigned int result_length = 0; + static std::string result; if (writebuf != NULL) return -2; @@ -1775,35 +1774,25 @@ handle_qxfer_traceframe_info (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'. */ - free (result); + result.clear (); - buffer_init (&buffer); - - traceframe_read_info (cs.current_traceframe, &buffer); - - result = buffer_finish (&buffer); - result_length = strlen (result); - buffer_free (&buffer); + traceframe_read_info (cs.current_traceframe, &result); } - 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; } diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc index d82b8e2c3ce..252f07c581a 100644 --- a/gdbserver/tracepoint.cc +++ b/gdbserver/tracepoint.cc @@ -5388,13 +5388,13 @@ traceframe_read_sdata (int tfnum, ULONGEST offset, } /* Callback for traceframe_walk_blocks. Builds a traceframe-info - object. DATA is pointer to a struct buffer holding the - traceframe-info object being built. */ + object. DATA is pointer to a string holding the traceframe-info + object being built. */ static int build_traceframe_info_xml (char blocktype, unsigned char *dataptr, void *data) { - struct buffer *buffer = (struct buffer *) data; + std::string *buffer = (std::string *) data; switch (blocktype) { @@ -5407,9 +5407,9 @@ build_traceframe_info_xml (char blocktype, unsigned char *dataptr, void *data) dataptr += sizeof (maddr); memcpy (&mlen, dataptr, sizeof (mlen)); dataptr += sizeof (mlen); - buffer_xml_printf (buffer, - "\n", - paddress (maddr), phex_nz (mlen, sizeof (mlen))); + string_xml_appendf (*buffer, + "\n", + paddress (maddr), phex_nz (mlen, sizeof (mlen))); break; } case 'V': @@ -5417,7 +5417,7 @@ build_traceframe_info_xml (char blocktype, unsigned char *dataptr, void *data) int vnum; memcpy (&vnum, dataptr, sizeof (vnum)); - buffer_xml_printf (buffer, "\n", vnum); + string_xml_appendf (*buffer, "\n", vnum); break; } case 'R': @@ -5439,7 +5439,7 @@ build_traceframe_info_xml (char blocktype, unsigned char *dataptr, void *data) BUFFER. */ int -traceframe_read_info (int tfnum, struct buffer *buffer) +traceframe_read_info (int tfnum, std::string *buffer) { struct traceframe *tframe; @@ -5453,10 +5453,10 @@ traceframe_read_info (int tfnum, struct buffer *buffer) return 1; } - buffer_grow_str (buffer, "\n"); + *buffer += "\n"; traceframe_walk_blocks (tframe->data, tframe->data_size, tfnum, build_traceframe_info_xml, buffer); - buffer_grow_str0 (buffer, "\n"); + *buffer += "\n"; return 0; } diff --git a/gdbserver/tracepoint.h b/gdbserver/tracepoint.h index bbffb6228f4..923ef8230ba 100644 --- a/gdbserver/tracepoint.h +++ b/gdbserver/tracepoint.h @@ -95,7 +95,7 @@ int traceframe_read_sdata (int tfnum, ULONGEST offset, unsigned char *buf, ULONGEST length, ULONGEST *nbytes); -int traceframe_read_info (int tfnum, struct buffer *buffer); +int traceframe_read_info (int tfnum, std::string *buffer); /* If a thread is determined to be collecting a fast tracepoint, this structure holds the collect status. */ -- 2.38.1