From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103703 invoked by alias); 24 Nov 2016 15:27:59 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 103509 invoked by uid 89); 24 Nov 2016 15:27:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=3.9 required=5.0 tests=AWL,BAYES_50,SPF_SOFTFAIL,UNWANTED_LANGUAGE_BODY autolearn=no version=3.3.2 spammy=Hx-spam-relays-external:sk:cable-1, H*RU:sk:cable-1, H*r:sk:cable-1, ui_out X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 24 Nov 2016 15:27:58 +0000 X-ASG-Debug-ID: 1480001276-0c856e65d5b89e60001-fS2M51 Received: from smtp.electronicbox.net (smtp.electronicbox.net [96.127.255.82]) by barracuda.ebox.ca with ESMTP id j1gOAbShHvqPC4TH (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Nov 2016 10:27:56 -0500 (EST) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.lan (cable-11.246.173-162.electronicbox.net [173.246.11.162]) by smtp.electronicbox.net (Postfix) with ESMTP id 2E1D2440E7C; Thu, 24 Nov 2016 10:27:56 -0500 (EST) From: Simon Marchi X-Barracuda-Effective-Source-IP: cable-11.246.173-162.electronicbox.net[173.246.11.162] X-Barracuda-Apparent-Source-IP: 173.246.11.162 X-Barracuda-RBL-IP: 173.246.11.162 To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 10/22] Use std::vector for mi_ui_out_data::streams Date: Thu, 24 Nov 2016 15:27:00 -0000 X-ASG-Orig-Subj: [PATCH 10/22] Use std::vector for mi_ui_out_data::streams Message-Id: <20161124152710.25007-10-simon.marchi@polymtl.ca> In-Reply-To: <20161124152428.24725-1-simon.marchi@polymtl.ca> References: <20161124152428.24725-1-simon.marchi@polymtl.ca> X-Barracuda-Connect: smtp.electronicbox.net[96.127.255.82] X-Barracuda-Start-Time: 1480001276 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 4724 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests=BSF_SC0_MISMATCH_TO X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.34709 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header X-IsSubscribed: yes X-SW-Source: 2016-11/txt/msg00751.txt.bz2 Use a standard vector instead of the home-made version. I used a vector of plain pointers, because the mi_ui_out_data object doesn't own the streams objects (i.e. they shouldn't be deleted when the vector is deleted). gdb/ChangeLog: * mi/mi-out.c (mi_ui_out_data) : Change type to std::vector. (mi_field_string): Update. (mi_field_fmt): Update. (mi_flush): Update. (mi_redirect): Update. (field_separator): Update. (mi_open): Update. (mi_close): Update. (mi_out_buffered): Update. (mi_out_rewind): Update. (mi_out_put): Update. (mi_out_data_ctor): Update. (mi_out_data_dtor): Don't free streams. --- gdb/mi/mi-out.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index 2561f16..c89076a 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -23,16 +23,14 @@ #include "ui-out.h" #include "mi-out.h" #include "vec.h" - -typedef struct ui_file *ui_filep; -DEF_VEC_P (ui_filep); +#include struct mi_ui_out_data { int suppress_field_separator; int suppress_output; int mi_version; - VEC (ui_filep) *streams; + std::vector streams; }; typedef struct mi_ui_out_data mi_out_data; @@ -222,7 +220,7 @@ mi_field_string (struct ui_out *uiout, int fldno, int width, if (data->suppress_output) return; - stream = VEC_last (ui_filep, data->streams); + stream = data->streams.back (); field_separator (uiout); if (fldname) fprintf_unfiltered (stream, "%s=", fldname); @@ -245,7 +243,7 @@ mi_field_fmt (struct ui_out *uiout, int fldno, int width, if (data->suppress_output) return; - stream = VEC_last (ui_filep, data->streams); + stream = data->streams.back (); field_separator (uiout); if (fldname) fprintf_unfiltered (stream, "%s=\"", fldname); @@ -280,7 +278,7 @@ void mi_flush (struct ui_out *uiout) { mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *stream = VEC_last (ui_filep, data->streams); + struct ui_file *stream = data->streams.back (); gdb_flush (stream); } @@ -291,9 +289,9 @@ mi_redirect (struct ui_out *uiout, struct ui_file *outstream) mi_out_data *data = (mi_out_data *) ui_out_data (uiout); if (outstream != NULL) - VEC_safe_push (ui_filep, data->streams, outstream); + data->streams.push_back (outstream); else - VEC_pop (ui_filep, data->streams); + data->streams.pop_back (); return 0; } @@ -306,7 +304,7 @@ static void field_separator (struct ui_out *uiout) { mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *stream = VEC_last (ui_filep, data->streams); + ui_file *stream = data->streams.back (); if (data->suppress_field_separator) data->suppress_field_separator = 0; @@ -318,7 +316,7 @@ static void mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type) { mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *stream = VEC_last (ui_filep, data->streams); + ui_file *stream = data->streams.back (); field_separator (uiout); data->suppress_field_separator = 1; @@ -341,7 +339,7 @@ static void mi_close (struct ui_out *uiout, enum ui_out_type type) { mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *stream = VEC_last (ui_filep, data->streams); + ui_file *stream = data->streams.back (); switch (type) { @@ -363,7 +361,7 @@ void mi_out_rewind (struct ui_out *uiout) { mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *stream = VEC_last (ui_filep, data->streams); + ui_file *stream = data->streams.back (); ui_file_rewind (stream); } @@ -374,7 +372,7 @@ void mi_out_put (struct ui_out *uiout, struct ui_file *stream) { mi_out_data *data = (mi_out_data *) ui_out_data (uiout); - struct ui_file *outstream = VEC_last (ui_filep, data->streams); + ui_file *outstream = data->streams.back (); ui_file_put (outstream, ui_file_write_for_put, stream); ui_file_rewind (outstream); @@ -397,8 +395,7 @@ mi_out_data_ctor (mi_out_data *self, int mi_version, struct ui_file *stream) { gdb_assert (stream != NULL); - self->streams = NULL; - VEC_safe_push (ui_filep, self->streams, stream); + self->streams.push_back (stream); self->suppress_field_separator = 0; self->suppress_output = 0; @@ -412,7 +409,6 @@ mi_out_data_dtor (struct ui_out *ui_out) { mi_out_data *data = (mi_out_data *) ui_out_data (ui_out); - VEC_free (ui_filep, data->streams); delete data; } -- 2.10.0