From e603a509079e861a7e93b1ef38382fb9ae7a18e0 Mon Sep 17 00:00:00 2001
From: jhb <jhb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 29 Jun 2012 15:24:46 +0000
Subject: [PATCH] MFC 236577: Allow the -p argument to kdump to accept either a
 PID or a thread ID.

git-svn-id: svn://svn.freebsd.org/base/stable/9@237789 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.bin/kdump/kdump.1 | 6 +++---
 usr.bin/kdump/kdump.c | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 0b4bcf480..f8e87e410 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -28,7 +28,7 @@
 .\"	@(#)kdump.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd April 20, 2012
+.Dd June 4, 2012
 .Dt KDUMP 1
 .Os
 .Sh NAME
@@ -86,9 +86,9 @@ string.
 Suppressing this feature yields a more consistent output format and is
 easily amenable to further processing.
 .It Fl p Ar pid
-Display only trace events that correspond to the process
+Display only trace events that correspond to the process or thread
 .Ar pid .
-This may be useful when there are multiple processes recorded in the
+This may be useful when there are multiple processes or threads recorded in the
 same trace file.
 .It Fl R
 Display relative timestamps (time since previous entry).
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index c8ce49d9d..338c439da 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -249,7 +249,8 @@ main(int argc, char *argv[])
 			}
 		}
 		if (trpoints & (1<<ktr_header.ktr_type))
-			if (pid == 0 || ktr_header.ktr_pid == pid)
+			if (pid == 0 || ktr_header.ktr_pid == pid ||
+			    ktr_header.ktr_tid == pid)
 				dumpheader(&ktr_header);
 		if ((ktrlen = ktr_header.ktr_len) < 0)
 			errx(1, "bogus length 0x%x", ktrlen);
@@ -264,7 +265,8 @@ main(int argc, char *argv[])
 		if (fetchprocinfo(&ktr_header, (u_int *)m) != 0)
 			continue;
 		sv_flags = abidump(&ktr_header);
-		if (pid && ktr_header.ktr_pid != pid)
+		if (pid && ktr_header.ktr_pid != pid &&
+		    ktr_header.ktr_tid != pid)
 			continue;
 		if ((trpoints & (1<<ktr_header.ktr_type)) == 0)
 			continue;
-- 
2.45.0