diff options
| author | William Cohen <wcohen@redhat.com> | 2008-10-29 14:59:55 -0400 |
|---|---|---|
| committer | William Cohen <wcohen@redhat.com> | 2008-10-29 14:59:55 -0400 |
| commit | f2b54492ed30003763833a5a5ac210790af60ec9 (patch) | |
| tree | cb6a426ad290b8d79bc79edabc249d1d044bad90 /testsuite | |
| parent | 3bc6d0ff20540e12b78dfd00656f65cb6d6d759a (diff) | |
| download | systemtap-steved-f2b54492ed30003763833a5a5ac210790af60ec9.tar.gz systemtap-steved-f2b54492ed30003763833a5a5ac210790af60ec9.tar.xz systemtap-steved-f2b54492ed30003763833a5a5ac210790af60ec9.zip | |
Clean up disktop.stp and check in for real.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/systemtap.examples/ChangeLog | 4 | ||||
| -rwxr-xr-x | testsuite/systemtap.examples/io/disktop.stp | 32 |
2 files changed, 21 insertions, 15 deletions
diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog index 093785ed..13d1820f 100644 --- a/testsuite/systemtap.examples/ChangeLog +++ b/testsuite/systemtap.examples/ChangeLog @@ -1,3 +1,7 @@ +2008-10-27 William Cohen <wcohen@redhat.com> + + * io/disktop.stp: Clean up disktop.stp and check in for real. + 2008-10-29 Frank Ch. Eigler <fche@elastic.org> * process/syscalltimes: Rename global "start" to avoid collision diff --git a/testsuite/systemtap.examples/io/disktop.stp b/testsuite/systemtap.examples/io/disktop.stp index fcfe79ed..238195bf 100755 --- a/testsuite/systemtap.examples/io/disktop.stp +++ b/testsuite/systemtap.examples/io/disktop.stp @@ -2,10 +2,11 @@ # # Copyright (C) 2007 Oracle Corp. # -# Get the status of reading/writing disk every 5 seconds, output top ten entries +# Get the status of reading/writing disk every 5 seconds, +# output top ten entries # -# This is free software,GNU General Public License (GPL); either version 2, or (at your option) any -# later version. +# This is free software,GNU General Public License (GPL); +# either version 2, or (at your option) any later version. # # Usage: # ./disktop.stp @@ -14,11 +15,8 @@ global io_stat,device global read_bytes,write_bytes -probe kernel.function("vfs_read").return { +probe vfs.read.return { if ($return>0) { - dev = __file_dev($file) - devname = __find_bdevname(dev,__file_bdev($file)) - if (devname!="N/A") {/*skip read from cache*/ io_stat[pid(),execname(),uid(),ppid(),"R"] += $return device[pid(),execname(),uid(),ppid(),"R"] = devname @@ -27,11 +25,8 @@ probe kernel.function("vfs_read").return { } } -probe kernel.function("vfs_write").return { +probe vfs.write.return { if ($return>0) { - dev = __file_dev($file) - devname = __find_bdevname(dev,__file_bdev($file)) - if (devname!="N/A") { /*skip update cache*/ io_stat[pid(),execname(),uid(),ppid(),"W"] += $return device[pid(),execname(),uid(),ppid(),"W"] = devname @@ -44,15 +39,22 @@ probe timer.ms(5000) { /* skip non-read/write disk */ if (read_bytes+write_bytes) { - printf("\n%-25s, %-8s%4dKb/sec, %-7s%6dKb, %-7s%6dKb\n\n",ctime(gettimeofday_s()),"Average:", - ((read_bytes+write_bytes)/1024)/5,"Read:",read_bytes/1024,"Write:",write_bytes/1024) + printf("\n%-25s, %-8s%4dKb/sec, %-7s%6dKb, %-7s%6dKb\n\n", + ctime(gettimeofday_s()), + "Average:", ((read_bytes+write_bytes)/1024)/5, + "Read:",read_bytes/1024, + "Write:",write_bytes/1024) /* print header */ - printf("%8s %8s %8s %25s %8s %4s %12s\n","UID","PID","PPID","CMD","DEVICE","T","BYTES") + printf("%8s %8s %8s %25s %8s %4s %12s\n", + "UID","PID","PPID","CMD","DEVICE","T","BYTES") } /* print top ten I/O */ foreach ([process,cmd,userid,parent,action] in io_stat- limit 10) - printf("%8d %8d %8d %25s %8s %4s %12d\n",userid,process,parent,cmd,device[process,cmd,userid,parent,action], action,io_stat[process,cmd,userid,parent,action]) + printf("%8d %8d %8d %25s %8s %4s %12d\n", + userid,process,parent,cmd, + device[process,cmd,userid,parent,action], + action,io_stat[process,cmd,userid,parent,action]) /* clear data */ delete io_stat |