From patchwork Thu Oct 13 21:10:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 16488 Received: (qmail 2476 invoked by alias); 13 Oct 2016 21:11:24 -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 2123 invoked by uid 89); 13 Oct 2016 21:11:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=1, 11, 9496 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; Thu, 13 Oct 2016 21:11:07 +0000 Received: (qmail 20228 invoked by uid 0); 13 Oct 2016 21:11:06 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy8.mail.unifiedlayer.com with SMTP; 13 Oct 2016 21:11:06 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by CMOut01 with id v9AM1t01r2f2jeq019AQnr; Thu, 13 Oct 2016 15:10:24 -0600 X-Authority-Analysis: v=2.1 cv=beT4Do/B 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=5rg8zLzKqUK2Ye7Qjc4A:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:42448 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1bunGh-00011Z-9y; Thu, 13 Oct 2016 15:10:23 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v2 12/17] Remove make_cleanup_restore_current_uiout Date: Thu, 13 Oct 2016 15:10:07 -0600 Message-Id: <1476393012-29987-13-git-send-email-tom@tromey.com> In-Reply-To: <1476393012-29987-1-git-send-email-tom@tromey.com> References: <1476393012-29987-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1bunGh-00011Z-9y X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:42448 X-Source-Auth: tom+tromey.com X-Email-Count: 13 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This removes make_cleanup_restore_current_uiout in favor of an RAII-based class. 2016-10-10 Tom Tromey * stack.c (print_stack_frame_to_uiout): Use scoped_restore. * ui-out.c (make_cleanup_restore_current_uiout) (restore_current_uiout_cleanup): Remove. * infrun.c (print_stop_event): Use scoped_restore. * ui-out.h (make_cleanup_restore_current_uiout): Don't declare. --- gdb/ChangeLog | 8 ++++++++ gdb/infrun.c | 15 +++++++-------- gdb/python/python.c | 2 +- gdb/stack.c | 7 +------ gdb/ui-out.c | 18 ------------------ gdb/ui-out.h | 4 ---- 6 files changed, 17 insertions(+), 37 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ea777f6..d2e51f4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2016-10-10 Tom Tromey + + * stack.c (print_stack_frame_to_uiout): Use scoped_restore. + * ui-out.c (make_cleanup_restore_current_uiout) + (restore_current_uiout_cleanup): Remove. + * infrun.c (print_stop_event): Use scoped_restore. + * ui-out.h (make_cleanup_restore_current_uiout): Don't declare. + 2016-09-26 Tom Tromey * elfread.c (elf_read_minimal_symbols): Use gdb::unique_ptr. diff --git a/gdb/infrun.c b/gdb/infrun.c index 1864019..493a25e 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -8082,22 +8082,21 @@ print_stop_location (struct target_waitstatus *ws) void print_stop_event (struct ui_out *uiout) { - struct cleanup *old_chain; struct target_waitstatus last; ptid_t last_ptid; struct thread_info *tp; get_last_target_status (&last_ptid, &last); - old_chain = make_cleanup_restore_current_uiout (); - current_uiout = uiout; - - print_stop_location (&last); + { + scoped_restore save_uiout = make_scoped_restore (¤t_uiout); + current_uiout = uiout; - /* Display the auto-display expressions. */ - do_displays (); + print_stop_location (&last); - do_cleanups (old_chain); + /* Display the auto-display expressions. */ + do_displays (); + } tp = inferior_thread (); if (tp->thread_fsm != NULL diff --git a/gdb/python/python.c b/gdb/python/python.c index 53f83b8..d9940c2 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -649,7 +649,7 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw) scoped_restore save_async = make_scoped_restore (¤t_ui->async, 0); - make_cleanup_restore_current_uiout (); + scoped_restore save_uiout = make_scoped_restore (¤t_uiout); /* Use the console interpreter uiout to have the same print format for console or MI. */ diff --git a/gdb/stack.c b/gdb/stack.c index 0f8b336..44ee81d 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -149,15 +149,10 @@ print_stack_frame_to_uiout (struct ui_out *uiout, struct frame_info *frame, int print_level, enum print_what print_what, int set_current_sal) { - struct cleanup *old_chain; - - old_chain = make_cleanup_restore_current_uiout (); - + scoped_restore save_uiout = make_scoped_restore (¤t_uiout); current_uiout = uiout; print_stack_frame (frame, print_level, print_what, set_current_sal); - - do_cleanups (old_chain); } /* Show or print a stack frame FRAME briefly. The output is formatted diff --git a/gdb/ui-out.c b/gdb/ui-out.c index 9b1df3c..8c39198 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -949,24 +949,6 @@ ui_out_destroy (struct ui_out *uiout) xfree (uiout); } -/* Cleanup that restores a previous current uiout. */ - -static void -restore_current_uiout_cleanup (void *arg) -{ - struct ui_out *saved_uiout = (struct ui_out *) arg; - - current_uiout = saved_uiout; -} - -/* See ui-out.h. */ - -struct cleanup * -make_cleanup_restore_current_uiout (void) -{ - return make_cleanup (restore_current_uiout_cleanup, current_uiout); -} - /* Standard gdb initialization hook. */ void diff --git a/gdb/ui-out.h b/gdb/ui-out.h index 6a4d78a..9e1e74d 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -247,8 +247,4 @@ extern void ui_out_destroy (struct ui_out *uiout); extern int ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream); -/* Make a cleanup that restores the previous current uiout. */ - -extern struct cleanup *make_cleanup_restore_current_uiout (void); - #endif /* UI_OUT_H */