aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simark@simark.ca>2016-09-16 15:44:29 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2016-09-16 15:44:29 -0400
commitcd94f6d535d1ebd8f252185cd84d21fe0df3c893 (patch)
tree617d4e6f8e0d6b7b644458ccff368c73fc9f9539
parent325fac504a327de9c46a4e5cf9c88ece9d9d7701 (diff)
downloadgdb-cd94f6d535d1ebd8f252185cd84d21fe0df3c893.zip
gdb-cd94f6d535d1ebd8f252185cd84d21fe0df3c893.tar.gz
gdb-cd94f6d535d1ebd8f252185cd84d21fe0df3c893.tar.bz2
Introduce cleanup to restore current_uiout
Make a globally available cleanup from a pre-existing one in infrun.c. This is used in a 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.
-rw-r--r--gdb/ChangeLog13
-rw-r--r--gdb/infrun.c12
-rw-r--r--gdb/python/python.c3
-rw-r--r--gdb/ui-out.c18
-rw-r--r--gdb/ui-out.h4
-rw-r--r--gdb/utils.c23
-rw-r--r--gdb/utils.h3
7 files changed, 38 insertions, 38 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8cbd81..2c980b7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2016-09-16 Simon Marchi <simark@simark.ca>
+
+ * 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.
+
2016-09-16 Pedro Alves <palves@redhat.com>
* defs.h (min, max): Delete.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 70d7a09..ec37ca1 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -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);
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 621e201..b00b70b 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -654,7 +654,8 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
make_cleanup_restore_integer (&current_ui->async);
current_ui->async = 0;
- make_cleanup_restore_ui_out (&current_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");
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 3972a56..ec44ab6 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -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
diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index 9e1e74d..6a4d78a 100644
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -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 */
diff --git a/gdb/utils.c b/gdb/utils.c
index 5188828..2afff80 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -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;
diff --git a/gdb/utils.h b/gdb/utils.h
index 6080f5b..bf77d7d 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -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);