From 03f4463bfce516cf7275ec2deb211c1bf2b5c67d Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Mon, 22 Sep 2014 11:33:59 +0100 Subject: [PATCH] Rename target_{stop,continue}_ptid This commit renames target_stop_ptid as target_stop_and_wait and target_continue_ptid as target_continue_no_signal. Comments are updated to more fully describe the functions' behaviour. gdb/ChangeLog: * target/target.h (target_stop_ptid): Renamed as... (target_stop_and_wait): New function. Updated comment. All uses updated. (target_continue_ptid): Renamed as... (target_continue_no_signal): New function. Updated comment. All uses updated. --- gdb/ChangeLog | 9 +++++++++ gdb/common/agent.c | 4 ++-- gdb/gdbserver/target.c | 4 ++-- gdb/target.c | 4 ++-- gdb/target/target.h | 16 +++++++++------- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 90a991d39d..48e39df1a8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2014-09-22 Gary Benson + + * target/target.h (target_stop_ptid): Renamed as... + (target_stop_and_wait): New function. Updated comment. + All uses updated. + (target_continue_ptid): Renamed as... + (target_continue_no_signal): New function. Updated comment. + All uses updated. + 2014-09-22 Pedro Alves * NEWS: Mention merge of "breakpoint always-inserted" modes "off" diff --git a/gdb/common/agent.c b/gdb/common/agent.c index 854a997568..0c3d7a3d4b 100644 --- a/gdb/common/agent.c +++ b/gdb/common/agent.c @@ -204,7 +204,7 @@ agent_run_command (int pid, const char *cmd, int len) DEBUG_AGENT ("agent: resumed helper thread\n"); /* Resume helper thread. */ - target_continue_ptid (ptid); + target_continue_no_signal (ptid); fd = gdb_connect_sync_socket (pid); if (fd >= 0) @@ -238,7 +238,7 @@ agent_run_command (int pid, const char *cmd, int len) { /* Stop thread PTID. */ DEBUG_AGENT ("agent: stop helper thread\n"); - target_stop_ptid (ptid); + target_stop_and_wait (ptid); } if (fd >= 0) diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c index c95b2f035e..d63e21182a 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -137,7 +137,7 @@ mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options, /* See target/target.h. */ void -target_stop_ptid (ptid_t ptid) +target_stop_and_wait (ptid_t ptid) { struct target_waitstatus status; int was_non_stop = non_stop; @@ -156,7 +156,7 @@ target_stop_ptid (ptid_t ptid) /* See target/target.h. */ void -target_continue_ptid (ptid_t ptid) +target_continue_no_signal (ptid_t ptid) { struct thread_resume resume_info; diff --git a/gdb/target.c b/gdb/target.c index 339b1d14e6..c1b5182461 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3030,7 +3030,7 @@ target_stop (ptid_t ptid) /* See target/target.h. */ void -target_stop_ptid (ptid_t ptid) +target_stop_and_wait (ptid_t ptid) { struct target_waitstatus status; int was_non_stop = non_stop; @@ -3047,7 +3047,7 @@ target_stop_ptid (ptid_t ptid) /* See target/target.h. */ void -target_continue_ptid (ptid_t ptid) +target_continue_no_signal (ptid_t ptid) { target_resume (ptid, 0, GDB_SIGNAL_0); } diff --git a/gdb/target/target.h b/gdb/target/target.h index 99a79667e2..c8b9c8027a 100644 --- a/gdb/target/target.h +++ b/gdb/target/target.h @@ -59,15 +59,17 @@ extern int target_read_uint32 (CORE_ADDR memaddr, uint32_t *result); extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, ssize_t len); -/* Make target stop in a continuable fashion. (For instance, under - Unix, this should act like SIGSTOP). This function must be - provided by the client. */ +/* Cause the target to stop in a continuable fashion--for instance, + under Unix, this should act like SIGSTOP--and wait for the target + to be stopped before returning. This function must be provided by + the client. */ -extern void target_stop_ptid (ptid_t ptid); +extern void target_stop_and_wait (ptid_t ptid); -/* Restart a target that was previously stopped by target_stop_ptid. - This function must be provided by the client. */ +/* Restart a target previously stopped by target_stop_and_wait. + No signal is delivered to the target. This function must be + provided by the client. */ -extern void target_continue_ptid (ptid_t ptid); +extern void target_continue_no_signal (ptid_t ptid); #endif /* TARGET_COMMON_H */ -- 2.34.1