From owner-p4-projects@FreeBSD.ORG  Mon Jul  2 01:26:48 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A0F7E16A421; Mon,  2 Jul 2007 01:26:48 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 704A416A400
	for <perforce@FreeBSD.org>; Mon,  2 Jul 2007 01:26:48 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 60F5713C45A
	for <perforce@FreeBSD.org>; Mon,  2 Jul 2007 01:26:48 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l621QmUo035733
	for <perforce@FreeBSD.org>; Mon, 2 Jul 2007 01:26:48 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l621QmMx035730
	for perforce@freebsd.org; Mon, 2 Jul 2007 01:26:48 GMT
	(envelope-from zec@FreeBSD.org)
Date: Mon, 2 Jul 2007 01:26:48 GMT
Message-Id: <200707020126.l621QmMx035730@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 122692 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: Mon, 02 Jul 2007 01:26:49 -0000

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

Change 122692 by zec@zec_tpx32 on 2007/07/02 01:26:03

	Add a "show vnets" command for DDB.  Lists all vnet
	instances with a few per-instance details.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#20 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#20 (text+ko) ====

@@ -30,6 +30,7 @@
  * XXX RCS tag goes here
  */
 
+#include "opt_ddb.h"
 #include "opt_vimage.h"
 
 #include <sys/types.h>
@@ -50,6 +51,10 @@
 #include <sys/vimage.h>
 #include <sys/vmmeter.h>
 
+#ifdef DDB
+#include <ddb/ddb.h>
+#endif
+
 #include <net/vnet.h>
 #include <net/bpf.h>
 #include <net/if_types.h>
@@ -275,7 +280,7 @@
 	struct vimage *vip_r = NULL;
 	struct vimage *tvip;
 
-	error = suser(td);
+	error = suser(td); /* XXX replace with priv(9) */
 	if (error)
 		return (error);
 
@@ -636,3 +641,29 @@
 
 SYSINIT(vimage, SI_SUB_VIMAGE, SI_ORDER_FIRST, vi_init, NULL)
 SYSINIT(vimage_done, SI_SUB_VIMAGE_DONE, SI_ORDER_FIRST, vi_init_done, NULL)
+
+#ifdef DDB
+static void
+db_vnet_ptr(void *arg)
+{
+	if (arg)
+		db_printf(" %p", arg);
+	else
+		db_printf("        0x0");
+}
+
+DB_SHOW_COMMAND(vnets, db_show_vnets)
+{
+	db_printf("      vnet ifcs socks");
+	db_printf("        net       inet      inet6   netgraph\n");
+	VNET_ITERLOOP_BEGIN_QUIET();
+		db_printf("%p %4d %5d",
+		    vnet_iter, vnet_iter->ifccnt, vnet_iter->sockcnt);
+		db_vnet_ptr(vnet_iter->mod_data[VNET_MOD_NET]);
+		db_vnet_ptr(vnet_iter->mod_data[VNET_MOD_INET]);
+		db_vnet_ptr(vnet_iter->mod_data[VNET_MOD_INET6]);
+		db_vnet_ptr(vnet_iter->mod_data[VNET_MOD_NETGRAPH]);
+		db_printf("\n");
+	VNET_ITERLOOP_END();
+}
+#endif