From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 114439 invoked by alias); 6 May 2016 12:40:40 -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 114376 invoked by uid 89); 6 May 2016 12:40:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 06 May 2016 12:40:33 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 599EBC05E16F for ; Fri, 6 May 2016 12:35:18 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u46CZ5IA017259 for ; Fri, 6 May 2016 08:35:17 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v3 13/34] Make current_ui_out be per UI Date: Fri, 06 May 2016 12:40:00 -0000 Message-Id: <1462538104-19109-14-git-send-email-palves@redhat.com> In-Reply-To: <1462538104-19109-1-git-send-email-palves@redhat.com> References: <1462538104-19109-1-git-send-email-palves@redhat.com> X-SW-Source: 2016-05/txt/msg00112.txt.bz2 Similarly to gdb_stdout&co. gdb/ChangeLog: yyyy-mm-dd Pedro Alves * top.c: Call gen_ret_current_ui_field_ptr for current_uiout. * top.h (struct ui) : New field. * ui-out.c (current_uiout): Delete. * ui-out.h (current_uiout): Delete. (current_ui_current_uiout_ptr): New declaration. (current_uiout): Reimplement as wrapper around current_ui_current_uiout_ptr. --- gdb/top.c | 1 + gdb/top.h | 3 +++ gdb/ui-out.c | 5 ----- gdb/ui-out.h | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/top.c b/gdb/top.c index 733580f..2e6cf31 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -100,6 +100,7 @@ gen_ret_current_ui_field_ptr (struct ui_file *, gdb_stdout) gen_ret_current_ui_field_ptr (struct ui_file *, gdb_stdin) gen_ret_current_ui_field_ptr (struct ui_file *, gdb_stderr) gen_ret_current_ui_field_ptr (struct ui_file *, gdb_stdlog) +gen_ret_current_ui_field_ptr (struct ui_out *, current_uiout) /* Initialization file name for gdb. This is host-dependent. */ diff --git a/gdb/top.h b/gdb/top.h index 31c4a8e..dfef32c 100644 --- a/gdb/top.h +++ b/gdb/top.h @@ -98,6 +98,9 @@ struct ui *_unfiltered. In the very near future that restriction shall be removed - either call shall be unfiltered. (cagney 1999-06-13). */ struct ui_file *m_gdb_stdlog; + + /* The current ui_out. */ + struct ui_out *m_current_uiout; }; /* The main UI. This is the UI that is bound to stdin/stdout/stderr. diff --git a/gdb/ui-out.c b/gdb/ui-out.c index 4ea571b..3972a56 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -147,11 +147,6 @@ pop_level (struct ui_out *uiout, return uiout->level + 1; } -/* FIXME: This should not be a global, but something passed down from main.c - or top.c. */ - -struct ui_out *current_uiout = NULL; - /* These are the interfaces to implementation functions. */ static void uo_table_begin (struct ui_out *uiout, int nbrofcols, diff --git a/gdb/ui-out.h b/gdb/ui-out.h index 905d73c..9e1e74d 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -32,7 +32,8 @@ struct ui_file; /* FIXME: This should not be a global but something passed down from main.c or top.c. */ -extern struct ui_out *current_uiout; +extern struct ui_out **current_ui_current_uiout_ptr (void); +#define current_uiout (*current_ui_current_uiout_ptr ()) /* alignment enum */ enum ui_align -- 2.5.5