[master+7.12,v2,1/3] Introduce cleanup to restore current_uiout
Commit Message
On 14/09/16 01:56 PM, Pedro Alves wrote:
> On 09/14/2016 06:45 PM, Simon Marchi wrote:
>> Make a globally available cleanup from a pre-existing one in infrun.c.
>> This is used in the following patch.
>>
>> gdb/ChangeLog:
>>
>> * infrun.c (restore_current_uiout_cleanup): Move to ui-out.c.
>> (print_stop_event): Use make_cleanup_restore_current_uiout.
>> * ui-out.c (restore_current_uiout_cleanup): Move from infrun.c.
>> (make_cleanup_restore_current_uiout): New function definition.
>> * ui-out.h (make_cleanup_restore_current_uiout): New function
>> definition.
>
> OK.
>
> Thanks,
> Pedro Alves
A little addition, I replace the usage of make_cleanup_restore_ui_out in python.c
by this new make_cleanup_restore_current_uiout, and remove
make_cleanupt_restore_ui_out.
From 21169da5b93b01a1c83174f79e6a377c7049974a Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Tue, 13 Sep 2016 16:44:05 -0400
Subject: [PATCH] Introduce cleanup to restore current_uiout
Make a globally available cleanup from a pre-existing one in infrun.c.
This is used in the following patch.
gdb/ChangeLog:
* infrun.c (restore_current_uiout_cleanup): Move to ui-out.c.
(print_stop_event): Use make_cleanup_restore_current_uiout.
* python/python.c (execute_gdb_command): Likewise.
* ui-out.c (restore_current_uiout_cleanup): Move from infrun.c.
(make_cleanup_restore_current_uiout): New function definition.
* ui-out.h (make_cleanup_restore_current_uiout): New function
declaration.
* utils.c (do_restore_ui_out): Remove.
(make_cleanup_restore_ui_out): Remove.
* utils.h (make_cleanup_restore_ui_out): Remove.
---
gdb/infrun.c | 12 +-----------
gdb/python/python.c | 3 ++-
gdb/ui-out.c | 18 ++++++++++++++++++
gdb/ui-out.h | 4 ++++
gdb/utils.c | 23 -----------------------
gdb/utils.h | 3 ---
6 files changed, 25 insertions(+), 38 deletions(-)
Comments
On 09/15/2016 04:23 AM, Simon Marchi wrote:
> On 14/09/16 01:56 PM, Pedro Alves wrote:
>> On 09/14/2016 06:45 PM, Simon Marchi wrote:
>>> Make a globally available cleanup from a pre-existing one in infrun.c.
>>> This is used in the following patch.
>>>
>>> gdb/ChangeLog:
>>>
>>> * infrun.c (restore_current_uiout_cleanup): Move to ui-out.c.
>>> (print_stop_event): Use make_cleanup_restore_current_uiout.
>>> * ui-out.c (restore_current_uiout_cleanup): Move from infrun.c.
>>> (make_cleanup_restore_current_uiout): New function definition.
>>> * ui-out.h (make_cleanup_restore_current_uiout): New function
>>> definition.
>>
>> OK.
>>
>> Thanks,
>> Pedro Alves
>
> A little addition, I replace the usage of make_cleanup_restore_ui_out in python.c
> by this new make_cleanup_restore_current_uiout, and remove
> make_cleanupt_restore_ui_out.
OK.
Thanks,
Pedro Alves
On 16-09-16 03:51 PM, Simon Marchi wrote:
> On 16-09-16 02:18 PM, Pedro Alves wrote:
>> OK.
>
> Thanks, pushed!
I had forgotten to push this to the 7.12 branch. It was necessary for the
user-selection notification patches to build. I just pushed it.
@@ -8096,16 +8096,6 @@ print_stop_location (struct target_waitstatus *ws)
print_stack_frame (get_selected_frame (NULL), 0, source_flag, 1);
}
-/* 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 infrun.h. */
void
@@ -8118,7 +8108,7 @@ print_stop_event (struct ui_out *uiout)
get_last_target_status (&last_ptid, &last);
- old_chain = make_cleanup (restore_current_uiout_cleanup, current_uiout);
+ old_chain = make_cleanup_restore_current_uiout ();
current_uiout = uiout;
print_stop_location (&last);
@@ -654,7 +654,8 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
make_cleanup_restore_integer (¤t_ui->async);
current_ui->async = 0;
- make_cleanup_restore_ui_out (¤t_uiout);
+ make_cleanup_restore_current_uiout ();
+
/* Use the console interpreter uiout to have the same print format
for console or MI. */
interp = interp_lookup (current_ui, "console");
@@ -953,6 +953,24 @@ 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
@@ -247,4 +247,8 @@ 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 */
@@ -338,29 +338,6 @@ struct restore_ui_out_closure
struct ui_out *value;
};
-static void
-do_restore_ui_out (void *p)
-{
- struct restore_ui_out_closure *closure
- = (struct restore_ui_out_closure *) p;
-
- *(closure->variable) = closure->value;
-}
-
-/* Remember the current value of *VARIABLE and make it restored when
- the cleanup is run. */
-
-struct cleanup *
-make_cleanup_restore_ui_out (struct ui_out **variable)
-{
- struct restore_ui_out_closure *c = XNEW (struct restore_ui_out_closure);
-
- c->variable = variable;
- c->value = *variable;
-
- return make_cleanup_dtor (do_restore_ui_out, (void *) c, xfree);
-}
-
struct restore_ui_file_closure
{
struct ui_file **variable;
@@ -93,9 +93,6 @@ extern struct cleanup *make_cleanup_restore_uinteger (unsigned int *variable);
struct target_ops;
extern struct cleanup *make_cleanup_unpush_target (struct target_ops *ops);
-
-extern struct cleanup *
- make_cleanup_restore_ui_out (struct ui_out **variable);
extern struct cleanup *
make_cleanup_restore_ui_file (struct ui_file **variable);