From patchwork Wed Sep 25 23:59:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 34672 Received: (qmail 97595 invoked by alias); 26 Sep 2019 00:00:16 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 97522 invoked by uid 89); 26 Sep 2019 00:00:14 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-wr1-f44.google.com Received: from mail-wr1-f44.google.com (HELO mail-wr1-f44.google.com) (209.85.221.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 26 Sep 2019 00:00:04 +0000 Received: by mail-wr1-f44.google.com with SMTP id i18so279314wru.11 for ; Wed, 25 Sep 2019 17:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=umMaYKtF1X1RFcS6T5V7SGL65bg8R2zA2TiV8R3WMLc=; b=V/CSSwW4osc/H5naR3/PmoH4GTRRGreOsNMs4HclB4wmEMBL/ZvrEBd8d1gbQct5Db iDGc6SNj+lLtYtjlZ8p5SPqkIbGP/S0djrhzXt5s5qdlqyKa4n0Rj6usszJSYo8xCnLw cJ6UTdcmOYk9e5dBu5qHoUrQQiQ3CkYRUHsN1PUE7A2IVp+NDt2aQ+bTeyq1VZXI4DKf GjrqQH5H2/FAY8rZKj+I6LRu7B3bEwApuj+4nDbTWKSzBVBN5cs33VMEoDnq+PDElrjA x9tkkwjmMdXwVk2Cv/Q4YzlumLGquqYTColKemayY+jOgNgrh6RFYWXqaPMomgKXTNTc bSEw== Return-Path: Received: from localhost (host86-128-12-122.range86-128.btcentralplus.com. [86.128.12.122]) by smtp.gmail.com with ESMTPSA id o188sm749669wma.14.2019.09.25.17.00.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Sep 2019 17:00:02 -0700 (PDT) From: Andrew Burgess To: gdb-patches Cc: Simon Marchi , Tom Tromey , Andrew Burgess Subject: [PATCHv3 2/3] gdb: Change a VEC to std::vector in btrace.{c,h} Date: Thu, 26 Sep 2019 00:59:54 +0100 Message-Id: <6ceaca2e6d37e8bfd913ab787229cbd2d3a7110d.1569455610.git.andrew.burgess@embecosm.com> In-Reply-To: References: In-Reply-To: References: <87lfucf2qs.fsf@tromey.com> X-IsSubscribed: yes Replace a VEC with a std::vector in btrace.h, and update btrace.c to match. This code is currently untested, so I've been quite conservative with the changes - where previously we used VEC_safe_push which would allocate the vector if it isn't already allocated - I now check and allocate the std::vector using 'new' before pushing to the vector. As the new vector is inside a union I've currently used a pointer to vector, which makes the code slightly uglier than it might otherwise be, but again, due to lack of testing I'm reluctant to start refactoring the code in a big way. gdb/ChangeLog: * btrace.c (btrace_maint_clear): Update to handle change from VEC to std::vector. (btrace_maint_decode_pt): Likewise. (btrace_maint_update_packets): Likewise. (btrace_maint_print_packets): Likewise. (maint_info_btrace_cmd): Likewise. * btrace.h: Remove 'vec.h' header include and use of DEF_VEC_O. (typedef btrace_pt_packet_s): Delete. (struct btrace_maint_info) : Change fromm VEC to std::vector. --- gdb/ChangeLog | 13 +++++++++++++ gdb/btrace.c | 39 +++++++++++++++++++++------------------ gdb/btrace.h | 6 +----- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/gdb/btrace.c b/gdb/btrace.c index e3cf5d88f53..349e609addb 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -1827,7 +1827,7 @@ btrace_maint_clear (struct btrace_thread_info *btinfo) #if defined (HAVE_LIBIPT) case BTRACE_FORMAT_PT: - xfree (btinfo->maint.variant.pt.packets); + delete btinfo->maint.variant.pt.packets; btinfo->maint.variant.pt.packets = NULL; btinfo->maint.variant.pt.packet_history.begin = 0; @@ -2986,8 +2986,10 @@ btrace_maint_decode_pt (struct btrace_maint_info *maint, if (maint_btrace_pt_skip_pad == 0 || packet.packet.type != ppt_pad) { packet.errcode = pt_errcode (errcode); - VEC_safe_push (btrace_pt_packet_s, maint->variant.pt.packets, - &packet); + if (maint->variant.pt.packets == NULL) + maint->variant.pt.packets + = new std::vector ; + maint->variant.pt.packets->push_back (packet); } } @@ -2995,8 +2997,9 @@ btrace_maint_decode_pt (struct btrace_maint_info *maint, break; packet.errcode = pt_errcode (errcode); - VEC_safe_push (btrace_pt_packet_s, maint->variant.pt.packets, - &packet); + if (maint->variant.pt.packets == NULL) + maint->variant.pt.packets = new std::vector ; + maint->variant.pt.packets->push_back (packet); warning (_("Error at trace offset 0x%" PRIx64 ": %s."), packet.offset, pt_errstr (packet.errcode)); @@ -3098,11 +3101,13 @@ btrace_maint_update_packets (struct btrace_thread_info *btinfo, #if defined (HAVE_LIBIPT) case BTRACE_FORMAT_PT: - if (VEC_empty (btrace_pt_packet_s, btinfo->maint.variant.pt.packets)) + if (btinfo->maint.variant.pt.packets == nullptr + || btinfo->maint.variant.pt.packets->empty ()) btrace_maint_update_pt_packets (btinfo); *begin = 0; - *end = VEC_length (btrace_pt_packet_s, btinfo->maint.variant.pt.packets); + *end = ((btinfo->maint.variant.pt.packets == nullptr) + ? 0 : btinfo->maint.variant.pt.packets->size ()); *from = btinfo->maint.variant.pt.packet_history.begin; *to = btinfo->maint.variant.pt.packet_history.end; break; @@ -3145,23 +3150,21 @@ btrace_maint_print_packets (struct btrace_thread_info *btinfo, #if defined (HAVE_LIBIPT) case BTRACE_FORMAT_PT: { - VEC (btrace_pt_packet_s) *packets; + std::vector *packets; unsigned int pkt; packets = btinfo->maint.variant.pt.packets; for (pkt = begin; pkt < end; ++pkt) { - const struct btrace_pt_packet *packet; - - packet = VEC_index (btrace_pt_packet_s, packets, pkt); + const struct btrace_pt_packet &packet = packets->at (pkt); printf_unfiltered ("%u\t", pkt); - printf_unfiltered ("0x%" PRIx64 "\t", packet->offset); + printf_unfiltered ("0x%" PRIx64 "\t", packet.offset); - if (packet->errcode == pte_ok) - pt_print_packet (&packet->packet); + if (packet.errcode == pte_ok) + pt_print_packet (&packet.packet); else - printf_unfiltered ("[error: %s]", pt_errstr (packet->errcode)); + printf_unfiltered ("[error: %s]", pt_errstr (packet.errcode)); printf_unfiltered ("\n"); } @@ -3452,9 +3455,9 @@ maint_info_btrace_cmd (const char *args, int from_tty) version.ext != NULL ? version.ext : ""); btrace_maint_update_pt_packets (btinfo); - printf_unfiltered (_("Number of packets: %u.\n"), - VEC_length (btrace_pt_packet_s, - btinfo->maint.variant.pt.packets)); + printf_unfiltered (_("Number of packets: %zu.\n"), + ((btinfo->maint.variant.pt.packets == nullptr) + ? 0 : btinfo->maint.variant.pt.packets->size ())); } break; #endif /* defined (HAVE_LIBIPT) */ diff --git a/gdb/btrace.h b/gdb/btrace.h index d09c424804b..208c089fa7c 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -29,7 +29,6 @@ #include "gdbsupport/btrace-common.h" #include "target/waitstatus.h" /* For enum target_stop_reason. */ #include "gdbsupport/enum-flags.h" -#include "gdbsupport/vec.h" #if defined (HAVE_LIBIPT) # include @@ -265,9 +264,6 @@ struct btrace_pt_packet struct pt_packet packet; }; -/* Define functions operating on a vector of packets. */ -typedef struct btrace_pt_packet btrace_pt_packet_s; -DEF_VEC_O (btrace_pt_packet_s); #endif /* defined (HAVE_LIBIPT) */ /* Branch trace iteration state for "maintenance btrace packet-history". */ @@ -301,7 +297,7 @@ struct btrace_maint_info struct { /* A vector of decoded packets. */ - VEC (btrace_pt_packet_s) *packets; + std::vector *packets; /* The packet history iterator. We are iterating over the above PACKETS vector. */