Merge commit 'origin/master' into pr4225

* commit 'origin/master': (34 commits)
  PR5049: fix overbroad effects of naive "*" prefixing; instead use optional "*/" only.
  stap-serverd was incorectly determining that the server could
  stapprobes man page: clarify statement(NUM).absolute and process("path") searching
  PR5049: prefix with "*" any filenames given in "fn@filename:line" probes
  Indentation fix.
  Redirect stderr gets redircted so warnings don't let example script run fail.
  PR6835. io/io_submit.stp: Fix #! start. Convert to normal line-ending.
  PR2895. Add proper #! /usr/bin/env stap line. Make example scripts executable.
  Use INSTALL_PROGRAM, not INSTALL_DATA for executable .stp scripts.
  example index: only warn if old, do not regenerate
  Start/stop the systemtap server from systemtap.exp and not in the top level Makefile.
  Lower statement wildcard test matching threshold.
  Moved details of utrace detach to stap_utrace_detach().
  Saves thread vma information.
  Always generate examples indexes and install examples from srcdir.
  Refer to srcdir spec file Makefile so make rpm works when builddir != srcdir.
  Add index of subsystem and keywords at top of HTML indexes.
  Don't output output, exits, status line in indexes (mentioned in descriptions).
  Disable chmodding of samples/kmalloc-top in spec file since it isn't installed.
  Make sure examples indexes are always generated in builddir.
  ...

1 files changed, 81 insertions, 0 deletions

diff --git a/testsuite/systemtap.examples/io/iostat-scsi.stp b/testsuite/systemtap.examples/io/iostat-scsi.stp
new file mode 100755
index 00000000..ef778e53
--- /dev/null
+++ b/testsuite/systemtap.examples/io/iostat-scsi.stp
@@ -0,0 +1,81 @@
+#! /usr/bin/env stap
+
+global devices, reads, writes
+
+/* data collection: SCSI disk */
+%(kernel_v<"2.6.24" %?
+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
+%(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
+}
+%:
+%{
+#include <scsi/scsi_device.h>
+%}
+
+function get_sector_size:long (data:long) %{ /* pure */
+  struct scsi_device *sdp = (struct scsi_device *)((long)THIS->data);
+  THIS->__retvalue = kread(&(sdp->sector_size));
+  CATCH_DEREF_FAULT();
+%}
+
+probe module("sd_mod").function("sd_prep_fn") !, kernel.function("sd_prep_fn") {
+  device=kernel_string($rq->rq_disk->disk_name)
+  sector_size=get_sector_size($q->queuedata)
+  nr_sectors=$rq->nr_sectors
+  devices[device] = 1
+  if ($rq->cmd_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") !, kernel.function("st_do_scsi") {
+  device=kernel_string($STp->disk->disk_name)
+  devices[device] = 1
+  if ($direction)
+    writes[device] <<< $bytes
+  else
+    reads[device] <<< $bytes
+}
+
+
+/* reporting */
+global blksize=512
+global hdrcount
+probe timer.s($1) {
+  if ((hdrcount++ % 10) == 0)
+    printf("%9s %9s %9s %9s %9s %9s\n",
+	   "Device:","tps","blk_read/s","blk_wrtn/s","blk_read","blk_wrtn")
+
+  foreach (dev in devices) {
+    rdcount=@count(reads[dev])
+    wrcount=@count(writes[dev])
+    tps=(rdcount+wrcount)*100/$1
+    rdblkcount=rdcount ? @sum(reads[dev])/blksize : 0
+    wrblkcount=wrcount ? @sum(writes[dev])/blksize : 0
+    rdblkrate=rdblkcount*100/$1
+    wrblkrate=wrblkcount*100/$1
+    printf("%9s %6d.%02d %6d.%02d %6d.%02d %9d %9d\n",
+	dev, tps/100,tps%100,
+	rdblkrate/100,rdblkrate%100,
+	wrblkrate/100,wrblkrate%100,
+	rdblkcount, wrblkcount)
+  }
+  printf ("\n")
+  delete devices
+  delete reads
+  delete writes
+}