From 403ef252fa2fa93fc0db2db688e7c73250ecbd78 Mon Sep 17 00:00:00 2001 From: David Greenman Date: Sat, 4 Mar 1995 03:24:45 +0000 Subject: [PATCH] Removed obsolete vtrace() remnants. --- sys/conf/Makefile.i386 | 9 +-------- sys/conf/Makefile.powerpc | 9 +-------- sys/gnu/ext2fs/ext2_bmap.c | 13 ++++--------- sys/gnu/fs/ext2fs/ext2_bmap.c | 13 ++++--------- sys/i386/conf/Makefile.i386 | 9 +-------- sys/kern/init_sysent.c | 11 ----------- sys/kern/syscalls.c | 4 ---- sys/kern/syscalls.master | 6 +----- sys/kern/vfs_cluster.c | 3 +-- sys/nfs/nfs_bio.c | 3 +-- sys/nfsclient/nfs_bio.c | 3 +-- sys/sys/syscall-hide.h | 4 ---- sys/sys/syscall.h | 1 - sys/ufs/ffs/ffs_inode.c | 10 ++-------- sys/ufs/lfs/lfs_balloc.c | 3 +-- sys/ufs/ufs/ufs_bmap.c | 13 ++++--------- 16 files changed, 22 insertions(+), 92 deletions(-) diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index e8043031c357..d8d19794bcc8 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.55 1995/02/26 05:05:53 bde Exp $ +# $Id: Makefile.i386,v 1.56 1995/03/01 10:08:04 gibbs Exp $ # # Makefile for FreeBSD # @@ -14,13 +14,6 @@ # /sys/i386/conf/Makefile.i386 # after which config should be rerun for all machines. # -# N.B.: DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE -# IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING -# -# -DTRACE compile in kernel tracing hooks -# -DQUOTA compile in file system quotas -# -DFOO almost all options -# CC?= cc CPP?= cpp LD?= /usr/bin/ld diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index e8043031c357..d8d19794bcc8 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.55 1995/02/26 05:05:53 bde Exp $ +# $Id: Makefile.i386,v 1.56 1995/03/01 10:08:04 gibbs Exp $ # # Makefile for FreeBSD # @@ -14,13 +14,6 @@ # /sys/i386/conf/Makefile.i386 # after which config should be rerun for all machines. # -# N.B.: DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE -# IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING -# -# -DTRACE compile in kernel tracing hooks -# -DQUOTA compile in file system quotas -# -DFOO almost all options -# CC?= cc CPP?= cpp LD?= /usr/bin/ld diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c index 108a5aa58f2e..bb875f59d37d 100644 --- a/sys/gnu/ext2fs/ext2_bmap.c +++ b/sys/gnu/ext2fs/ext2_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id: ufs_bmap.c,v 1.4 1994/10/08 06:57:21 phk Exp $ + * $Id: ufs_bmap.c,v 1.5 1995/01/09 16:05:25 davidg Exp $ */ #include @@ -45,7 +45,6 @@ #include #include #include -#include #include @@ -179,15 +178,11 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp) xap->in_exists = 1; bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0); - if (bp->b_flags & B_CACHE) { - trace(TR_BREADHIT, pack(vp, size), metalbn); - } + if ((bp->b_flags & B_CACHE) == 0) { #ifdef DIAGNOSTIC - else if (!daddr) - panic("ufs_bmaparry: indirect block not in cache"); + if (!daddr) + panic("ufs_bmaparry: indirect block not in cache"); #endif - else { - trace(TR_BREADMISS, pack(vp, size), metalbn); bp->b_blkno = blkptrtodb(ump, daddr); bp->b_flags |= B_READ; vfs_busy_pages(bp, 0); diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c index 108a5aa58f2e..bb875f59d37d 100644 --- a/sys/gnu/fs/ext2fs/ext2_bmap.c +++ b/sys/gnu/fs/ext2fs/ext2_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id: ufs_bmap.c,v 1.4 1994/10/08 06:57:21 phk Exp $ + * $Id: ufs_bmap.c,v 1.5 1995/01/09 16:05:25 davidg Exp $ */ #include @@ -45,7 +45,6 @@ #include #include #include -#include #include @@ -179,15 +178,11 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp) xap->in_exists = 1; bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0); - if (bp->b_flags & B_CACHE) { - trace(TR_BREADHIT, pack(vp, size), metalbn); - } + if ((bp->b_flags & B_CACHE) == 0) { #ifdef DIAGNOSTIC - else if (!daddr) - panic("ufs_bmaparry: indirect block not in cache"); + if (!daddr) + panic("ufs_bmaparry: indirect block not in cache"); #endif - else { - trace(TR_BREADMISS, pack(vp, size), metalbn); bp->b_blkno = blkptrtodb(ump, daddr); bp->b_flags |= B_READ; vfs_busy_pages(bp, 0); diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index e8043031c357..d8d19794bcc8 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.55 1995/02/26 05:05:53 bde Exp $ +# $Id: Makefile.i386,v 1.56 1995/03/01 10:08:04 gibbs Exp $ # # Makefile for FreeBSD # @@ -14,13 +14,6 @@ # /sys/i386/conf/Makefile.i386 # after which config should be rerun for all machines. # -# N.B.: DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE -# IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING -# -# -DTRACE compile in kernel tracing hooks -# -DQUOTA compile in file system quotas -# -DFOO almost all options -# CC?= cc CPP?= cpp LD?= /usr/bin/ld diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index bd77750c3ad3..c8b23f029b7b 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -99,10 +99,6 @@ int bind(); int setsockopt(); int listen(); int sigsuspend(); -#ifdef TRACE -int vtrace(); -#else -#endif int gettimeofday(); int getrusage(); int getsockopt(); @@ -208,9 +204,6 @@ int osigsetmask(); int osigstack(); int orecvmsg(); int osendmsg(); -#ifdef TRACE -#else -#endif #ifdef vax #else #endif @@ -371,11 +364,7 @@ struct sysent sysent[] = { { compat(2,sigstack) }, /* 112 = old sigstack */ { compat(3,recvmsg) }, /* 113 = old recvmsg */ { compat(3,sendmsg) }, /* 114 = old sendmsg */ -#ifdef TRACE - { 2, vtrace }, /* 115 = vtrace */ -#else { 0, nosys }, /* 115 = obsolete vtrace */ -#endif { 2, gettimeofday }, /* 116 = gettimeofday */ { 2, getrusage }, /* 117 = getrusage */ { 5, getsockopt }, /* 118 = getsockopt */ diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index d880f189ded1..7bccb13ec73e 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -125,11 +125,7 @@ char *syscallnames[] = { "old.sigstack", /* 112 = old sigstack */ "old.recvmsg", /* 113 = old recvmsg */ "old.sendmsg", /* 114 = old sendmsg */ -#ifdef TRACE - "vtrace", /* 115 = vtrace */ -#else "obs_vtrace", /* 115 = obsolete vtrace */ -#endif "gettimeofday", /* 116 = gettimeofday */ "getrusage", /* 117 = getrusage */ "getsockopt", /* 118 = getsockopt */ diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index dc8953f84693..7cb3934518d8 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,4 @@ - $Id: syscalls.master,v 1.11 1994/10/02 04:45:52 davidg Exp $ + $Id: syscalls.master,v 1.12 1994/12/14 17:57:23 wollman Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -147,11 +147,7 @@ 112 COMPAT 2 BSD sigstack 113 COMPAT 3 BSD recvmsg 114 COMPAT 3 BSD sendmsg -#ifdef TRACE -115 STD 2 BSD vtrace -#else 115 OBSOL 2 NOHIDE vtrace -#endif 116 STD 2 BSD gettimeofday 117 STD 2 BSD getrusage 118 STD 5 BSD getsockopt diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index ea06f3eb0259..881605dda494 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.10 1995/02/22 09:39:20 davidg Exp $ + * $Id: vfs_cluster.c,v 1.11 1995/03/02 19:36:50 davidg Exp $ */ #include @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index f8b77f9d09a6..83c3a198b2ec 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.9 1995/01/10 13:06:51 davidg Exp $ + * $Id: nfs_bio.c,v 1.10 1995/02/03 03:40:08 davidg Exp $ */ #include @@ -44,7 +44,6 @@ #include #include #include -#include #include #include diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index f8b77f9d09a6..83c3a198b2ec 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.9 1995/01/10 13:06:51 davidg Exp $ + * $Id: nfs_bio.c,v 1.10 1995/02/03 03:40:08 davidg Exp $ */ #include @@ -44,7 +44,6 @@ #include #include #include -#include #include #include diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h index 3447f9c71edb..71e7da36e3cc 100644 --- a/sys/sys/syscall-hide.h +++ b/sys/sys/syscall-hide.h @@ -116,10 +116,6 @@ HIDE_POSIX(sigsuspend) HIDE_BSD(sigstack) HIDE_BSD(recvmsg) HIDE_BSD(sendmsg) -#ifdef TRACE -HIDE_BSD(vtrace) -#else -#endif HIDE_BSD(gettimeofday) HIDE_BSD(getrusage) HIDE_BSD(getsockopt) diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 8ebc58f8efa8..5681b7056b0c 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -118,7 +118,6 @@ /* 112 is old sigstack */ /* 113 is old recvmsg */ /* 114 is old sendmsg */ -#define SYS_vtrace 115 /* 115 is obsolete vtrace */ #define SYS_gettimeofday 116 #define SYS_getrusage 117 diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 8ba128cc02a5..5f56b6806a5f 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: ffs_inode.c,v 1.10 1994/12/27 14:44:42 bde Exp $ + * $Id: ffs_inode.c,v 1.11 1995/01/09 16:05:18 davidg Exp $ */ #include @@ -43,7 +43,6 @@ #include #include #include -#include #include #include @@ -442,12 +441,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp) */ vp = ITOV(ip); bp = getblk(vp, lbn, (int)fs->fs_bsize, 0, 0); - /* if (bp->b_flags & (B_DONE | B_DELWRI)) { */ - if (bp->b_flags & B_CACHE) { - /* Braces must be here in case trace evaluates to nothing. */ - trace(TR_BREADHIT, pack(vp, fs->fs_bsize), lbn); - } else { - trace(TR_BREADMISS, pack(vp, fs->fs_bsize), lbn); + if ((bp->b_flags & B_CACHE) == 0) { curproc->p_stats->p_ru.ru_inblock++; /* pay for read */ bp->b_flags |= B_READ; if (bp->b_bcount > bp->b_bufsize) diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c index f8063c8956ba..fbf9bbefc0af 100644 --- a/sys/ufs/lfs/lfs_balloc.c +++ b/sys/ufs/lfs/lfs_balloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_balloc.c 8.1 (Berkeley) 6/11/93 - * $Id: lfs_balloc.c,v 1.2 1994/08/02 07:54:30 davidg Exp $ + * $Id: lfs_balloc.c,v 1.3 1995/01/09 16:05:20 davidg Exp $ */ #include #include @@ -39,7 +39,6 @@ #include #include #include -#include #include diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 108a5aa58f2e..bb875f59d37d 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id: ufs_bmap.c,v 1.4 1994/10/08 06:57:21 phk Exp $ + * $Id: ufs_bmap.c,v 1.5 1995/01/09 16:05:25 davidg Exp $ */ #include @@ -45,7 +45,6 @@ #include #include #include -#include #include @@ -179,15 +178,11 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp) xap->in_exists = 1; bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0); - if (bp->b_flags & B_CACHE) { - trace(TR_BREADHIT, pack(vp, size), metalbn); - } + if ((bp->b_flags & B_CACHE) == 0) { #ifdef DIAGNOSTIC - else if (!daddr) - panic("ufs_bmaparry: indirect block not in cache"); + if (!daddr) + panic("ufs_bmaparry: indirect block not in cache"); #endif - else { - trace(TR_BREADMISS, pack(vp, size), metalbn); bp->b_blkno = blkptrtodb(ump, daddr); bp->b_flags |= B_READ; vfs_busy_pages(bp, 0);