2006-08-09 Thang Nguyen <thang.p.nguyen@intel.com>

        * testsuite/buildok/iolock_test.stp: Updated for ioblock.stp

2 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a8d193f8..70730e0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-09  Thang Nguyen  <thang.p.nguyen@intel.com>
+
+	* testsuite/buildok/iolock_test.stp: Updated for new ioblock.stp
+
 2006-08-09  Josh Stone  <joshua.i.stone@intel.com>
 
 	* examples/small_demos/proc_snoop.stp,
diff --git a/testsuite/buildok/ioblock_test.stp b/testsuite/buildok/ioblock_test.stp
index f15d1643..3faaab15 100755
--- a/testsuite/buildok/ioblock_test.stp
+++ b/testsuite/buildok/ioblock_test.stp
@@ -1,11 +1,18 @@
 #! stap -p4
 
-probe ioblock.submit {
+probe ioblock.request {
   log(pp())
-  printf("%s\t%d\t%s\t%d\n", bio_devname, sector, rw_string, rw)
+  add_part = 0
+  if (bdev != bdev_contains) 
+  	add_part = p_start_sect
+  printf("%s\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", 
+        	devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments,
+  		hw_segments, size, add_part, ino)
 }
 
 probe ioblock.end {
   log(pp())
-  printf("%s\t%d\t%d\t%s\t%d\t%d\n", bio_devname, sector, bytes_done, rw_string, rw, error)
+  printf("%s\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n",
+                devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments,
+                hw_segments, size, bytes_done, error, ino)
 }