This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 07/11] Remove unused deprecated_target_wait_hook
- From: Philipp Rudo <prudo at linux dot vnet dot ibm dot com>
- To: gdb-patches at sourceware dot org
- Cc: arnez at linux dot vnet dot ibm dot com
- Date: Tue, 28 Feb 2017 15:50:12 +0100
- Subject: [PATCH 07/11] Remove unused deprecated_target_wait_hook
- Authentication-results: sourceware.org; auth=none
- References: <20170228145016.22604-1-prudo@linux.vnet.ibm.com>
Nobody actually uses this hook anymore. So simply remove it.
gdb/ChangeLog
* defs.h (deprecated_target_wait_hook): Remove.
* top.c (deprecated_target_wait_hook): Remove.
* interps.c (clear_interpreter_hooks): Adjust.
* infrun.c (get_last_target_status): Adjust comment.
(do_target_wait, wait_one): Adjust.
---
gdb/defs.h | 4 ----
gdb/infrun.c | 23 ++++++-----------------
gdb/interps.c | 1 -
gdb/top.c | 7 -------
4 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/gdb/defs.h b/gdb/defs.h
index 6133eb9..3c97825 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -672,10 +672,6 @@ extern void (*deprecated_print_frame_info_listing_hook) (struct symtab * s,
int noerror);
extern int (*deprecated_query_hook) (const char *, va_list)
ATTRIBUTE_FPTR_PRINTF(1,0);
-extern ptid_t (*deprecated_target_wait_hook) (ptid_t ptid,
- struct target_waitstatus *status,
- int options);
-
extern void (*deprecated_attach_hook) (void);
extern void (*deprecated_detach_hook) (void);
extern void (*deprecated_call_command_hook) (struct cmd_list_element * c,
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 2085c94..104c91b 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -389,8 +389,8 @@ show_stop_on_solib_events (struct ui_file *file, int from_tty,
static int stop_print_frame;
/* This is a cached copy of the pid/waitstatus of the last event
- returned by target_wait()/deprecated_target_wait_hook(). This
- information is returned by get_last_target_status(). */
+ returned by target_wait(). This information is returned by
+ get_last_target_status(). */
static ptid_t target_last_wait_ptid;
static struct target_waitstatus target_last_waitstatus;
@@ -3514,7 +3514,6 @@ random_pending_event_thread (ptid_t waiton_ptid)
static ptid_t
do_target_wait (ptid_t ptid, struct target_waitstatus *status, int options)
{
- ptid_t event_ptid;
struct thread_info *tp;
/* First check if there is a resumed thread with a wait status
@@ -3630,13 +3629,7 @@ do_target_wait (ptid_t ptid, struct target_waitstatus *status, int options)
}
/* But if we don't find one, we'll have to wait. */
-
- if (deprecated_target_wait_hook)
- event_ptid = deprecated_target_wait_hook (ptid, status, options);
- else
- event_ptid = target_wait (ptid, status, options);
-
- return event_ptid;
+ return target_wait (ptid, status, options);
}
/* Prepare and stabilize the inferior for detaching it. E.g.,
@@ -4050,9 +4043,8 @@ set_last_target_status (ptid_t ptid, struct target_waitstatus status)
}
/* Return the cached copy of the last pid/waitstatus returned by
- target_wait()/deprecated_target_wait_hook(). The data is actually
- cached by handle_inferior_event(), which gets called immediately
- after target_wait()/deprecated_target_wait_hook(). */
+ target_wait(). The data is actually cached by handle_inferior_event(),
+ which gets called immediately after target_wait(). */
void
get_last_target_status (ptid_t *ptidp, struct target_waitstatus *status)
@@ -4341,10 +4333,7 @@ wait_one (struct target_waitstatus *ws)
don't get any event. */
target_dcache_invalidate ();
- if (deprecated_target_wait_hook)
- event_ptid = deprecated_target_wait_hook (wait_ptid, ws, 0);
- else
- event_ptid = target_wait (wait_ptid, ws, 0);
+ event_ptid = target_wait (wait_ptid, ws, 0);
if (debug_infrun)
print_target_wait_results (wait_ptid, event_ptid, ws);
diff --git a/gdb/interps.c b/gdb/interps.c
index 8f122c5..4cc9ae5 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -391,7 +391,6 @@ clear_interpreter_hooks (void)
deprecated_print_frame_info_listing_hook = 0;
/*print_frame_more_info_hook = 0; */
deprecated_query_hook = 0;
- deprecated_target_wait_hook = 0;
deprecated_call_command_hook = 0;
deprecated_error_begin_hook = 0;
}
diff --git a/gdb/top.c b/gdb/top.c
index cc5df78..0ddef13 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -200,13 +200,6 @@ int (*deprecated_query_hook) (const char *, va_list);
void (*deprecated_attach_hook) (void);
void (*deprecated_detach_hook) (void);
-/* Called when going to wait for the target. Usually allows the GUI
- to run while waiting for target events. */
-
-ptid_t (*deprecated_target_wait_hook) (ptid_t ptid,
- struct target_waitstatus *status,
- int options);
-
/* Used by UI as a wrapper around command execution. May do various
things like enabling/disabling buttons, etc... */
--
2.8.4