From owner-p4-projects@FreeBSD.ORG  Wed Jul 26 01:36:20 2006
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 00BB616A4E1; Wed, 26 Jul 2006 01:36:20 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9714616A4DE
	for <perforce@freebsd.org>; Wed, 26 Jul 2006 01:36:19 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3812643D49
	for <perforce@freebsd.org>; Wed, 26 Jul 2006 01:36:19 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6Q1aJiG038765
	for <perforce@freebsd.org>; Wed, 26 Jul 2006 01:36:19 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6Q1aI6u038762
	for perforce@freebsd.org; Wed, 26 Jul 2006 01:36:18 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 26 Jul 2006 01:36:18 GMT
Message-Id: <200607260136.k6Q1aI6u038762@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102424 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: Wed, 26 Jul 2006 01:36:20 -0000

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

Change 102424 by jhb@jhb_mutex on 2006/07/26 01:35:17

	Add a 'kldstat' ddb command complete with a '/v' option that mimics
	'kldstat -v'.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_linker.c#80 edit
.. //depot/projects/smpng/sys/kern/kern_module.c#22 edit
.. //depot/projects/smpng/sys/sys/module.h#8 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_linker.c#80 (text+ko) ====

@@ -54,6 +54,10 @@
 
 #include "linker_if.h"
 
+#ifdef DDB
+#include <ddb/ddb.h>
+#endif
+
 #ifdef HWPMC_HOOKS
 #include <sys/pmckern.h>
 #endif
@@ -2012,3 +2016,28 @@
 
 SYSCTL_PROC(_kern, OID_AUTO, function_list, CTLFLAG_RD,
     NULL, 0, sysctl_kern_function_list, "", "kernel function list");
+
+#ifdef DDB
+DB_COMMAND(kldstat, db_kldstat)
+{
+	linker_file_t lf;
+	int verbose;
+
+	verbose = index(modif, 'v') != NULL;
+#ifdef __LP64__
+	db_printf("Id Refs Address            Size     Name\n");
+#else
+	db_printf("Id Refs Address    Size     Name\n");
+#endif
+	TAILQ_FOREACH(lf, &linker_files, link) {
+		if (db_pager_quit)
+			return;
+		db_printf("%2d %4d %p %-8zx %s\n", lf->id, lf->refs,
+		    lf->address, lf->size, lf->filename);
+		if (!verbose)
+			continue;
+		db_printf("        Contains modules:\n");
+		db_show_modules(lf, "                ");
+	}
+}
+#endif

==== //depot/projects/smpng/sys/kern/kern_module.c#22 (text+ko) ====

@@ -25,6 +25,7 @@
  */
 
 #include "opt_compat.h"
+#include "opt_ddb.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/kern_module.c,v 1.51 2006/06/26 18:34:45 jhb Exp $");
@@ -44,6 +45,10 @@
 #include <sys/module.h>
 #include <sys/linker.h>
 
+#ifdef DDB
+#include <ddb/ddb.h>
+#endif
+
 static MALLOC_DEFINE(M_MODULE, "module", "module data structures");
 
 typedef TAILQ_HEAD(, module) modulelist_t;
@@ -504,3 +509,18 @@
 	return (error);
 }
 #endif
+
+#ifdef DDB
+void
+db_show_modules(linker_file_t lf, const char *prefix)
+{
+	module_t mod;
+
+	db_printf("%sId   Name\n", prefix);
+	TAILQ_FOREACH(mod, &lf->modules, flink) {
+		if (db_pager_quit)
+			return;
+		db_printf("%s%-4d %s\n", prefix, mod->id, mod->name);
+	}
+}
+#endif

==== //depot/projects/smpng/sys/sys/module.h#8 (text+ko) ====

@@ -148,6 +148,9 @@
 module_t	module_getfnext(module_t);
 void	module_setspecific(module_t, modspecific_t *);
 struct linker_file *module_file(module_t);
+#ifdef DDB
+void	db_show_modules(struct linker_file *, const char *);
+#endif
 
 #ifdef	MOD_DEBUG
 extern int mod_debug;