projects / unix-history / commitdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d1cc224)
fix trace code
authorBill Joy <wnj@ucbvax.Berkeley.EDU>
Thu, 12 Mar 1981 10:32:11 +0000 (02:32 -0800)
committerBill Joy <wnj@ucbvax.Berkeley.EDU>
Thu, 12 Mar 1981 10:32:11 +0000 (02:32 -0800)
SCCS-vsn: sys/kern/kern_physio.c 4.18
SCCS-vsn: sys/kern/vfs_bio.c 4.18
SCCS-vsn: sys/kern/vfs_cluster.c 4.18

usr/src/sys/kern/kern_physio.c patch | blob | blame | history
usr/src/sys/kern/vfs_bio.c patch | blob | blame | history
usr/src/sys/kern/vfs_cluster.c patch | blob | blame | history

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index a9a3922..d987f43 100644 (file)
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/*     kern_physio.c   4.17    81/03/09        */
+/*     kern_physio.c   4.18    81/03/11        */
 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -105,8 +105,8 @@ daddr_t blkno;
 
        bp = getblk(dev, blkno);
        if (bp->b_flags&B_DONE) {
 
        bp = getblk(dev, blkno);
        if (bp->b_flags&B_DONE) {
-#ifdef EPAWNJ
-               trace(TR_BREAD|TR_HIT, dev, blkno);
+#ifdef TRACE
+               trace(TR_BREADHIT, dev, blkno);
 #endif
 #ifdef DISKMON
                io_info.ncache++;
 #endif
 #ifdef DISKMON
                io_info.ncache++;
@@ -116,8 +116,8 @@ daddr_t blkno;
        bp->b_flags |= B_READ;
        bp->b_bcount = BSIZE;
        (*bdevsw[major(dev)].d_strategy)(bp);
        bp->b_flags |= B_READ;
        bp->b_bcount = BSIZE;
        (*bdevsw[major(dev)].d_strategy)(bp);
-#ifdef EPAWNJ
-       trace(TR_BREAD|TR_MISS, dev, blkno);
+#ifdef TRACE
+       trace(TR_BREADMISS, dev, blkno);
 #endif
 #ifdef DISKMON
        io_info.nread++;
 #endif
 #ifdef DISKMON
        io_info.nread++;
@@ -145,32 +145,32 @@ daddr_t blkno, rablkno;
                        bp->b_flags |= B_READ;
                        bp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(bp);
                        bp->b_flags |= B_READ;
                        bp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(bp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_MISS, dev, blkno);
+#ifdef TRACE
+                       trace(TR_BREADMISS, dev, blkno);
 #endif
 #ifdef DISKMON
                        io_info.nread++;
 #endif
                        u.u_vm.vm_inblk++;              /* pay for read */
                }
 #endif
 #ifdef DISKMON
                        io_info.nread++;
 #endif
                        u.u_vm.vm_inblk++;              /* pay for read */
                }
-#ifdef EPAWNJ
+#ifdef TRACE
                else
                else
-                       trace(TR_BREAD|TR_HIT, dev, blkno);
+                       trace(TR_BREADHIT, dev, blkno);
 #endif
        }
        if (rablkno && !incore(dev, rablkno)) {
                rabp = getblk(dev, rablkno);
                if (rabp->b_flags & B_DONE) {
                        brelse(rabp);
 #endif
        }
        if (rablkno && !incore(dev, rablkno)) {
                rabp = getblk(dev, rablkno);
                if (rabp->b_flags & B_DONE) {
                        brelse(rabp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_HIT|TR_RA, dev, blkno);
+#ifdef TRACE
+                       trace(TR_BREADHITRA, dev, blkno);
 #endif
                } else {
                        rabp->b_flags |= B_READ|B_ASYNC;
                        rabp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(rabp);
 #endif
                } else {
                        rabp->b_flags |= B_READ|B_ASYNC;
                        rabp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(rabp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_MISS|TR_RA, dev, rablock);
+#ifdef TRACE
+                       trace(TR_BREADMISSRA, dev, rablock);
 #endif
 #ifdef DISKMON
                        io_info.nreada++;
 #endif
 #ifdef DISKMON
                        io_info.nreada++;
@@ -201,7 +201,7 @@ register struct buf *bp;
 #endif
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #endif
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
@@ -390,7 +390,7 @@ daddr_t blkno;
                bwrite(bp);
                goto loop;
        }
                bwrite(bp);
                goto loop;
        }
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY;
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY;
@@ -432,7 +432,7 @@ loop:
                bwrite(bp);
                goto loop;
        }
                bwrite(bp);
                goto loop;
        }
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index da6146d..af3fdfa 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*     vfs_bio.c       4.17    81/03/09        */
+/*     vfs_bio.c       4.18    81/03/11        */
 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -105,8 +105,8 @@ daddr_t blkno;
 
        bp = getblk(dev, blkno);
        if (bp->b_flags&B_DONE) {
 
        bp = getblk(dev, blkno);
        if (bp->b_flags&B_DONE) {
-#ifdef EPAWNJ
-               trace(TR_BREAD|TR_HIT, dev, blkno);
+#ifdef TRACE
+               trace(TR_BREADHIT, dev, blkno);
 #endif
 #ifdef DISKMON
                io_info.ncache++;
 #endif
 #ifdef DISKMON
                io_info.ncache++;
@@ -116,8 +116,8 @@ daddr_t blkno;
        bp->b_flags |= B_READ;
        bp->b_bcount = BSIZE;
        (*bdevsw[major(dev)].d_strategy)(bp);
        bp->b_flags |= B_READ;
        bp->b_bcount = BSIZE;
        (*bdevsw[major(dev)].d_strategy)(bp);
-#ifdef EPAWNJ
-       trace(TR_BREAD|TR_MISS, dev, blkno);
+#ifdef TRACE
+       trace(TR_BREADMISS, dev, blkno);
 #endif
 #ifdef DISKMON
        io_info.nread++;
 #endif
 #ifdef DISKMON
        io_info.nread++;
@@ -145,32 +145,32 @@ daddr_t blkno, rablkno;
                        bp->b_flags |= B_READ;
                        bp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(bp);
                        bp->b_flags |= B_READ;
                        bp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(bp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_MISS, dev, blkno);
+#ifdef TRACE
+                       trace(TR_BREADMISS, dev, blkno);
 #endif
 #ifdef DISKMON
                        io_info.nread++;
 #endif
                        u.u_vm.vm_inblk++;              /* pay for read */
                }
 #endif
 #ifdef DISKMON
                        io_info.nread++;
 #endif
                        u.u_vm.vm_inblk++;              /* pay for read */
                }
-#ifdef EPAWNJ
+#ifdef TRACE
                else
                else
-                       trace(TR_BREAD|TR_HIT, dev, blkno);
+                       trace(TR_BREADHIT, dev, blkno);
 #endif
        }
        if (rablkno && !incore(dev, rablkno)) {
                rabp = getblk(dev, rablkno);
                if (rabp->b_flags & B_DONE) {
                        brelse(rabp);
 #endif
        }
        if (rablkno && !incore(dev, rablkno)) {
                rabp = getblk(dev, rablkno);
                if (rabp->b_flags & B_DONE) {
                        brelse(rabp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_HIT|TR_RA, dev, blkno);
+#ifdef TRACE
+                       trace(TR_BREADHITRA, dev, blkno);
 #endif
                } else {
                        rabp->b_flags |= B_READ|B_ASYNC;
                        rabp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(rabp);
 #endif
                } else {
                        rabp->b_flags |= B_READ|B_ASYNC;
                        rabp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(rabp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_MISS|TR_RA, dev, rablock);
+#ifdef TRACE
+                       trace(TR_BREADMISSRA, dev, rablock);
 #endif
 #ifdef DISKMON
                        io_info.nreada++;
 #endif
 #ifdef DISKMON
                        io_info.nreada++;
@@ -201,7 +201,7 @@ register struct buf *bp;
 #endif
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #endif
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
@@ -390,7 +390,7 @@ daddr_t blkno;
                bwrite(bp);
                goto loop;
        }
                bwrite(bp);
                goto loop;
        }
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY;
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY;
@@ -432,7 +432,7 @@ loop:
                bwrite(bp);
                goto loop;
        }
                bwrite(bp);
                goto loop;
        }
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index 80930d6..58414aa 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*     vfs_cluster.c   4.17    81/03/09        */
+/*     vfs_cluster.c   4.18    81/03/11        */
 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -105,8 +105,8 @@ daddr_t blkno;
 
        bp = getblk(dev, blkno);
        if (bp->b_flags&B_DONE) {
 
        bp = getblk(dev, blkno);
        if (bp->b_flags&B_DONE) {
-#ifdef EPAWNJ
-               trace(TR_BREAD|TR_HIT, dev, blkno);
+#ifdef TRACE
+               trace(TR_BREADHIT, dev, blkno);
 #endif
 #ifdef DISKMON
                io_info.ncache++;
 #endif
 #ifdef DISKMON
                io_info.ncache++;
@@ -116,8 +116,8 @@ daddr_t blkno;
        bp->b_flags |= B_READ;
        bp->b_bcount = BSIZE;
        (*bdevsw[major(dev)].d_strategy)(bp);
        bp->b_flags |= B_READ;
        bp->b_bcount = BSIZE;
        (*bdevsw[major(dev)].d_strategy)(bp);
-#ifdef EPAWNJ
-       trace(TR_BREAD|TR_MISS, dev, blkno);
+#ifdef TRACE
+       trace(TR_BREADMISS, dev, blkno);
 #endif
 #ifdef DISKMON
        io_info.nread++;
 #endif
 #ifdef DISKMON
        io_info.nread++;
@@ -145,32 +145,32 @@ daddr_t blkno, rablkno;
                        bp->b_flags |= B_READ;
                        bp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(bp);
                        bp->b_flags |= B_READ;
                        bp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(bp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_MISS, dev, blkno);
+#ifdef TRACE
+                       trace(TR_BREADMISS, dev, blkno);
 #endif
 #ifdef DISKMON
                        io_info.nread++;
 #endif
                        u.u_vm.vm_inblk++;              /* pay for read */
                }
 #endif
 #ifdef DISKMON
                        io_info.nread++;
 #endif
                        u.u_vm.vm_inblk++;              /* pay for read */
                }
-#ifdef EPAWNJ
+#ifdef TRACE
                else
                else
-                       trace(TR_BREAD|TR_HIT, dev, blkno);
+                       trace(TR_BREADHIT, dev, blkno);
 #endif
        }
        if (rablkno && !incore(dev, rablkno)) {
                rabp = getblk(dev, rablkno);
                if (rabp->b_flags & B_DONE) {
                        brelse(rabp);
 #endif
        }
        if (rablkno && !incore(dev, rablkno)) {
                rabp = getblk(dev, rablkno);
                if (rabp->b_flags & B_DONE) {
                        brelse(rabp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_HIT|TR_RA, dev, blkno);
+#ifdef TRACE
+                       trace(TR_BREADHITRA, dev, blkno);
 #endif
                } else {
                        rabp->b_flags |= B_READ|B_ASYNC;
                        rabp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(rabp);
 #endif
                } else {
                        rabp->b_flags |= B_READ|B_ASYNC;
                        rabp->b_bcount = BSIZE;
                        (*bdevsw[major(dev)].d_strategy)(rabp);
-#ifdef EPAWNJ
-                       trace(TR_BREAD|TR_MISS|TR_RA, dev, rablock);
+#ifdef TRACE
+                       trace(TR_BREADMISSRA, dev, rablock);
 #endif
 #ifdef DISKMON
                        io_info.nreada++;
 #endif
 #ifdef DISKMON
                        io_info.nreada++;
@@ -201,7 +201,7 @@ register struct buf *bp;
 #endif
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #endif
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
@@ -390,7 +390,7 @@ daddr_t blkno;
                bwrite(bp);
                goto loop;
        }
                bwrite(bp);
                goto loop;
        }
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY;
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY;
@@ -432,7 +432,7 @@ loop:
                bwrite(bp);
                goto loop;
        }
                bwrite(bp);
                goto loop;
        }
-#ifdef EPAWNJ
+#ifdef TRACE
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.