Module Name: src
Committed By: riastradh
Date: Sun Jan 19 20:41:19 UTC 2020
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/etc: MAKEDEV.tmpl
src/etc/mtree: NetBSD.dist.base
src/share/man/man4: Makefile
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL
src/sys/conf: files majors
src/sys/dev: Makefile
src/sys/modules: Makefile
Removed Files:
src/share/man/man4: filemon.4
src/sys/dev/filemon: Makefile filemon.c filemon.h filemon_wrapper.c
mknod-sh
src/sys/modules/filemon: Makefile filemon.ioconf
Log Message:
Remove filemon(4).
Discussed on tech-kern:
https://mail-index.NetBSD.org/tech-kern/2020/01/13/msg025938.html
This was never (intentionally) enabled by default, and the design has
some shortcomings. You can get mostly the same results with ktrace,
as in usr.bin/make/filemon/filemon_ktrace.c which is now used instead
of filemon for make's meta mode.
If applications require higher performance than ktrace, or nesting
that ktrace doesn't support, we might consider adding something back
into the vfs system calls themselves, without hijacking the syscall
table. (Might want a more reliable output format too, e.g. one that
can handle newlines in file names.)
To generate a diff of this commit:
cvs rdiff -u -r1.1225 -r1.1226 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2303 -r1.2304 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1673 -r1.1674 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.212 -r1.213 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.208 -r1.209 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.697 -r1.698 src/share/man/man4/Makefile
cvs rdiff -u -r1.21 -r0 src/share/man/man4/filemon.4
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.483 -r1.484 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1251 -r1.1252 src/sys/conf/files
cvs rdiff -u -r1.92 -r1.93 src/sys/conf/majors
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/dev/filemon/Makefile \
src/sys/dev/filemon/mknod-sh
cvs rdiff -u -r1.33 -r0 src/sys/dev/filemon/filemon.c
cvs rdiff -u -r1.11 -r0 src/sys/dev/filemon/filemon.h
cvs rdiff -u -r1.14 -r0 src/sys/dev/filemon/filemon_wrapper.c
cvs rdiff -u -r1.235 -r1.236 src/sys/modules/Makefile
cvs rdiff -u -r1.6 -r0 src/sys/modules/filemon/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/modules/filemon/filemon.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1225 src/distrib/sets/lists/base/mi:1.1226
--- src/distrib/sets/lists/base/mi:1.1225 Sun Jan 19 06:55:22 2020
+++ src/distrib/sets/lists/base/mi Sun Jan 19 20:41:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1225 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: mi,v 1.1226 2020/01/19 20:41:17 riastradh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1114,7 +1114,7 @@
./usr/include/dev/dmover base-c-usr
./usr/include/dev/dtv base-c-usr
./usr/include/dev/eisa base-obsolete obsolete
-./usr/include/dev/filemon base-c-usr
+./usr/include/dev/filemon base-obsolete obsolete
./usr/include/dev/hdaudio base-c-usr
./usr/include/dev/hdmicec base-c-usr
./usr/include/dev/hid base-c-usr
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2303 src/distrib/sets/lists/comp/mi:1.2304
--- src/distrib/sets/lists/comp/mi:1.2303 Sun Jan 19 20:00:36 2020
+++ src/distrib/sets/lists/comp/mi Sun Jan 19 20:41:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2303 2020/01/19 20:00:36 thorpej Exp $
+# $NetBSD: mi,v 1.2304 2020/01/19 20:41:17 riastradh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -411,7 +411,7 @@
./usr/include/dev/eisa/eisadevs_data.h comp-obsolete obsolete
./usr/include/dev/eisa/eisareg.h comp-obsolete obsolete
./usr/include/dev/eisa/eisavar.h comp-obsolete obsolete
-./usr/include/dev/filemon/filemon.h comp-c-include
+./usr/include/dev/filemon/filemon.h comp-obsolete obsolete
./usr/include/dev/fssvar.h comp-c-include
./usr/include/dev/hdaudio/hdaudioio.h comp-c-include
./usr/include/dev/hdaudio/hdaudioreg.h comp-c-include
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1673 src/distrib/sets/lists/man/mi:1.1674
--- src/distrib/sets/lists/man/mi:1.1673 Sun Jan 19 20:00:36 2020
+++ src/distrib/sets/lists/man/mi Sun Jan 19 20:41:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1673 2020/01/19 20:00:36 thorpej Exp $
+# $NetBSD: mi,v 1.1674 2020/01/19 20:41:17 riastradh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1105,7 +1105,7 @@
./usr/share/man/cat4/fast_ipsec.0 man-obsolete obsolete
./usr/share/man/cat4/fd.0 man-sys-catman .cat
./usr/share/man/cat4/fea.0 man-sys-catman .cat
-./usr/share/man/cat4/filemon.0 man-sys-catman .cat
+./usr/share/man/cat4/filemon.0 man-obsolete obsolete
./usr/share/man/cat4/finsio.0 man-sys-catman .cat
./usr/share/man/cat4/flash.0 man-sys-catman .cat
./usr/share/man/cat4/fms.0 man-sys-catman .cat
@@ -4289,7 +4289,7 @@
./usr/share/man/html4/fast_ipsec.html man-obsolete obsolete
./usr/share/man/html4/fd.html man-sys-htmlman html
./usr/share/man/html4/fea.html man-sys-htmlman html
-./usr/share/man/html4/filemon.html man-sys-htmlman html
+./usr/share/man/html4/filemon.html man-obsolete obsolete
./usr/share/man/html4/finsio.html man-sys-htmlman html
./usr/share/man/html4/flash.html man-sys-htmlman html
./usr/share/man/html4/fms.html man-sys-htmlman html
@@ -7245,7 +7245,7 @@
./usr/share/man/man4/fast_ipsec.4 man-obsolete obsolete
./usr/share/man/man4/fd.4 man-sys-man .man
./usr/share/man/man4/fea.4 man-sys-man .man
-./usr/share/man/man4/filemon.4 man-sys-man .man
+./usr/share/man/man4/filemon.4 man-obsolete obsolete
./usr/share/man/man4/finsio.4 man-sys-man .man
./usr/share/man/man4/flash.4 man-sys-man .man
./usr/share/man/man4/fms.4 man-sys-man .man
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.212 src/etc/MAKEDEV.tmpl:1.213
--- src/etc/MAKEDEV.tmpl:1.212 Mon Dec 23 06:45:37 2019
+++ src/etc/MAKEDEV.tmpl Sun Jan 19 20:41:18 2020
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.212 2019/12/23 06:45:37 maxv Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.213 2020/01/19 20:41:18 riastradh Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -816,7 +816,6 @@ all)
makedev dk24 dk25 dk26 dk27 dk28 dk29 dk30 dk31
makedev ccd0 ccd1 ccd2 ccd3
makedev cgd0 cgd1 cgd2 cgd3
- makedev filemon
makedev fss0 fss1 fss2 fss3
makedev md0 md1
makedev raid0 raid1 raid2 raid3 raid4 raid5 raid6 raid7
@@ -2182,10 +2181,6 @@ dtrace)
mkdev dtrace/dtrace c %dtrace_chr% 0 600
;;
-filemon)
- mkdev filemon c %filemon_chr% 0 666
- ;;
-
fw[0-9]*)
unit=${i#fw}
for j in 0 1 2 3
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.208 src/etc/mtree/NetBSD.dist.base:1.209
--- src/etc/mtree/NetBSD.dist.base:1.208 Mon Dec 23 06:45:37 2019
+++ src/etc/mtree/NetBSD.dist.base Sun Jan 19 20:41:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.208 2019/12/23 06:45:37 maxv Exp $
+# $NetBSD: NetBSD.dist.base,v 1.209 2020/01/19 20:41:18 riastradh Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -121,7 +121,6 @@
./usr/include/dev/dm
./usr/include/dev/dmover
./usr/include/dev/dtv
-./usr/include/dev/filemon
./usr/include/dev/hdaudio
./usr/include/dev/hdmicec
./usr/include/dev/hid
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.697 src/share/man/man4/Makefile:1.698
--- src/share/man/man4/Makefile:1.697 Sun Jan 19 20:00:35 2020
+++ src/share/man/man4/Makefile Sun Jan 19 20:41:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.697 2020/01/19 20:00:35 thorpej Exp $
+# $NetBSD: Makefile,v 1.698 2020/01/19 20:41:18 riastradh Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -23,7 +23,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
dmphy.4 dpt.4 dpti.4 drm.4 drum.4 drvctl.4 dtv.4 dtviic.4 dwctwo.4 \
eap.4 ebus.4 edc.4 elmc.4 emuxki.4 ena.4 envsys.4 ep.4 esh.4 \
esa.4 esiop.4 esm.4 eso.4 et.4 etphy.4 exphy.4 \
- fd.4 filemon.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 \
+ fd.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 \
fujbp.4 full.4 fxp.4 \
gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \
glxtphy.4 gpib.4 gpio.4 gpioirq.4 gpiolock.4 gpiopps.4 gpiopwm.4 \
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.139 src/sys/arch/amd64/conf/ALL:1.140
--- src/sys/arch/amd64/conf/ALL:1.139 Sun Jan 19 20:00:37 2020
+++ src/sys/arch/amd64/conf/ALL Sun Jan 19 20:41:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.139 2020/01/19 20:00:37 thorpej Exp $
+# $NetBSD: ALL,v 1.140 2020/01/19 20:41:18 riastradh 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/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.139 $"
+#ident "ALL-$Revision: 1.140 $"
maxusers 64 # estimated number of users
@@ -1667,8 +1667,6 @@ 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 # coda minicache <-> venus comm.
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.483 src/sys/arch/i386/conf/ALL:1.484
--- src/sys/arch/i386/conf/ALL:1.483 Sun Jan 19 20:00:37 2020
+++ src/sys/arch/i386/conf/ALL Sun Jan 19 20:41:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.483 2020/01/19 20:00:37 thorpej Exp $
+# $NetBSD: ALL,v 1.484 2020/01/19 20:41:18 riastradh 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.483 $"
+#ident "ALL-$Revision: 1.484 $"
maxusers 64 # estimated number of users
@@ -1789,8 +1789,6 @@ 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 # coda minicache <-> venus comm.
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1251 src/sys/conf/files:1.1252
--- src/sys/conf/files:1.1251 Sun Jan 19 20:00:37 2020
+++ src/sys/conf/files Sun Jan 19 20:41:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1251 2020/01/19 20:00:37 thorpej Exp $
+# $NetBSD: files,v 1.1252 2020/01/19 20:41:18 riastradh Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1530,12 +1530,6 @@ include "net/files.net"
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
-
#
# General Purpose Input/Output framework
#
Index: src/sys/conf/majors
diff -u src/sys/conf/majors:1.92 src/sys/conf/majors:1.93
--- src/sys/conf/majors:1.92 Mon Dec 23 06:45:37 2019
+++ src/sys/conf/majors Sun Jan 19 20:41:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: majors,v 1.92 2019/12/23 06:45:37 maxv Exp $
+# $NetBSD: majors,v 1.93 2020/01/19 20:41:18 riastradh Exp $
#
# Device majors for Machine-Independent drivers.
#
@@ -47,7 +47,7 @@ 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 filemon
+# char 202, formerly filemon
device-major iscsi char 203 iscsi
device-major tpm char 204 tpm
device-major mfi char 205 mfi
Index: src/sys/dev/Makefile
diff -u src/sys/dev/Makefile:1.43 src/sys/dev/Makefile:1.44
--- src/sys/dev/Makefile:1.43 Mon Dec 23 06:45:37 2019
+++ src/sys/dev/Makefile Sun Jan 19 20:41:18 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2019/12/23 06:45:37 maxv Exp $
+# $NetBSD: Makefile,v 1.44 2020/01/19 20:41:18 riastradh Exp $
-SUBDIR= apm ata bluetooth dec dm dmover dtv filemon hdaudio hdmicec hid hpc \
+SUBDIR= apm ata bluetooth dec dm dmover dtv hdaudio hdmicec hid hpc \
i2c i2o ic ieee1394 ir isa \
microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \
spi sun tc usb vme wscons
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.235 src/sys/modules/Makefile:1.236
--- src/sys/modules/Makefile:1.235 Sun Jan 19 01:25:08 2020
+++ src/sys/modules/Makefile Sun Jan 19 20:41:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.235 2020/01/19 01:25:08 thorpej Exp $
+# $NetBSD: Makefile,v 1.236 2020/01/19 20:41:19 riastradh Exp $
.include <bsd.own.mk>
@@ -54,7 +54,6 @@ SUBDIR+= exec_script
SUBDIR+= fdesc
SUBDIR+= ffs
SUBDIR+= filecore
-SUBDIR+= filemon
SUBDIR+= flash
SUBDIR+= fss
SUBDIR+= gpio
