summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorwenji <wenji>2007-09-16 02:12:14 +0000
committerwenji <wenji>2007-09-16 02:12:14 +0000
commitca55dccb1472fec954347b0a00aa9f741d3f063a (patch)
tree82156d22d59bc1ece39641a91eaa5b97fff9b9d2 /examples
parent5010cebe245517a87bc81086c67203af98a523d7 (diff)
downloadsystemtap-steved-ca55dccb1472fec954347b0a00aa9f741d3f063a.tar.gz
systemtap-steved-ca55dccb1472fec954347b0a00aa9f741d3f063a.tar.xz
systemtap-steved-ca55dccb1472fec954347b0a00aa9f741d3f063a.zip
2007-09-15 Wenji Huang <wenji.huang@oracle.com>
* iostat-scsi.stp: Make module probe optional,clarify reference to flags. * small_demos/sched_snoop.stp(scheduler.migrage,scheduler.balance): Make optional.
Diffstat (limited to 'examples')
-rw-r--r--examples/ChangeLog5
-rw-r--r--examples/iostat-scsi.stp12
-rwxr-xr-xexamples/small_demos/sched_snoop.stp4
3 files changed, 15 insertions, 6 deletions
diff --git a/examples/ChangeLog b/examples/ChangeLog
index d48b2075..a6e2e840 100644
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-15 Wenji Huang <wenji.huang@oracle.com>
+
+ * iostat-scsi.stp: Make module probe optional,clarify reference to flags.
+ * small_demos/sched_snoop.stp(scheduler.migrage,scheduler.balance): Make optional.
+
2007-09-05 Frank Ch. Eigler <fche@elastic.org>
* pf2.stp: Exploit sortable aggregates.
diff --git a/examples/iostat-scsi.stp b/examples/iostat-scsi.stp
index f02f4275..63b0496c 100644
--- a/examples/iostat-scsi.stp
+++ b/examples/iostat-scsi.stp
@@ -1,20 +1,24 @@
-#! /usr/bin/stap
+#!/bin/env stap
global devices, reads, writes
/* data collection: SCSI disk */
-probe module("sd_mod").function("sd_init_command") {
+probe module("sd_mod").function("sd_init_command") ?, kernel.function("sd_init_command") ? {
device=kernel_string($SCpnt->request->rq_disk->disk_name)
sector_size=$SCpnt->device->sector_size
nr_sectors=$SCpnt->request->nr_sectors
devices[device] = 1
- if ($SCpnt->request->flags /* cmd_flags on some kernels */ & 1)
+%(kernel_v>="2.6.19" %?
+ if ($SCpnt->request->cmd_flags & 1)
+%:
+ if ($SCpnt->request->flags & 1)
+%)
writes[device] <<< nr_sectors * sector_size
else
reads[device] <<< nr_sectors * sector_size
}
/* data collection: SCSI tape */
-probe module("st").function("st_do_scsi") {
+probe module("st").function("st_do_scsi") ?, kernel.function("st_do_scsi") ? {
device=kernel_string($STp->disk->disk_name)
devices[device] = 1
if ($direction)
diff --git a/examples/small_demos/sched_snoop.stp b/examples/small_demos/sched_snoop.stp
index 9c6ebe65..623643dd 100755
--- a/examples/small_demos/sched_snoop.stp
+++ b/examples/small_demos/sched_snoop.stp
@@ -26,10 +26,10 @@ probe scheduler.tick {
report(sprintf("tick%s", idle? " [idle]" : ""))
}
-probe scheduler.migrate {
+probe scheduler.migrate ? {
report("migrate")
}
-probe scheduler.balance {
+probe scheduler.balance ? {
report("balance")
}