Remove ptid_lwp_p

This removes ptid_lwp_p in favor of the ptid_t::lwp_p method.

gdb/ChangeLog
2018-07-03  Tom Tromey  <tom@tromey.com>

	* common/ptid.c (ptid_lwp_p): Remove.
	* common/ptid.h (ptid_lwp_p): Don't declare.
	* fbsd-nat.c: Update.
	* linux-nat.c: Update.
	* nat/linux-procfs.c: Update.
	* nat/x86-linux-dregs.c: Update.
	* sol-thread.c: Update.
This commit is contained in:
Tom Tromey
2018-06-11 12:20:11 -06:00
parent 0e998d966b
commit 15a9e13e52
8 changed files with 20 additions and 22 deletions

View File

@ -1,3 +1,13 @@
2018-07-03 Tom Tromey <tom@tromey.com>
* common/ptid.c (ptid_lwp_p): Remove.
* common/ptid.h (ptid_lwp_p): Don't declare.
* fbsd-nat.c: Update.
* linux-nat.c: Update.
* nat/linux-procfs.c: Update.
* nat/x86-linux-dregs.c: Update.
* sol-thread.c: Update.
2018-07-03 Tom Tromey <tom@tromey.com> 2018-07-03 Tom Tromey <tom@tromey.com>
* common/ptid.c (ptid_is_pid): Remove. * common/ptid.c (ptid_is_pid): Remove.

View File

@ -35,14 +35,6 @@ ptid_equal (const ptid_t &ptid1, const ptid_t &ptid2)
/* See ptid.h. */ /* See ptid.h. */
int
ptid_lwp_p (const ptid_t &ptid)
{
return ptid.lwp_p ();
}
/* See ptid.h. */
int int
ptid_tid_p (const ptid_t &ptid) ptid_tid_p (const ptid_t &ptid)
{ {

View File

@ -160,10 +160,6 @@ extern ptid_t minus_one_ptid;
extern int ptid_equal (const ptid_t &ptid1, const ptid_t &ptid2); extern int ptid_equal (const ptid_t &ptid1, const ptid_t &ptid2);
/* See ptid_t::lwp_p. */
extern int ptid_lwp_p (const ptid_t &ptid);
/* See ptid_t::tid_p. */ /* See ptid_t::tid_p. */
extern int ptid_tid_p (const ptid_t &ptid); extern int ptid_tid_p (const ptid_t &ptid);

View File

@ -810,7 +810,7 @@ show_fbsd_nat_debug (struct ui_file *file, int from_tty,
bool bool
fbsd_nat_target::thread_alive (ptid_t ptid) fbsd_nat_target::thread_alive (ptid_t ptid)
{ {
if (ptid_lwp_p (ptid)) if (ptid.lwp_p ())
{ {
struct ptrace_lwpinfo pl; struct ptrace_lwpinfo pl;
@ -1102,7 +1102,7 @@ fbsd_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
"FLWP: fbsd_resume for ptid (%d, %ld, %ld)\n", "FLWP: fbsd_resume for ptid (%d, %ld, %ld)\n",
ptid.pid (), ptid.lwp (), ptid.pid (), ptid.lwp (),
ptid.tid ()); ptid.tid ());
if (ptid_lwp_p (ptid)) if (ptid.lwp_p ())
{ {
/* If ptid is a specific LWP, suspend all other LWPs in the process. */ /* If ptid is a specific LWP, suspend all other LWPs in the process. */
struct thread_info *tp; struct thread_info *tp;

View File

@ -858,7 +858,7 @@ add_initial_lwp (ptid_t ptid)
{ {
struct lwp_info *lp; struct lwp_info *lp;
gdb_assert (ptid_lwp_p (ptid)); gdb_assert (ptid.lwp_p ());
lp = XNEW (struct lwp_info); lp = XNEW (struct lwp_info);
@ -935,7 +935,7 @@ find_lwp_pid (ptid_t ptid)
int lwp; int lwp;
struct lwp_info dummy; struct lwp_info dummy;
if (ptid_lwp_p (ptid)) if (ptid.lwp_p ())
lwp = ptid.lwp (); lwp = ptid.lwp ();
else else
lwp = ptid.pid (); lwp = ptid.pid ();
@ -3933,7 +3933,7 @@ linux_nat_target::pid_to_str (ptid_t ptid)
{ {
static char buf[64]; static char buf[64];
if (ptid_lwp_p (ptid) if (ptid.lwp_p ()
&& (ptid.pid () != ptid.lwp () && (ptid.pid () != ptid.lwp ()
|| num_lwps (ptid.pid ()) > 1)) || num_lwps (ptid.pid ()) > 1))
{ {
@ -4663,7 +4663,7 @@ linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo)
ptid_t ptid_t
current_lwp_ptid (void) current_lwp_ptid (void)
{ {
gdb_assert (ptid_lwp_p (inferior_ptid)); gdb_assert (inferior_ptid.lwp_p ());
return inferior_ptid; return inferior_ptid;
} }

View File

@ -240,7 +240,7 @@ linux_proc_tid_get_name (ptid_t ptid)
char comm_path[100]; char comm_path[100];
const char *comm_val; const char *comm_val;
pid_t pid = ptid.pid (); pid_t pid = ptid.pid ();
pid_t tid = ptid_lwp_p (ptid) ? ptid.lwp () : ptid.pid (); pid_t tid = ptid.lwp_p () ? ptid.lwp () : ptid.pid ();
xsnprintf (comm_path, sizeof (comm_path), xsnprintf (comm_path, sizeof (comm_path),
"/proc/%ld/task/%ld/comm", (long) pid, (long) tid); "/proc/%ld/task/%ld/comm", (long) pid, (long) tid);

View File

@ -43,7 +43,7 @@ x86_linux_dr_get (ptid_t ptid, int regnum)
int tid; int tid;
unsigned long value; unsigned long value;
gdb_assert (ptid_lwp_p (ptid)); gdb_assert (ptid.lwp_p ());
tid = ptid.lwp (); tid = ptid.lwp ();
errno = 0; errno = 0;
@ -61,7 +61,7 @@ x86_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
{ {
int tid; int tid;
gdb_assert (ptid_lwp_p (ptid)); gdb_assert (ptid.lwp_p ());
tid = ptid.lwp (); tid = ptid.lwp ();
errno = 0; errno = 0;

View File

@ -300,7 +300,7 @@ thread_to_lwp (ptid_t thread_id, int default_lwp)
td_thrhandle_t th; td_thrhandle_t th;
td_err_e val; td_err_e val;
if (ptid_lwp_p (thread_id)) if (thread_id.lwp_p ())
return thread_id; /* It's already an LWP ID. */ return thread_id; /* It's already an LWP ID. */
/* It's a thread. Convert to LWP. */ /* It's a thread. Convert to LWP. */