diff options
| -rw-r--r-- | tapset/ChangeLog | 4 | ||||
| -rw-r--r-- | tapset/ioblock.stp | 4 | ||||
| -rw-r--r-- | testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | testsuite/systemtap.samples/ioblocktest.stp | 8 |
4 files changed, 17 insertions, 7 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 3184f73b..c565bc5b 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,7 @@ +2007-01-13 Mike Mason <mmlnx@us.ibm.com> + + * ioblock.stp: renamed __bio_direction() to bio_rw_num() + 2007-01-12 Mike Mason <mmlnx@us.ibm.com> * x86_64/syscalls.stp: added ? to request_key aliases diff --git a/tapset/ioblock.stp b/tapset/ioblock.stp index 3590f750..a9be060b 100644 --- a/tapset/ioblock.stp +++ b/tapset/ioblock.stp @@ -49,7 +49,7 @@ end: ; %} /* returns 0 for read, 1 for write */ -function __bio_direction:long(rw:long) +function bio_rw_num:long(rw:long) %{ long rw = (long)THIS->rw; THIS->__retvalue = (rw & (1 << BIO_RW)); @@ -58,7 +58,7 @@ function __bio_direction:long(rw:long) /* returns R for read, W for write */ function bio_rw_str(rw) { - return __bio_direction(rw) == BIO_READ ? "R" : "W" + return bio_rw_num(rw) == BIO_READ ? "R" : "W" } /* returns start sector */ diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 43b50f8b..e3452ee7 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2007-01-13 Mike Mason <mmlnx@us.ibm.com> + + PR 3867 + * systemtap.samples/ioblocktest.stp: Fixed so only + checks bit 0 (Read/Write bit) of bio->bi_rw. Also merged + ioblock.request and ioblock.end probes. They do the same + thing. + 2007-01-10 Martin Hunt <hunt@redhat.com> * systemtap.maps/foreach_foreach.exp: Update for new delete func. diff --git a/testsuite/systemtap.samples/ioblocktest.stp b/testsuite/systemtap.samples/ioblocktest.stp index 43b3e7d0..4aa3c3a9 100644 --- a/testsuite/systemtap.samples/ioblocktest.stp +++ b/testsuite/systemtap.samples/ioblocktest.stp @@ -2,11 +2,9 @@ global teststr probe begin { log("systemtap starting probe") } -probe ioblock.request { - teststr = sprintf("ioblock: %s\t%d\t%s\t%d\n", devname, sector, bio_rw_str(rw), rw) -} -probe ioblock.end { - teststr = sprintf("ioblock: %s\t%d\t%s\t%d\n", devname, sector, bio_rw_str(rw), rw) +probe ioblock.request, ioblock.end { + teststr = sprintf("ioblock: %s\t%d\t%s\t%d\n", devname, sector, + bio_rw_str(rw), bio_rw_num(rw)) } probe end { log("systemtap ending probe") |