Module Name: src
Committed By: maxv
Date: Wed Dec 18 07:37:19 UTC 2019
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
src/usr.bin/make: Makefile compat.c make.1 meta.c
src/usr.sbin/makemandb: nostem.txt
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:
Retire filemon, discussed on tech-kern@.
To generate a diff of this commit:
cvs rdiff -u -r1.1222 -r1.1223 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2297 -r1.2298 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1665 -r1.1666 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.210 -r1.211 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.205 -r1.206 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.690 -r1.691 src/share/man/man4/Makefile
cvs rdiff -u -r1.19 -r0 src/share/man/man4/filemon.4
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.476 -r1.477 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1245 -r1.1246 src/sys/conf/files
cvs rdiff -u -r1.90 -r1.91 src/sys/conf/majors
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/dev/filemon/Makefile \
src/sys/dev/filemon/mknod-sh
cvs rdiff -u -r1.31 -r0 src/sys/dev/filemon/filemon.c
cvs rdiff -u -r1.9 -r0 src/sys/dev/filemon/filemon.h
cvs rdiff -u -r1.12 -r0 src/sys/dev/filemon/filemon_wrapper.c
cvs rdiff -u -r1.231 -r1.232 src/sys/modules/Makefile
cvs rdiff -u -r1.4 -r0 src/sys/modules/filemon/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/filemon/filemon.ioconf
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/make/Makefile
cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/compat.c
cvs rdiff -u -r1.274 -r1.275 src/usr.bin/make/make.1
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/make/meta.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makemandb/nostem.txt
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.1222 src/distrib/sets/lists/base/mi:1.1223
--- src/distrib/sets/lists/base/mi:1.1222 Sun Dec 15 03:55:56 2019
+++ src/distrib/sets/lists/base/mi Wed Dec 18 07:37:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1222 2019/12/15 03:55:56 christos Exp $
+# $NetBSD: mi,v 1.1223 2019/12/18 07:37:17 maxv 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.2297 src/distrib/sets/lists/comp/mi:1.2298
--- src/distrib/sets/lists/comp/mi:1.2297 Sat Dec 14 15:30:37 2019
+++ src/distrib/sets/lists/comp/mi Wed Dec 18 07:37:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2297 2019/12/14 15:30:37 ad Exp $
+# $NetBSD: mi,v 1.2298 2019/12/18 07:37:17 maxv 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.1665 src/distrib/sets/lists/man/mi:1.1666
--- src/distrib/sets/lists/man/mi:1.1665 Sun Dec 15 03:55:56 2019
+++ src/distrib/sets/lists/man/mi Wed Dec 18 07:37:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1665 2019/12/15 03:55:56 christos Exp $
+# $NetBSD: mi,v 1.1666 2019/12/18 07:37:17 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1104,7 +1104,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
@@ -4288,7 +4288,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
@@ -7244,7 +7244,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.210 src/etc/MAKEDEV.tmpl:1.211
--- src/etc/MAKEDEV.tmpl:1.210 Fri Nov 1 02:58:50 2019
+++ src/etc/MAKEDEV.tmpl Wed Dec 18 07:37:17 2019
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.210 2019/11/01 02:58:50 ozaki-r Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.211 2019/12/18 07:37:17 maxv 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.205 src/etc/mtree/NetBSD.dist.base:1.206
--- src/etc/mtree/NetBSD.dist.base:1.205 Wed Nov 20 09:37:45 2019
+++ src/etc/mtree/NetBSD.dist.base Wed Dec 18 07:37:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.205 2019/11/20 09:37:45 hikaru Exp $
+# $NetBSD: NetBSD.dist.base,v 1.206 2019/12/18 07:37:17 maxv 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.690 src/share/man/man4/Makefile:1.691
--- src/share/man/man4/Makefile:1.690 Tue Dec 10 12:08:52 2019
+++ src/share/man/man4/Makefile Wed Dec 18 07:37:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.690 2019/12/10 12:08:52 yamaguchi Exp $
+# $NetBSD: Makefile,v 1.691 2019/12/18 07:37:18 maxv 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.132 src/sys/arch/amd64/conf/ALL:1.133
--- src/sys/arch/amd64/conf/ALL:1.132 Sun Dec 15 17:17:16 2019
+++ src/sys/arch/amd64/conf/ALL Wed Dec 18 07:37:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.132 2019/12/15 17:17:16 riastradh Exp $
+# $NetBSD: ALL,v 1.133 2019/12/18 07:37:18 maxv 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.132 $"
+#ident "ALL-$Revision: 1.133 $"
maxusers 64 # estimated number of users
@@ -1675,8 +1675,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.476 src/sys/arch/i386/conf/ALL:1.477
--- src/sys/arch/i386/conf/ALL:1.476 Sun Dec 15 17:17:16 2019
+++ src/sys/arch/i386/conf/ALL Wed Dec 18 07:37:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.476 2019/12/15 17:17:16 riastradh Exp $
+# $NetBSD: ALL,v 1.477 2019/12/18 07:37:18 maxv 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.476 $"
+#ident "ALL-$Revision: 1.477 $"
maxusers 64 # estimated number of users
@@ -1799,8 +1799,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.1245 src/sys/conf/files:1.1246
--- src/sys/conf/files:1.1245 Thu Dec 5 03:22:02 2019
+++ src/sys/conf/files Wed Dec 18 07:37:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1245 2019/12/05 03:22:02 riastradh Exp $
+# $NetBSD: files,v 1.1246 2019/12/18 07:37:18 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1540,12 +1540,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.90 src/sys/conf/majors:1.91
--- src/sys/conf/majors:1.90 Mon Oct 28 02:56:40 2019
+++ src/sys/conf/majors Wed Dec 18 07:37:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors,v 1.90 2019/10/28 02:56:40 ozaki-r Exp $
+# $NetBSD: majors,v 1.91 2019/12/18 07:37:18 maxv 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
+#obsolete filemon char 202 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.41 src/sys/dev/Makefile:1.42
--- src/sys/dev/Makefile:1.41 Sun Feb 24 02:30:38 2019
+++ src/sys/dev/Makefile Wed Dec 18 07:37:18 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2019/02/24 02:30:38 rin Exp $
+# $NetBSD: Makefile,v 1.42 2019/12/18 07:37:18 maxv 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.231 src/sys/modules/Makefile:1.232
--- src/sys/modules/Makefile:1.231 Tue Dec 10 12:08:52 2019
+++ src/sys/modules/Makefile Wed Dec 18 07:37:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.231 2019/12/10 12:08:52 yamaguchi Exp $
+# $NetBSD: Makefile,v 1.232 2019/12/18 07:37:18 maxv 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
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.63 src/usr.bin/make/Makefile:1.64
--- src/usr.bin/make/Makefile:1.63 Sun Oct 13 07:28:15 2019
+++ src/usr.bin/make/Makefile Wed Dec 18 07:37:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/10/13 07:28:15 mrg Exp $
+# $NetBSD: Makefile,v 1.64 2019/12/18 07:37:19 maxv Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -17,10 +17,6 @@ USE_META ?= yes
.if ${USE_META:tl} != "no"
SRCS+= meta.c
CPPFLAGS+= -DUSE_META
-FILEMON_H ?= ${.CURDIR:H:H}/sys/dev/filemon/filemon.h
-.if exists(${FILEMON_H}) && ${FILEMON_H:T} == "filemon.h"
-COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
-.endif
.endif
.PATH: ${.CURDIR}/lst.lib
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.107 src/usr.bin/make/compat.c:1.108
--- src/usr.bin/make/compat.c:1.107 Thu Jul 20 19:29:54 2017
+++ src/usr.bin/make/compat.c Wed Dec 18 07:37:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.107 2017/07/20 19:29:54 sjg Exp $ */
+/* $NetBSD: compat.c,v 1.108 2019/12/18 07:37:19 maxv Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.107 2017/07/20 19:29:54 sjg Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.108 2019/12/18 07:37:19 maxv Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: compat.c,v 1.107 2017/07/20 19:29:54 sjg Exp $");
+__RCSID("$NetBSD: compat.c,v 1.108 2019/12/18 07:37:19 maxv Exp $");
#endif
#endif /* not lint */
#endif
@@ -426,11 +426,6 @@ again:
status = WSTOPSIG(reason); /* stopped */
} else if (WIFEXITED(reason)) {
status = WEXITSTATUS(reason); /* exited */
-#if defined(USE_META) && defined(USE_FILEMON_ONCE)
- if (useMeta) {
- meta_cmd_finish(NULL);
- }
-#endif
if (status != 0) {
if (DEBUG(ERROR)) {
fprintf(debug_file, "\n*** Failed target: %s\n*** Failed command: ",
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.274 src/usr.bin/make/make.1:1.275
--- src/usr.bin/make/make.1:1.274 Sat Feb 16 07:41:12 2019
+++ src/usr.bin/make/make.1 Wed Dec 18 07:37:19 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.274 2019/02/16 07:41:12 gutteridge Exp $
+.\" $NetBSD: make.1,v 1.275 2019/12/18 07:37:19 maxv Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\"
-.Dd February 16, 2019
+.Dd December 17, 2019
.Dt MAKE 1
.Os
.Sh NAME
@@ -883,10 +883,7 @@ into "compat" mode.
Puts
.Nm
into "meta" mode, where meta files are created for each target
-to capture the command run, the output generated and if
-.Xr filemon 4
-is available, the system calls which are of interest to
-.Nm .
+to capture the command run.
The captured output can be very useful when diagnosing errors.
.It Pa curdirOk= Ar bf
Normally
@@ -974,13 +971,6 @@ by appending their names to
is re-exported whenever
.Ql Va .MAKEOVERRIDES
is modified.
-.It Va .MAKE.PATH_FILEMON
-If
-.Nm
-was built with
-.Xr filemon 4
-support, this is set to the path of the device node.
-This allows makefiles to test for this support.
.It Va .MAKE.PID
The process-id of
.Nm .
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.70 src/usr.bin/make/meta.c:1.71
--- src/usr.bin/make/meta.c:1.70 Tue Feb 13 19:37:30 2018
+++ src/usr.bin/make/meta.c Wed Dec 18 07:37:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.70 2018/02/13 19:37:30 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.71 2019/12/18 07:37:19 maxv Exp $ */
/*
* Implement 'meta' mode.
@@ -46,13 +46,6 @@
#include "make.h"
#include "job.h"
-#ifdef HAVE_FILEMON_H
-# include <filemon.h>
-#endif
-#if !defined(USE_FILEMON) && defined(FILEMON_SET_FD)
-# define USE_FILEMON
-#endif
-
static BuildMon Mybm; /* for compat */
static Lst metaBailiwick; /* our scope of control */
static char *metaBailiwickStr; /* string storage for the list */
@@ -100,100 +93,6 @@ extern char **environ;
#endif
/*
- * Filemon is a kernel module which snoops certain syscalls.
- *
- * C chdir
- * E exec
- * F [v]fork
- * L [sym]link
- * M rename
- * R read
- * W write
- * S stat
- *
- * See meta_oodate below - we mainly care about 'E' and 'R'.
- *
- * We can still use meta mode without filemon, but
- * the benefits are more limited.
- */
-#ifdef USE_FILEMON
-# ifndef _PATH_FILEMON
-# define _PATH_FILEMON "/dev/filemon"
-# endif
-
-/*
- * Open the filemon device.
- */
-static void
-filemon_open(BuildMon *pbm)
-{
- int retry;
-
- pbm->mon_fd = pbm->filemon_fd = -1;
- if (!useFilemon)
- return;
-
- for (retry = 5; retry >= 0; retry--) {
- if ((pbm->filemon_fd = open(_PATH_FILEMON, O_RDWR)) >= 0)
- break;
- }
-
- if (pbm->filemon_fd < 0) {
- useFilemon = FALSE;
- warn("Could not open %s", _PATH_FILEMON);
- return;
- }
-
- /*
- * We use a file outside of '.'
- * to avoid a FreeBSD kernel bug where unlink invalidates
- * cwd causing getcwd to do a lot more work.
- * We only care about the descriptor.
- */
- pbm->mon_fd = mkTempFile("filemon.XXXXXX", NULL);
- if (ioctl(pbm->filemon_fd, FILEMON_SET_FD, &pbm->mon_fd) < 0) {
- err(1, "Could not set filemon file descriptor!");
- }
- /* we don't need these once we exec */
- (void)fcntl(pbm->mon_fd, F_SETFD, FD_CLOEXEC);
- (void)fcntl(pbm->filemon_fd, F_SETFD, FD_CLOEXEC);
-}
-
-/*
- * Read the build monitor output file and write records to the target's
- * metadata file.
- */
-static int
-filemon_read(FILE *mfp, int fd)
-{
- char buf[BUFSIZ];
- int n;
- int error;
-
- /* Check if we're not writing to a meta data file.*/
- if (mfp == NULL) {
- if (fd >= 0)
- close(fd); /* not interested */
- return 0;
- }
- /* rewind */
- (void)lseek(fd, (off_t)0, SEEK_SET);
-
- error = 0;
- fprintf(mfp, "\n-- filemon acquired metadata --\n");
-
- while ((n = read(fd, buf, sizeof(buf))) > 0) {
- if ((int)fwrite(buf, 1, n, mfp) < n)
- error = EIO;
- }
- fflush(mfp);
- if (close(fd) < 0)
- error = errno;
- return error;
-}
-#endif
-
-/*
* when realpath() fails,
* we use this, to clean up ./ and ../
*/
@@ -568,10 +467,6 @@ boolValue(char *s)
void
meta_init(void)
{
-#ifdef USE_FILEMON
- /* this allows makefiles to test if we have filemon support */
- Var_Set(".MAKE.PATH_FILEMON", _PATH_FILEMON, VAR_GLOBAL, 0);
-#endif
}
@@ -673,18 +568,6 @@ meta_job_start(Job *job, GNode *gn)
pbm = &Mybm;
}
pbm->mfp = meta_create(pbm, gn);
-#ifdef USE_FILEMON_ONCE
- /* compat mode we open the filemon dev once per command */
- if (job == NULL)
- return;
-#endif
-#ifdef USE_FILEMON
- if (pbm->mfp != NULL && useFilemon) {
- filemon_open(pbm);
- } else {
- pbm->mon_fd = pbm->filemon_fd = -1;
- }
-#endif
}
/*
@@ -694,26 +577,6 @@ meta_job_start(Job *job, GNode *gn)
void
meta_job_child(Job *job)
{
-#ifdef USE_FILEMON
- BuildMon *pbm;
-
- if (job != NULL) {
- pbm = &job->bm;
- } else {
- pbm = &Mybm;
- }
- if (pbm->mfp != NULL) {
- close(fileno(pbm->mfp));
- if (useFilemon) {
- pid_t pid;
-
- pid = getpid();
- if (ioctl(pbm->filemon_fd, FILEMON_SET_PID, &pid) < 0) {
- err(1, "Could not set filemon pid!");
- }
- }
- }
-#endif
}
void
@@ -786,23 +649,10 @@ meta_cmd_finish(void *pbmp)
{
int error = 0;
BuildMon *pbm = pbmp;
-#ifdef USE_FILEMON
- int x;
-#endif
if (!pbm)
pbm = &Mybm;
-#ifdef USE_FILEMON
- if (pbm->filemon_fd >= 0) {
- if (close(pbm->filemon_fd) < 0)
- error = errno;
- x = filemon_read(pbm->mfp, pbm->mon_fd);
- if (error == 0 && x != 0)
- error = x;
- pbm->filemon_fd = pbm->mon_fd = -1;
- } else
-#endif
fprintf(pbm->mfp, "\n"); /* ensure end with newline */
return error;
}
@@ -1592,18 +1442,6 @@ static int childPipe[2];
void
meta_compat_start(void)
{
-#ifdef USE_FILEMON_ONCE
- /*
- * We need to re-open filemon for each cmd.
- */
- BuildMon *pbm = &Mybm;
-
- if (pbm->mfp != NULL && useFilemon) {
- filemon_open(pbm);
- } else {
- pbm->mon_fd = pbm->filemon_fd = -1;
- }
-#endif
if (pipe(childPipe) < 0)
Punt("Cannot create pipe: %s", strerror(errno));
/* Set close-on-exec flag for both */
Index: src/usr.sbin/makemandb/nostem.txt
diff -u src/usr.sbin/makemandb/nostem.txt:1.2 src/usr.sbin/makemandb/nostem.txt:1.3
--- src/usr.sbin/makemandb/nostem.txt:1.2 Sat Apr 27 23:04:32 2019
+++ src/usr.sbin/makemandb/nostem.txt Wed Dec 18 07:37:19 2019
@@ -1140,7 +1140,6 @@ fhstatvfs
fhtovp
fileassoc
fileio
-filemon
filt
fincore
fingerd
