From 644cebc98ce121ef7e6a8c0d1867ae01e936b41b Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 27 Feb 2012 16:22:16 +0000 Subject: [PATCH] 2012-02-27 Pedro Alves gdb/gdbserver/ * linux-low.c (pid_is_stopped): Delete, moved to common/. (linux_attach_lwp_1): Adjust to use linux_proc_pid_is_stopped. gdb/ * linux-nat.c (pid_is_stopped): Delete, moved to common/. (linux_nat_post_attach_wait): Adjust to use linux_proc_pid_is_stopped. * common/linux-procfs.h (linux_proc_pid_is_stopped): Declare. * common/linux-procfs.c (linux_proc_pid_is_stopped): New function, based on pid_is_stopped from both linux-nat.c and gdbserver/linux-low.c, and renamed. --- gdb/ChangeLog | 10 ++++++++++ gdb/common/linux-procfs.c | 31 +++++++++++++++++++++++++++++++ gdb/common/linux-procfs.h | 5 +++++ gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-low.c | 33 +-------------------------------- gdb/linux-nat.c | 33 +-------------------------------- 6 files changed, 53 insertions(+), 64 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0772ee87af2..e2379f4791e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2012-02-27 Pedro Alves + + * linux-nat.c (pid_is_stopped): Delete, moved to common/. + (linux_nat_post_attach_wait): Adjust to use + linux_proc_pid_is_stopped. + * common/linux-procfs.h (linux_proc_pid_is_stopped): Declare. + * common/linux-procfs.c (linux_proc_pid_is_stopped): New function, + based on pid_is_stopped from both linux-nat.c and + gdbserver/linux-low.c, and renamed. + 2012-02-24 Maciej W. Rozycki * remote.c (remote_watchpoint_addr_within_range): New function. diff --git a/gdb/common/linux-procfs.c b/gdb/common/linux-procfs.c index 421f36edb46..165383e8755 100644 --- a/gdb/common/linux-procfs.c +++ b/gdb/common/linux-procfs.c @@ -53,3 +53,34 @@ linux_proc_get_tgid (int lwpid) return tgid; } + +/* Detect `T (stopped)' in `/proc/PID/status'. + Other states including `T (tracing stop)' are reported as false. */ + +int +linux_proc_pid_is_stopped (pid_t pid) +{ + FILE *status_file; + char buf[100]; + int retval = 0; + + snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid); + status_file = fopen (buf, "r"); + if (status_file != NULL) + { + int have_state = 0; + + while (fgets (buf, sizeof (buf), status_file)) + { + if (strncmp (buf, "State:", 6) == 0) + { + have_state = 1; + break; + } + } + if (have_state && strstr (buf, "T (stopped)") != NULL) + retval = 1; + fclose (status_file); + } + return retval; +} diff --git a/gdb/common/linux-procfs.h b/gdb/common/linux-procfs.h index a4ba4a1b48d..c1e55474ad7 100644 --- a/gdb/common/linux-procfs.h +++ b/gdb/common/linux-procfs.h @@ -26,4 +26,9 @@ extern int linux_proc_get_tgid (int lwpid); +/* Detect `T (stopped)' in `/proc/PID/status'. + Other states including `T (tracing stop)' are reported as false. */ + +extern int linux_proc_pid_is_stopped (pid_t pid); + #endif /* COMMON_LINUX_PROCFS_H */ diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index b6d9ce93932..fed95bfd8e7 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2012-02-27 Pedro Alves + + * linux-low.c (pid_is_stopped): Delete, moved to common/. + (linux_attach_lwp_1): Adjust to use linux_proc_pid_is_stopped. + 2012-02-27 Pedro Alves PR server/9684 diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index f2887e65413..8f57ee3407c 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -598,37 +598,6 @@ linux_create_inferior (char *program, char **allargs) return pid; } -/* Detect `T (stopped)' in `/proc/PID/status'. - Other states including `T (tracing stop)' are reported as false. */ - -static int -pid_is_stopped (pid_t pid) -{ - FILE *status_file; - char buf[100]; - int retval = 0; - - snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid); - status_file = fopen (buf, "r"); - if (status_file != NULL) - { - int have_state = 0; - - while (fgets (buf, sizeof (buf), status_file)) - { - if (strncmp (buf, "State:", 6) == 0) - { - have_state = 1; - break; - } - } - if (have_state && strstr (buf, "T (stopped)") != NULL) - retval = 1; - fclose (status_file); - } - return retval; -} - /* Attach to an inferior process. */ static void @@ -674,7 +643,7 @@ linux_attach_lwp_1 (unsigned long lwpid, int initial) ptrace call on this LWP. */ new_lwp->must_set_ptrace_flags = 1; - if (pid_is_stopped (lwpid)) + if (linux_proc_pid_is_stopped (lwpid)) { if (debug_threads) fprintf (stderr, diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 3731096d585..e4263870f18 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -1356,37 +1356,6 @@ exit_lwp (struct lwp_info *lp) delete_lwp (lp->ptid); } -/* Detect `T (stopped)' in `/proc/PID/status'. - Other states including `T (tracing stop)' are reported as false. */ - -static int -pid_is_stopped (pid_t pid) -{ - FILE *status_file; - char buf[100]; - int retval = 0; - - snprintf (buf, sizeof (buf), "/proc/%d/status", (int) pid); - status_file = fopen (buf, "r"); - if (status_file != NULL) - { - int have_state = 0; - - while (fgets (buf, sizeof (buf), status_file)) - { - if (strncmp (buf, "State:", 6) == 0) - { - have_state = 1; - break; - } - } - if (have_state && strstr (buf, "T (stopped)") != NULL) - retval = 1; - fclose (status_file); - } - return retval; -} - /* Wait for the LWP specified by LP, which we have just attached to. Returns a wait status for that LWP, to cache. */ @@ -1397,7 +1366,7 @@ linux_nat_post_attach_wait (ptid_t ptid, int first, int *cloned, pid_t new_pid, pid = GET_LWP (ptid); int status; - if (pid_is_stopped (pid)) + if (linux_proc_pid_is_stopped (pid)) { if (debug_linux_nat) fprintf_unfiltered (gdb_stdlog, -- 2.30.2