summaryrefslogtreecommitdiffstats
path: root/tapset/ioscheduler.stp
diff options
context:
space:
mode:
authorWenji Huang <wenji.huang@oracle.com>2009-06-29 21:42:19 -0400
committerWenji Huang <wenji.huang@oracle.com>2009-06-29 21:42:19 -0400
commit7735320dcc4008bb5bf8777942ecc5e215fd1a29 (patch)
tree2665eb5d766db374eb4952d001bd82db393150e0 /tapset/ioscheduler.stp
parent2fd285e65eb8e1f77cb5b70a1f81377896ad6b2c (diff)
downloadsystemtap-steved-7735320dcc4008bb5bf8777942ecc5e215fd1a29.tar.gz
systemtap-steved-7735320dcc4008bb5bf8777942ecc5e215fd1a29.tar.xz
systemtap-steved-7735320dcc4008bb5bf8777942ecc5e215fd1a29.zip
Update memory and ioscheduler tapset for 2.6.31
* tapset/ioscheduler.stp (elv_next_request): Change to blk_peek_request. * tapset/memory.stp (vm.pagefault): Replace $write_access.
Diffstat (limited to 'tapset/ioscheduler.stp')
-rw-r--r--tapset/ioscheduler.stp12
1 files changed, 10 insertions, 2 deletions
diff --git a/tapset/ioscheduler.stp b/tapset/ioscheduler.stp
index a79ae752..637e2783 100644
--- a/tapset/ioscheduler.stp
+++ b/tapset/ioscheduler.stp
@@ -18,7 +18,11 @@
* @elevator_name: The type of I/O elevator currently enabled
*/
probe ioscheduler.elv_next_request
- = kernel.function("elv_next_request")
+ = %( kernel_v >= "2.6.31" %?
+ kernel.function("blk_peek_request")
+ %:
+ kernel.function("elv_next_request")
+ %)
{
%( kernel_v >= "2.6.10" %?
elevator_name = kernel_string($q->elevator->elevator_type->elevator_name)
@@ -35,7 +39,11 @@ probe ioscheduler.elv_next_request
* @disk_minor: Disk minor number of the request
*/
probe ioscheduler.elv_next_request.return
- = kernel.function("elv_next_request").return
+ = %( kernel_v >= "2.6.31" %?
+ kernel.function("blk_peek_request").return
+ %:
+ kernel.function("elv_next_request").return
+ %)
{
if($return == 0) {
req = 0