Removed obsolete vtrace() remnants.

This commit is contained in:
David Greenman 1995-03-04 03:24:45 +00:00
parent 812a11a2ec
commit 403ef252fa
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=6875
16 changed files with 22 additions and 92 deletions

View File

@ -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

View File

@ -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

View File

@ -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 <sys/param.h>
@ -45,7 +45,6 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/resourcevar.h>
#include <sys/trace.h>
#include <miscfs/specfs/specdev.h>
@ -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);

View File

@ -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 <sys/param.h>
@ -45,7 +45,6 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/resourcevar.h>
#include <sys/trace.h>
#include <miscfs/specfs/specdev.h>
@ -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);

View File

@ -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

View File

@ -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 */

View File

@ -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 */

View File

@ -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

View File

@ -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 <sys/param.h>
@ -42,7 +42,6 @@
#include <sys/buf.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/trace.h>
#include <sys/malloc.h>
#include <sys/resourcevar.h>
#include <sys/vmmeter.h>

View File

@ -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 <sys/param.h>
@ -44,7 +44,6 @@
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/vnode.h>
#include <sys/trace.h>
#include <sys/mount.h>
#include <sys/kernel.h>

View File

@ -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 <sys/param.h>
@ -44,7 +44,6 @@
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/vnode.h>
#include <sys/trace.h>
#include <sys/mount.h>
#include <sys/kernel.h>

View File

@ -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)

View File

@ -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

View File

@ -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 <sys/param.h>
@ -43,7 +43,6 @@
#include <sys/vnode.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/trace.h>
#include <sys/resourcevar.h>
#include <vm/vm.h>
@ -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)

View File

@ -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 <sys/param.h>
#include <sys/buf.h>
@ -39,7 +39,6 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/resourcevar.h>
#include <sys/trace.h>
#include <miscfs/specfs/specdev.h>

View File

@ -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 <sys/param.h>
@ -45,7 +45,6 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/resourcevar.h>
#include <sys/trace.h>
#include <miscfs/specfs/specdev.h>
@ -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);