Module Name: src
Committed By: sjg
Date: Sat Oct 15 00:23:08 UTC 2011
Modified Files:
src/sys/arch/i386/conf: ALL
src/sys/conf: files majors
src/sys/dev/filemon: filemon.c
Log Message:
Add the plumbing so one could compile filemon(4) into a kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.322 -r1.323 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1028 -r1.1029 src/sys/conf/files
cvs rdiff -u -r1.57 -r1.58 src/sys/conf/majors
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/filemon/filemon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.322 src/sys/arch/i386/conf/ALL:1.323
--- src/sys/arch/i386/conf/ALL:1.322 Sun Oct 2 16:39:47 2011
+++ src/sys/arch/i386/conf/ALL Sat Oct 15 00:23:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.322 2011/10/02 16:39:47 jmcneill Exp $
+# $NetBSD: ALL,v 1.323 2011/10/15 00:23:08 sjg Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.322 $"
+#ident "ALL-$Revision: 1.323 $"
maxusers 64 # estimated number of users
@@ -1686,6 +1686,8 @@ pseudo-device bcsp # BlueCore Serial P
pseudo-device btuart # Bluetooth HCI UART (H4)
pseudo-device gpiosim 1 # GPIO simulator
+pseudo-device filemon # process monitor for make(1)
+
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda 4 # coda minicache <-> venus comm.
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1028 src/sys/conf/files:1.1029
--- src/sys/conf/files:1.1028 Wed Sep 28 10:55:46 2011
+++ src/sys/conf/files Sat Oct 15 00:23:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1028 2011/09/28 10:55:46 jruoho Exp $
+# $NetBSD: files,v 1.1029 2011/10/15 00:23:08 sjg Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1693,6 +1693,12 @@ include "netisdn/files.i4b"
device joy
file dev/ic/joy.c joy needs-flag
+# process monitor for make(1)
+# normally built as module
+defpseudo filemon
+file dev/filemon/filemon.c filemon
+file dev/filemon/filemon_wrapper.c filemon
+
include "net/agr/files.agr"
#
Index: src/sys/conf/majors
diff -u src/sys/conf/majors:1.57 src/sys/conf/majors:1.58
--- src/sys/conf/majors:1.57 Sun Oct 2 16:39:47 2011
+++ src/sys/conf/majors Sat Oct 15 00:23:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors,v 1.57 2011/10/02 16:39:47 jmcneill Exp $
+# $NetBSD: majors,v 1.58 2011/10/15 00:23:08 sjg Exp $
#
# Device majors for Machine-Independent drivers.
#
@@ -47,3 +47,4 @@ device-major npf char 198 npf
device-major flash char 199 block 199 flash
device-major dtv char 200 dtv
device-major iic char 201 iic
+device-major filemon char 202
Index: src/sys/dev/filemon/filemon.c
diff -u src/sys/dev/filemon/filemon.c:1.3 src/sys/dev/filemon/filemon.c:1.4
--- src/sys/dev/filemon/filemon.c:1.3 Mon Jul 4 23:37:30 2011
+++ src/sys/dev/filemon/filemon.c Sat Oct 15 00:23:08 2011
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.3 2011/07/04 23:37:30 sjg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.4 2011/10/15 00:23:08 sjg Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -48,7 +48,7 @@ MODULE(MODULE_CLASS_DRIVER, filemon, NUL
static dev_type_open(filemon_open);
-static struct cdevsw filemon_cdevsw = {
+struct cdevsw filemon_cdevsw = {
.d_open = filemon_open,
.d_flag = D_MPSAFE,
.d_close = noclose,
@@ -302,6 +302,17 @@ filemon_load(void *dummy __unused)
filemon_wrapper_install();
}
+void filemonattach(int);
+
+/*
+ * If this gets called we are linked into the kernel
+ */
+void
+filemonattach(int num)
+{
+ filemon_load(NULL);
+}
+
static int
filemon_unload(void)
