From patchwork Fri Jul 25 11:33:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Sendroiu X-Patchwork-Id: 2171 Received: (qmail 30540 invoked by alias); 25 Jul 2014 11:38:08 -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 30513 invoked by uid 89); 25 Jul 2014 11:38:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.3 required=5.0 tests=AWL, BAYES_50, RCVD_IN_DNSWL_NONE, RCVD_IN_SEMBACKSCATTER, SPF_HELO_PASS, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=no version=3.3.2 X-HELO: na01-bn1-obe.outbound.protection.outlook.com Received: from mail-bn1blp0188.outbound.protection.outlook.com (HELO na01-bn1-obe.outbound.protection.outlook.com) (207.46.163.188) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 25 Jul 2014 11:38:04 +0000 Received: from CH1PR03CA007.namprd03.prod.outlook.com (10.255.156.152) by BY2PR03MB142.namprd03.prod.outlook.com (10.242.35.147) with Microsoft SMTP Server (TLS) id 15.0.990.7; Fri, 25 Jul 2014 11:37:59 +0000 Received: from BY2FFO11FD051.protection.gbl (10.255.156.132) by CH1PR03CA007.outlook.office365.com (10.255.156.152) with Microsoft SMTP Server (TLS) id 15.0.995.14 via Frontend Transport; Fri, 25 Jul 2014 11:37:58 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD051.mail.protection.outlook.com (10.1.15.188) with Microsoft SMTP Server (TLS) id 15.0.980.11 via Frontend Transport; Fri, 25 Jul 2014 11:37:58 +0000 Received: from fsr-ub1264-100.ea.freescale.net (fsr-ub1264-100.ea.freescale.net [10.171.74.130]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s6PBbTf4002922; Fri, 25 Jul 2014 04:37:49 -0700 From: Adrian Sendroiu To: , CC: Adrian Sendroiu Subject: [PATCH v2 2/2] mi-out: Implement mi redirection using a stack. Date: Fri, 25 Jul 2014 14:33:57 +0300 Message-ID: <1406288037-11470-1-git-send-email-adrian.sendroiu@freescale.com> In-Reply-To: <87ha26liw6.fsf@fleche.redhat.com> References: <87ha26liw6.fsf@fleche.redhat.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(189002)(199002)(377424004)(50466002)(26826002)(104016003)(48376002)(86362001)(105606002)(229853001)(83322001)(76176999)(19580405001)(50986999)(81342001)(107046002)(74662001)(76482001)(64706001)(6806004)(19580395003)(85306003)(47776003)(81542001)(88136002)(99396002)(46102001)(74502001)(50226001)(85852003)(83072002)(80022001)(95666004)(92566001)(77982001)(97736001)(20776003)(79102001)(104166001)(21056001)(102836001)(87936001)(87286001)(4396001)(93916002)(92726001)(106466001)(89996001)(44976005)(62966002)(77156001)(33646002)(36756003)(84676001)(68736004)(31966008); DIR:OUT; SFP:; SCL:1; SRVR:BY2PR03MB142; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 02830F0362 Received-SPF: Fail (: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=adrian.sendroiu@freescale.com; X-OriginatorOrg: freescale.com The current implementation doesn't support nested redirections because it only has an "original_buffer" where it saves the current stream when a redirection is done. To overcome this limitation, this patch reimplements it using a stack of streams. gdb/ 2014-07-23 Adrian Sendroiu * mi/mi-out.c (ui_filep): New typedef. (DEF_VEC_P (ui_filep)): New type. (struct ui_out_data): Remove field. Remove field. : New field. (mi_field_string): Get the output stream from the top of the stack of streams. (mi_field_fmt): Likewise. (mi_flush): Likewise. (field_separator): Likewise. (mi_open): Likewise. (mi_close): Likewise. (mi_out_buffered): Likewise. (mi_out_rewind): Likewise. (mi_out_put): Likewise. (mi_out_new): Initialize the stack of streams. Push a newly created stream on the stack. Remove obsolete comment. (mi_redirect): Reimplement using push and pop operations. --- gdb/mi/mi-out.c | 77 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c index 6ec41e6..6731509 100644 --- a/gdb/mi/mi-out.c +++ b/gdb/mi/mi-out.c @@ -22,14 +22,17 @@ #include "defs.h" #include "ui-out.h" #include "mi-out.h" +#include "vec.h" + +typedef struct ui_file *ui_filep; +DEF_VEC_P (ui_filep); struct ui_out_data { int suppress_field_separator; int suppress_output; int mi_version; - struct ui_file *buffer; - struct ui_file *original_buffer; + VEC (ui_filep) *streams; }; typedef struct ui_out_data mi_out_data; @@ -215,17 +218,20 @@ mi_field_string (struct ui_out *uiout, int fldno, int width, enum ui_align align, const char *fldname, const char *string) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *stream; if (data->suppress_output) return; + stream = VEC_last (ui_filep, data->streams); + field_separator (uiout); if (fldname) - fprintf_unfiltered (data->buffer, "%s=", fldname); - fprintf_unfiltered (data->buffer, "\""); + fprintf_unfiltered (stream, "%s=", fldname); + fprintf_unfiltered (stream, "\""); if (string) - fputstr_unfiltered (string, '"', data->buffer); - fprintf_unfiltered (data->buffer, "\""); + fputstr_unfiltered (string, '"', stream); + fprintf_unfiltered (stream, "\""); } /* This is the only field function that does not align. */ @@ -236,17 +242,20 @@ mi_field_fmt (struct ui_out *uiout, int fldno, int width, const char *format, va_list args) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *stream; if (data->suppress_output) return; + stream = VEC_last (ui_filep, data->streams); + field_separator (uiout); if (fldname) - fprintf_unfiltered (data->buffer, "%s=\"", fldname); + fprintf_unfiltered (stream, "%s=\"", fldname); else - fputs_unfiltered ("\"", data->buffer); - vfprintf_unfiltered (data->buffer, format, args); - fputs_unfiltered ("\"", data->buffer); + fputs_unfiltered ("\"", stream); + vfprintf_unfiltered (stream, format, args); + fputs_unfiltered ("\"", stream); } void @@ -275,8 +284,9 @@ void mi_flush (struct ui_out *uiout) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *stream = VEC_last (ui_filep, data->streams); - gdb_flush (data->buffer); + gdb_flush (stream); } int @@ -285,15 +295,9 @@ mi_redirect (struct ui_out *uiout, struct ui_file *outstream) mi_out_data *data = ui_out_data (uiout); if (outstream != NULL) - { - data->original_buffer = data->buffer; - data->buffer = outstream; - } - else if (data->original_buffer != NULL) - { - data->buffer = data->original_buffer; - data->original_buffer = NULL; - } + VEC_safe_push (ui_filep, data->streams, outstream); + else + VEC_pop (ui_filep, data->streams); return 0; } @@ -306,29 +310,31 @@ static void field_separator (struct ui_out *uiout) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *stream = VEC_last (ui_filep, data->streams); if (data->suppress_field_separator) data->suppress_field_separator = 0; else - fputc_unfiltered (',', data->buffer); + fputc_unfiltered (',', stream); } static void mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *stream = VEC_last (ui_filep, data->streams); field_separator (uiout); data->suppress_field_separator = 1; if (name) - fprintf_unfiltered (data->buffer, "%s=", name); + fprintf_unfiltered (stream, "%s=", name); switch (type) { case ui_out_type_tuple: - fputc_unfiltered ('{', data->buffer); + fputc_unfiltered ('{', stream); break; case ui_out_type_list: - fputc_unfiltered ('[', data->buffer); + fputc_unfiltered ('[', stream); break; default: internal_error (__FILE__, __LINE__, _("bad switch")); @@ -339,14 +345,15 @@ static void mi_close (struct ui_out *uiout, enum ui_out_type type) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *stream = VEC_last (ui_filep, data->streams); switch (type) { case ui_out_type_tuple: - fputc_unfiltered ('}', data->buffer); + fputc_unfiltered ('}', stream); break; case ui_out_type_list: - fputc_unfiltered (']', data->buffer); + fputc_unfiltered (']', stream); break; default: internal_error (__FILE__, __LINE__, _("bad switch")); @@ -360,8 +367,9 @@ void mi_out_buffered (struct ui_out *uiout, char *string) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *stream = VEC_last (ui_filep, data->streams); - fprintf_unfiltered (data->buffer, "%s", string); + fprintf_unfiltered (stream, "%s", string); } /* Clear the buffer. */ @@ -370,8 +378,9 @@ void mi_out_rewind (struct ui_out *uiout) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *stream = VEC_last (ui_filep, data->streams); - ui_file_rewind (data->buffer); + ui_file_rewind (stream); } /* Dump the buffer onto the specified stream. */ @@ -386,9 +395,10 @@ void mi_out_put (struct ui_out *uiout, struct ui_file *stream) { mi_out_data *data = ui_out_data (uiout); + struct ui_file *current_stream = VEC_last (ui_filep, data->streams); - ui_file_put (data->buffer, do_write, stream); - ui_file_rewind (data->buffer); + ui_file_put (current_stream, do_write, stream); + ui_file_rewind (current_stream); } /* Return the current MI version. */ @@ -407,13 +417,14 @@ struct ui_out * mi_out_new (int mi_version) { int flags = 0; + struct ui_file *new_stream; mi_out_data *data = XNEW (mi_out_data); data->suppress_field_separator = 0; data->suppress_output = 0; data->mi_version = mi_version; - /* FIXME: This code should be using a ``string_file'' and not the - TUI buffer hack. */ - data->buffer = mem_fileopen (); + data->streams = NULL; + new_stream = mem_fileopen (); + VEC_safe_push (ui_filep, data->streams, new_stream); return ui_out_new (&mi_ui_out_impl, data, flags); }