From 54ba13f733396d107167bf89afd43db66bebe779 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 5 Feb 2009 18:54:50 +0000 Subject: [PATCH] * target.h (target_tid_to_str): Delete. * thread.c (print_thread_info, thread_apply_all_command) (thread_apply_command, thread_command, do_captured_thread_select): Use target_pid_to_str instead of target_tid_to_str. * linux-fork.c (delete_fork_command): Likewise. --- gdb/ChangeLog | 8 ++++++++ gdb/linux-fork.c | 2 +- gdb/target.h | 4 ---- gdb/thread.c | 12 ++++++------ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 94adead7370..7b020b1e7e6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2009-02-05 Pedro Alves + + * target.h (target_tid_to_str): Delete. + * thread.c (print_thread_info, thread_apply_all_command) + (thread_apply_command, thread_command, do_captured_thread_select): + Use target_pid_to_str instead of target_tid_to_str. + * linux-fork.c (delete_fork_command): Likewise. + 2009-02-05 Pedro Alves * frame.c (has_stack_frames): Make public. diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index 6d9b1e9b957..861917d81bf 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -439,7 +439,7 @@ delete_fork_command (char *args, int from_tty) error (_("Please switch to another fork/checkpoint before deleting the current one")); if (ptrace (PTRACE_KILL, PIDGET (ptid), 0, 0)) - error (_("Unable to kill pid %s"), target_tid_to_str (ptid)); + error (_("Unable to kill pid %s"), target_pid_to_str (ptid)); if (from_tty) printf_filtered (_("Killed %s\n"), target_pid_to_str (ptid)); diff --git a/gdb/target.h b/gdb/target.h index 7cdd81e4e86..5b5fa5e392d 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1016,11 +1016,7 @@ int target_supports_non_stop (void); #undef target_pid_to_str #define target_pid_to_str(PID) current_target.to_pid_to_str (PID) -#ifndef target_tid_to_str -#define target_tid_to_str(PID) \ - target_pid_to_str (PID) extern char *normal_pid_to_str (ptid_t ptid); -#endif /* Return a short string describing extra information about PID, e.g. "sleeping", "runnable", "running on LWP 3". Null return value diff --git a/gdb/thread.c b/gdb/thread.c index 1d6d9c4d8c6..9dea7c2fa0d 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -746,7 +746,7 @@ print_thread_info (struct ui_out *uiout, int requested_thread, int pid) ui_out_field_int (uiout, "id", tp->num); ui_out_text (uiout, " "); - ui_out_field_string (uiout, "target-id", target_tid_to_str (tp->ptid)); + ui_out_field_string (uiout, "target-id", target_pid_to_str (tp->ptid)); extra_info = target_extra_thread_info (tp); if (extra_info) @@ -996,7 +996,7 @@ thread_apply_all_command (char *cmd, int from_tty) switch_to_thread (tp->ptid); printf_filtered (_("\nThread %d (%s):\n"), - tp->num, target_tid_to_str (inferior_ptid)); + tp->num, target_pid_to_str (inferior_ptid)); execute_command (cmd, from_tty); strcpy (cmd, saved_cmd); /* Restore exact command used previously */ } @@ -1066,7 +1066,7 @@ thread_apply_command (char *tidlist, int from_tty) switch_to_thread (tp->ptid); printf_filtered (_("\nThread %d (%s):\n"), tp->num, - target_tid_to_str (inferior_ptid)); + target_pid_to_str (inferior_ptid)); execute_command (cmd, from_tty); /* Restore exact command used previously. */ @@ -1091,11 +1091,11 @@ thread_command (char *tidstr, int from_tty) if (is_exited (inferior_ptid)) printf_filtered (_("[Current thread is %d (%s) (exited)]\n"), pid_to_thread_id (inferior_ptid), - target_tid_to_str (inferior_ptid)); + target_pid_to_str (inferior_ptid)); else printf_filtered (_("[Current thread is %d (%s)]\n"), pid_to_thread_id (inferior_ptid), - target_tid_to_str (inferior_ptid)); + target_pid_to_str (inferior_ptid)); } else error (_("No stack.")); @@ -1139,7 +1139,7 @@ do_captured_thread_select (struct ui_out *uiout, void *tidstr) ui_out_text (uiout, "[Switching to thread "); ui_out_field_int (uiout, "new-thread-id", pid_to_thread_id (inferior_ptid)); ui_out_text (uiout, " ("); - ui_out_text (uiout, target_tid_to_str (inferior_ptid)); + ui_out_text (uiout, target_pid_to_str (inferior_ptid)); ui_out_text (uiout, ")]"); /* Note that we can't reach this with an exited thread, due to the -- 2.30.2