From owner-p4-projects@FreeBSD.ORG  Sun Nov  2 01:53:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B9C81065676; Sun,  2 Nov 2008 01:53:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6000C1065672
	for <perforce@freebsd.org>; Sun,  2 Nov 2008 01:53:46 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D8CE8FC21
	for <perforce@freebsd.org>; Sun,  2 Nov 2008 01:53:46 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA21rkoe071584
	for <perforce@freebsd.org>; Sun, 2 Nov 2008 01:53:46 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA21rkeD071582
	for perforce@freebsd.org; Sun, 2 Nov 2008 01:53:46 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sun, 2 Nov 2008 01:53:46 GMT
Message-Id: <200811020153.mA21rkeD071582@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152340 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Nov 2008 01:53:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=152340

Change 152340 by peter@peter_overcee on 2008/11/02 01:53:27

	Grr.  make 'ps -axH' show the kthread names like top(1) does.

Affected files ...

.. //depot/projects/hammer/bin/ps/print.c#18 edit

Differences ...

==== //depot/projects/hammer/bin/ps/print.c#18 (text+ko) ====

@@ -125,8 +125,10 @@
 	VAR *v;
 	int left;
 	char *cp, *vis_env, *vis_args;
+	int flag;
 
 	v = ve->var;
+	flag = k->ki_p->ki_flag;
 	if (cflag) {
 		/* If it is the last field, then don't pad */
 		if (STAILQ_NEXT(ve, next_ve) == NULL) {
@@ -137,6 +139,17 @@
 			(void)printf("%-*s", v->width, k->ki_p->ki_comm);
 		return;
 	}
+	if (showthreads && (k->ki_p->ki_flag & P_SYSTEM) != 0 && k->ki_p->ki_pid != 1) {
+		/* If it is the last field, then don't pad */
+		char *kth;
+		asprintf(&kth, "{%s}", k->ki_p->ki_ocomm);
+		if (STAILQ_NEXT(ve, next_ve) == NULL)
+			(void)printf("%s", kth);
+		else
+			(void)printf("%-*s", v->width, kth);
+		free(kth);
+		return;
+	}
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
 		errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);