diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-06-30 09:21:36 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-06-30 09:21:36 -0400 |
| commit | e5a9a77a535be94e915470eab5453e8976bc911c (patch) | |
| tree | 3ee34a4f1c777c9671cea3e2f593eebe5afa8e9c | |
| parent | b2b6260ce7093deb44a70835a38fd7199f0b0954 (diff) | |
| parent | 735e0540b865b9d6ba6d4e3baee61e1210b88810 (diff) | |
| download | systemtap-steved-e5a9a77a535be94e915470eab5453e8976bc911c.tar.gz systemtap-steved-e5a9a77a535be94e915470eab5453e8976bc911c.tar.xz systemtap-steved-e5a9a77a535be94e915470eab5453e8976bc911c.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
| -rw-r--r-- | tapset/ioscheduler.stp | 12 | ||||
| -rw-r--r-- | tapset/memory.stp | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | testsuite/systemtap.examples/general/grapher.stp | 0 | ||||
| -rwxr-xr-x | testsuite/systemtap.examples/network/sk_stream_wait_memory.stp | 1 |
4 files changed, 16 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 diff --git a/tapset/memory.stp b/tapset/memory.stp index 83875aa4..a855fbcb 100644 --- a/tapset/memory.stp +++ b/tapset/memory.stp @@ -15,6 +15,7 @@ global VM_FAULT_OOM=0, VM_FAULT_SIGBUS=1, VM_FAULT_MINOR=2, VM_FAULT_MAJOR=3 global VM_FAULT_NOPAGE=4, VM_FAULT_LOCKED=5, VM_FAULT_ERROR=6 +global FAULT_FLAG_WRITE=1 /** * sfunction vm_fault_contains - Test return value for page fault reason @@ -64,7 +65,11 @@ function vm_fault_contains:long (value:long, test:long) probe vm.pagefault = kernel.function("__handle_mm_fault@mm/memory.c") ?, kernel.function("handle_mm_fault@mm/memory.c") ? { +%( kernel_v >= "2.6.31" %? + write_access = $flags & FAULT_FLAG_WRITE +%: write_access = $write_access +%) address = $address } diff --git a/testsuite/systemtap.examples/general/grapher.stp b/testsuite/systemtap.examples/general/grapher.stp index 4f326ec1..4f326ec1 100644..100755 --- a/testsuite/systemtap.examples/general/grapher.stp +++ b/testsuite/systemtap.examples/general/grapher.stp diff --git a/testsuite/systemtap.examples/network/sk_stream_wait_memory.stp b/testsuite/systemtap.examples/network/sk_stream_wait_memory.stp index 159d77a6..1708ac06 100755 --- a/testsuite/systemtap.examples/network/sk_stream_wait_memory.stp +++ b/testsuite/systemtap.examples/network/sk_stream_wait_memory.stp @@ -1,3 +1,4 @@ +#! /usr/bin/env stap # Simple probe to detect when a process is waiting for more socket send # buffer memory. Usually means the process is doing writes larger than the # socker send buffer size or there is a slow receiver at the other side. |