X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2Fafs_trace.et;h=934cca1729e8360e6295fb41bd70c91147e26c73;hp=3c65d283d953cf8b7e723b07892846ebf478f544;hb=b8c94524a3f9df86306cf4f4d9d326979b6f9683;hpb=971b18bc424ac969f12166dd83d7b327b9257636

diff --git a/src/afs/afs_trace.et b/src/afs/afs_trace.et
index 3c65d28..934cca1 100644
--- a/src/afs/afs_trace.et
+++ b/src/afs/afs_trace.et
@@ -1,18 +1,18 @@
 # Copyright 2000, International Business Machines Corporation and others.
 # All Rights Reserved.
-# 
+#
 # This software has been released under the terms of the IBM Public
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
 error_table 2 ZCM
 	ec	CM_TRACE_NULL, "dummy"
-	ec	CM_TRACE_PAGEIN, "getapage vp 0x%lx off 0x%x len 0x%x rw=0x%x"
+	ec	CM_TRACE_PAGEIN, "getapage vp 0x%lx off (0x%x, 0x%x) len  0x%x rw=0x%x"
 	ec	CM_TRACE_PAGEINDONE, "getapage done code 0x%x pg 0x%lx (0x%x)"
-	ec	CM_TRACE_PAGEOUT, "putpage vp 0x%lx off 0x%x len 0x%x flags=0x%x"
+	ec	CM_TRACE_PAGEOUT, "putpage vp 0x%lx off (0x%x, 0x%x) len 0x%x flags=0x%x"
 	ec	CM_TRACE_PAGEOUTDONE, "putpage done code 0x%x #dirty 0x%x"
-	ec	CM_TRACE_PAGEOUTONE, "putApage vp 0x%lx pag 0x%lx len 0x%x off 0x%x"
-	ec	CM_TRACE_VMRW, "vmrw vp 0x%lx, write=0x%x, off=0x%x, len=0x%x"
+	ec	CM_TRACE_PAGEOUTONE, "putApage vp 0x%lx pag 0x%lx len 0x%x off (0x%x, 0x%x)"
+	ec	CM_TRACE_VMRW, "vmrw vp 0x%lx, write=0x%x, off=(0x%x, 0x%x), len=(0x%x, 0x%x)"
 	ec	CM_TRACE_STRATEGYDONE,	"strategy done vp 0x%lx code 0x%x left 0x%x"
 	ec	CM_TRACE_FLUSHV, "flushv vp 0x%lx states 0x%x"
 	ec	CM_TRACE_GETDOWND, "getdownd vp 0x%lx skip 0x%x index %d coff (0x%x, 0x%x)"
@@ -25,8 +25,7 @@ error_table 2 ZCM
 	ec	CM_TRACE_PROCESSFS, "ProcessFS vp 0x%lx old len (0x%x, 0x%x) new len (0x%x, 0x%x)"
 	ec	CM_TRACE_STOREALL, "StoreAll vp 0x%lx len (0x%x, 0x%x)"
 	ec	CM_TRACE_INVALL, "InvalAll vp 0x%lx len 0x%x"
-	ec	CM_TRACE_TRUNCALL1, "TruncAll vp 0x%lx old len 0x%x new len 0x%x"
-	ec	CM_TRACE_TRUNCALL2,"TruncAll vp 0x%lx vlen 0x%x len 0x%x"
+	ec	CM_TRACE_TRUNCALL, "TruncAll vp 0x%lx old len (0x%x, 0x%x) new len (0x%x, 0x%x)"
 	
 	ec	CM_TRACE_GNLINK, "Gn_link vp 0x%lx name %s (returns 0x%x)"
 	ec	CM_TRACE_GMKDIR, "Gn_mkdir vp 0x%lx name %s mode 0x%x (returns 0x%x)"
@@ -56,7 +55,7 @@ error_table 2 ZCM
 	ec	CM_TRACE_STUFFVCACHE, "StuffVcache 0x%lx callback host 0x%lx expires %u (in %u secs)"
 	ec	CM_TRACE_GETDCACHE1, "Getdcache vp 0x%lx failed to find chunk 0x%x"
 	ec	CM_TRACE_GETDCACHE2, "GetdCache vp 0x%lx dcache 0x%lx dcache low-version 0x%x, vcache low-version 0x%x"
-	ec	CM_TRACE_GETDCACHE3, "GetdCache tlen 0x%x size 0x%x abyte (0x%x, 0x%x) Position (0x%x, 0x%x)"
+	ec	CM_TRACE_GETDCACHE3, "GetdCache tlen 0x%x flags 0x%x abyte (0x%x, 0x%x) Position (0x%x, 0x%x)"
 	ec	CM_TRACE_STOREMINI, "storemini vp 0x%lx length 0x%x"
 	ec	CM_TRACE_STOREDCACHE, "StoreDCache vp 0x%lx chunk 0x%x length 0x%x at position 0x%x"
 	ec	CM_TRACE_STOREDCACHEDONE, "StoreDCache Done for vp 0x%lx (returns 0x%x)"
@@ -100,10 +99,10 @@ error_table 2 ZCM
 	ec	CM_TRACE_READLINK, "readlink 0x%lx"
 	ec	CM_TRACE_FSYNC, "fsync 0x%lx"
 
-	ec      CM_TRACE_LOCKDONE,  "Released lock 0x%lx level %d"
-	ec	CM_TRACE_LOCKDOWN,  "Downgraded lock 0x%lx to %d"
-	ec	CM_TRACE_LOCKOBTAIN,"Obtained lock 0x%lx level %d"
-	ec	CM_TRACE_LOCKSLEPT, "Slept for lock 0x%lx level %d"
+	ec      CM_TRACE_LOCKDONE,  "%s line %d: Released lock 0x%lx level %d"
+	ec	CM_TRACE_LOCKDOWN,  "%s line %d: Downgraded lock 0x%lx to %d"
+	ec	CM_TRACE_LOCKOBTAIN,"%s line %d: Obtained lock 0x%lx level %d"
+	ec	CM_TRACE_LOCKSLEPT, "%s line %d: Slept for lock 0x%lx level %d"
 
 	ec	CM_TRACE_PAGE_READ, "0x%lx called page_read (returned %d) states 0x%x"
 	ec	CM_TRACE_PAGE_WRITE, "0x%lx called page_write (returned %d) states 0x%x"
@@ -153,5 +152,14 @@ error_table 2 ZCM
 	ec	CM_TRACE_PREFETCHCMD, "PrefetchCmd tvc 0x%x tfid (%d:%d.%d.%d) fid (%d:%d.%d.%d)"
 	ec	CM_TRACE_STOREPROC2, "StoreProc got 0x%x"
 	ec	CM_TRACE_ADJUSTSIZE, "AdjustSize index %d oldSize %d newSize %d blocksUsed %d"
+	ec	CM_TRACE_SETLENGTH, "%s line %d: m.Length was (0x%x, 0x%x), now (0x%x, 0x%x)"
+	ec	CM_TRACE_DCACHEWAIT, "%s line %d: waiting for 0x%x flags 0x%x" 
+	ec	CM_TRACE_VNODEREAD, "UFSRead: tdc 0x%x, offset (0x%x, 0x%x) len (0x%x 0x%x)" 
+	ec	CM_TRACE_SLEEP, "Sleep: evp 0x%x, count %d seq 0x%x evp->seq 0x%x" 
+	ec	CM_TRACE_WAKE, "Wakeup: evp 0x%x, evp->seq 0x%x"
+	ec	CM_TRACE_DENTRYDELETE, "d_delete inode 0x%x d_name %s/%s"
+	ec	CM_TRACE_DENTRYIPUT, "d_iput inode 0x%x d_name %s/%s"
+	ec	CM_TRACE_TRYFLUSHDCACHECHILDREN, "TryFlushDcacheChildren ip 0x%x"
+	ec	CM_TRACE_DCACHEWAKE, "%s line %d: waking up waiters for 0x%x flags 0x%x"
 end