From patchwork Mon Oct 3 04:22:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 16208 Received: (qmail 75070 invoked by alias); 3 Oct 2016 04:22:45 -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 75041 invoked by uid 89); 3 Oct 2016 04:22:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.3 required=5.0 tests=AWL, BAYES_20, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=2.7.4, H*r:4.86_1, observers, H*RU:cmgw4 X-HELO: gproxy8-pub.mail.unifiedlayer.com Received: from gproxy8-pub.mail.unifiedlayer.com (HELO gproxy8-pub.mail.unifiedlayer.com) (67.222.33.93) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Mon, 03 Oct 2016 04:22:34 +0000 Received: (qmail 20520 invoked by uid 0); 3 Oct 2016 04:22:33 -0000 Received: from unknown (HELO cmgw4) (10.0.90.85) by gproxy8.mail.unifiedlayer.com with SMTP; 3 Oct 2016 04:22:33 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id qsNW1t0062f2jeq01sNZtJ; Sun, 02 Oct 2016 22:22:33 -0600 X-Authority-Analysis: v=2.1 cv=WP/sABcR c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=CH0kA5CcgfcA:10 a=zstS-IiYAAAA:8 a=26xDF4CQttDplSrDsHEA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 71-218-192-86.hlrn.qwest.net ([71.218.192.86]:60644 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1bqulp-0001Vt-U4; Sun, 02 Oct 2016 22:22:30 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 2/4] Change types to match observer.attach Date: Sun, 2 Oct 2016 22:22:20 -0600 Message-Id: <1475468542-11446-3-git-send-email-tom@tromey.com> In-Reply-To: <1475468542-11446-1-git-send-email-tom@tromey.com> References: <1475468542-11446-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1bqulp-0001Vt-U4 X-Source-Sender: 71-218-192-86.hlrn.qwest.net (bapiya.Home) [71.218.192.86]:60644 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== The first patch changed the return type of the observer attach function. This patch changes the few spots where this type matters. 2016-10-02 Tom Tromey * tui/tui-hooks.c (tui_bp_created_observer) (tui_bp_deleted_observer, tui_bp_modified_observer) (tui_inferior_exit_observer, tui_before_prompt_observer) (tui_normal_stop_observer, tui_register_changed_observer): Change type. * record-btrace.c (record_btrace_thread_observer): Change type. --- gdb/ChangeLog | 7 +++++++ gdb/record-btrace.c | 3 ++- gdb/tui/tui-hooks.c | 21 ++++++++++++++------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 69d8a82..8265310 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2016-10-02 Tom Tromey + * tui/tui-hooks.c (tui_bp_created_observer) + (tui_bp_deleted_observer, tui_bp_modified_observer) + (tui_inferior_exit_observer, tui_before_prompt_observer) + (tui_normal_stop_observer, tui_register_changed_observer): Change + type. + * record-btrace.c (record_btrace_thread_observer): Change type. + * observer.sh: Remove. * observer.h: New file. * observer.c (namespace gdb_observers): Define new objects. diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 257d0b0..9876943 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -45,7 +45,8 @@ static struct target_ops record_btrace_ops; /* A new thread observer enabling branch tracing for the new thread. */ -static struct observer *record_btrace_thread_observer; +static gdb_observers::observer1::func_type + record_btrace_thread_observer; /* Memory access types used in set/show record btrace replay-memory-access. */ static const char replay_memory_access_read_only[] = "read-only"; diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c index 5a03b61..8ca254d 100644 --- a/gdb/tui/tui-hooks.c +++ b/gdb/tui/tui-hooks.c @@ -207,13 +207,20 @@ tui_normal_stop (struct bpstats *bs, int print_frame) } /* Observers created when installing TUI hooks. */ -static struct observer *tui_bp_created_observer; -static struct observer *tui_bp_deleted_observer; -static struct observer *tui_bp_modified_observer; -static struct observer *tui_inferior_exit_observer; -static struct observer *tui_before_prompt_observer; -static struct observer *tui_normal_stop_observer; -static struct observer *tui_register_changed_observer; +static gdb_observers::observer1::func_type + tui_bp_created_observer; +static gdb_observers::observer1::func_type + tui_bp_deleted_observer; +static gdb_observers::observer1::func_type + tui_bp_modified_observer; +static gdb_observers::observer1::func_type + tui_inferior_exit_observer; +static gdb_observers::observer1::func_type + tui_before_prompt_observer; +static gdb_observers::observer2::func_type + tui_normal_stop_observer; +static gdb_observers::observer2::func_type + tui_register_changed_observer; /* Install the TUI specific hooks. */ void