From b27554b93d855972c0b8484226fab1253d1472e3 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Thu, 7 Aug 2008 12:43:39 +0200
Subject: Add meta file tag descriptions to systemtap.examples/README.

---
 testsuite/systemtap.examples/README | 52 +++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/README b/testsuite/systemtap.examples/README
index 6718a55a..e505bdfb 100644
--- a/testsuite/systemtap.examples/README
+++ b/testsuite/systemtap.examples/README
@@ -5,5 +5,53 @@ Each script should be checked in as executable.
 The first line should be
 #! /usr/bin/env stap
 
-There should be an accompanying ".txt" file describing what the
-script does and how to use it.
+There should be an accompanying ".meta" file describing what the
+script does and how to use it, and how the testsuite should compile
+and run it. The meta files are also used to create a txt and html
+index (by keyword and subsystem) of all the examples by the
+examples-index-gen.pl script.
+
+The meta file contains the following elements. Each element (key and
+value) are on one line. If a key can have a list of values, the list
+elements are separated by spaces.
+
+title: Descriptive title for the script (required)
+name: the file name for the script, e.g. iotime.stp (required)
+version: versioning if any fixes and developed can be identified (required)
+author: name of author(s), "anonymous" if unknown (required)
+exclusivearch: Stated if the script can only run on some arches
+	       this concept borrowed from rpm, matches types for rpm:
+	       x86 i386 x86_64 ppc ppc64, s390 (optional)
+requires: Some scripts may require software to be available. In some cases
+	  may need version numbering, e.g. kernel >= 2.6
+    	  Can have multiple "requires:" tags. (optional)
+keywords: List of likely words to categorize the script (required)
+	  keywords are separated by spaces.
+          #FIXME have list of keyword
+subsystem: List what part of the kernel the instrumentation probes (required)
+	   audit cpu blockio file filesystem locking memory numa network
+	   process scheduler or user-space (probes are in the user-space)
+application: when user-space probing becomes available (optional)
+             a script might probe a particular application
+	     this tag indicates the applicaton
+status: describes the state of development for the script (required)
+	proposed    	just an idea
+	experimental	an implemented idea, but use at own risk
+	alpha		   
+	beta
+	production	should be safe to use
+exit: how long do the script run? (required)
+      fixed	    	exits in a fixed amount of time
+      user-controlled	      exits with "cntrl-c"
+      event-ended	      	    exits with some arbitrary event
+output: what kind of output does the script generate? (required)
+	trace histogram graph sorted batch timed
+scope: How much of the processes on the machine does the script watch?
+       system-wide or pid
+arg_[0-9]+: Describe what the arguments into the script are. (optional)
+description: A text description what the script does. (required)
+test_check: How to check that the example compiles.
+	    (e.g. stap -p4 iotime.stp)
+test_installcheck: How to check that the example runs.
+		   (e.g. stap iotime.stp -c "sleep 1")
+
-- 
cgit 


From ea667a9f0d42dad0652563e7b76ce1527ebb9fc3 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Thu, 7 Aug 2008 14:24:51 +0200
Subject: Correct futexes.meta name: entry.

---
 testsuite/systemtap.examples/ChangeLog    | 4 ++++
 testsuite/systemtap.examples/futexes.meta | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index 7cb39fb9..ca2ffbdd 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-07  Mark Wielaard  <mwielaard@redhat.com>
+
+	* futexes.meta: Correct name: entry.
+
 2008-08-01  William Cohen  <wcohen@redhat.com>
 
 	* helloworld.meta, traceio2.meta: Tweak test_installcheck.
diff --git a/testsuite/systemtap.examples/futexes.meta b/testsuite/systemtap.examples/futexes.meta
index 0a34b2d8..ff303122 100644
--- a/testsuite/systemtap.examples/futexes.meta
+++ b/testsuite/systemtap.examples/futexes.meta
@@ -1,5 +1,5 @@
 title: System-Wide Futex Contention
-name: futex.stp
+name: futexes.stp
 version: 1.0
 author: anonymous
 keywords: syscall locking futex
-- 
cgit 


From 1cfd2143ecabdf664b2d61f6d46bfab6fdd77816 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Thu, 7 Aug 2008 15:18:14 +0200
Subject: Add new examples-index-gen.pl script and support files.

---
 testsuite/systemtap.examples/ChangeLog             |  10 +
 testsuite/systemtap.examples/examples-index-gen.pl | 290 +++++++++++++++++++++
 testsuite/systemtap.examples/html_footer.tmpl      |  14 +
 testsuite/systemtap.examples/html_header.tmpl      |  41 +++
 testsuite/systemtap.examples/systemtap.css         | 164 ++++++++++++
 testsuite/systemtap.examples/systemtapcorner.gif   | Bin 0 -> 970 bytes
 testsuite/systemtap.examples/systemtaplogo.png     | Bin 0 -> 1860 bytes
 7 files changed, 519 insertions(+)
 create mode 100644 testsuite/systemtap.examples/examples-index-gen.pl
 create mode 100644 testsuite/systemtap.examples/html_footer.tmpl
 create mode 100644 testsuite/systemtap.examples/html_header.tmpl
 create mode 100644 testsuite/systemtap.examples/systemtap.css
 create mode 100644 testsuite/systemtap.examples/systemtapcorner.gif
 create mode 100644 testsuite/systemtap.examples/systemtaplogo.png

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index ca2ffbdd..fa6a3aa3 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-07  Mark Wielaard  <mwielaard@redhat.com>
+
+	* examples-index-gen.pl: New file.
+	* systemtap.css: Likewise.
+	* systemtapcorner.gif: Likewise.
+	* systemtaplogo.png: Likewise.
+	* html_footer.tmpl: Likewise.
+	* html_header.tmpl: Likewise.
+	* Makefile.am (EXTRA_DIST): Add new support files.
+
 2008-08-07  Mark Wielaard  <mwielaard@redhat.com>
 
 	* futexes.meta: Correct name: entry.
diff --git a/testsuite/systemtap.examples/examples-index-gen.pl b/testsuite/systemtap.examples/examples-index-gen.pl
new file mode 100644
index 00000000..bc12577e
--- /dev/null
+++ b/testsuite/systemtap.examples/examples-index-gen.pl
@@ -0,0 +1,290 @@
+# Generates index files from examples .meta file info.
+# Copyright (C) 2008 Red Hat Inc.
+#
+# This file is part of systemtap, and is free software.  You can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License (GPL); either version 2, or (at your option) any
+# later version.
+
+use strict;
+use warnings;
+
+use File::Copy;
+use File::Find;
+use File::Path;
+use Text::Wrap;
+
+my $inputdir;
+if ($#ARGV >= 0) {
+    $inputdir = $ARGV[0];
+} else {
+    $inputdir = ".";
+}
+
+my $outputdir;
+if ($#ARGV >= 1) {
+    $outputdir = $ARGV[1];
+} else {
+    $outputdir = $inputdir;
+}
+
+my %scripts = ();
+print "Parsing .meta files in $inputdir...\n";
+find(\&parse_meta_files, $inputdir);
+
+my $meta;
+my $subsystem;
+my %subsystems;
+my $keyword;
+my %keywords;
+
+# Adds a formatted meta entry to a given file handle as text.
+sub add_meta_txt(*;$) {
+    my($file,$meta) = @_;
+
+    print $file "$scripts{$meta}{name} - $scripts{$meta}{title}\n";
+
+    print $file "output: $scripts{$meta}{output}, ";
+    print $file "exits: $scripts{$meta}{exit}, ";
+    print $file "status: $scripts{$meta}{status}\n";
+
+    print $file "subsystem: $scripts{$meta}{subsystem}, ";
+    print $file "keywords: $scripts{$meta}{keywords}\n\n";
+
+    $Text::Wrap::columns = 72;
+    my $description = wrap('  ', '  ', $scripts{$meta}{description});
+    print $file "$description\n\n\n";
+}
+
+# Adds a formatted meta entry to a given file handle as text.
+sub add_meta_html(*;$) {
+    my($file,$meta) = @_;
+
+    my $name = $scripts{$meta}{name};
+    print $file "<li><a href=\"$name\">$name</a> ";
+    print $file "- $scripts{$meta}{title}<br>\n";
+
+    print $file "output: $scripts{$meta}{output}, ";
+    print $file "exits: $scripts{$meta}{exit}, ";
+    print $file "status: $scripts{$meta}{status}<br>\n";
+
+    print $file "subsystem: $scripts{$meta}{subsystem}, ";
+    print $file "keywords: $scripts{$meta}{keywords}<br>\n";
+
+    print $file "<p>$scripts{$meta}{description}";
+    print $file "</p></li>\n";
+}
+
+my $HEADER = "SYSTEMTAP EXAMPLES INDEX\n"
+    . "(see also subsystem-index.txt, keyword-index.txt)\n\n";
+
+my $header_tmpl = "$inputdir/html_header.tmpl";
+open(TEMPLATE, "<$header_tmpl")
+    || die "couldn't open $header_tmpl, $!";
+my $HTMLHEADER = do { local $/;  <TEMPLATE> };
+close(TEMPLATE);
+my $footer_tmpl = "$inputdir/html_footer.tmpl";
+open(TEMPLATE, "<$footer_tmpl")
+    || die "couldn't open $footer_tmpl, $!";
+my $HTMLFOOTER = do { local $/;  <TEMPLATE> };
+close(TEMPLATE);
+
+# Output full index and collect subsystems and keywords
+my $fullindex = "$outputdir/index.txt";
+open (FULLINDEX, ">$fullindex")
+    || die "couldn't open $fullindex: $!";
+print "Creating $fullindex...\n";
+print FULLINDEX $HEADER;
+
+my $fullhtml = "$outputdir/index.html";
+open (FULLHTML, ">$fullhtml")
+    || die "couldn't open $fullhtml: $!";
+print "Creating $fullhtml...\n";
+print FULLHTML $HTMLHEADER;
+print FULLHTML "<h2>All Examples</h2>\n";
+print FULLHTML "<ul>\n";
+
+foreach $meta (sort keys %scripts) {
+
+    add_meta_txt(\*FULLINDEX, $meta);
+    add_meta_html(\*FULLHTML, $meta);
+
+    # Collect subsystems
+    foreach $subsystem (split(/ /, $scripts{$meta}{subsystem})) {
+	if (defined $subsystems{$subsystem}) {
+	    push(@{$subsystems{$subsystem}}, $meta);
+	} else {
+	    $subsystems{$subsystem} = [ $meta ];
+	}
+    }
+
+    # Collect keywords
+    foreach $keyword (split(/ /, $scripts{$meta}{keywords})) {
+	if (defined $keywords{$keyword}) {
+	    push(@{$keywords{$keyword}}, $meta);
+	} else {
+	    $keywords{$keyword} = [ $meta ];
+	}
+    }
+}
+print FULLHTML "</ul>\n";
+print FULLHTML $HTMLFOOTER;
+close (FULLINDEX);
+close (FULLHTML);
+
+my $SUBHEADER = "SYSTEMTAP EXAMPLES INDEX BY SUBSYSTEM\n"
+    . "(see also index.txt, keyword-index.txt)\n\n";
+
+# Output subsystem index
+my $subindex = "$outputdir/subsystem-index.txt";
+open (SUBINDEX, ">$subindex")
+    || die "couldn't open $subindex: $!";
+print "Creating $subindex...\n";
+print SUBINDEX $SUBHEADER;
+
+my $subhtml = "$outputdir/subsystem-index.html";
+open (SUBHTML, ">$subhtml")
+    || die "couldn't open $subhtml: $!";
+print "Creating $subhtml...\n";
+print SUBHTML $HTMLHEADER;
+print SUBHTML "<h2>Examples by Subsystem</h2>\n";
+
+foreach $subsystem (sort keys %subsystems) {
+    print SUBINDEX "= " . (uc $subsystem) . " =\n\n";
+    print SUBHTML "<h3>" . (uc $subsystem) . "</h3>\n";
+    print SUBHTML "<ul>\n";
+
+    foreach $meta (sort @{$subsystems{$subsystem}}) {
+	add_meta_txt(\*SUBINDEX,$meta);
+	add_meta_html(\*SUBHTML,$meta);
+    }
+    print SUBHTML "</ul>\n";
+}
+print SUBHTML $HTMLFOOTER;
+close (SUBINDEX);
+close (SUBHTML);
+
+my $KEYHEADER = "SYSTEMTAP EXAMPLES INDEX BY KEYWORD\n"
+    . "(see also index.txt, subsystem-index.txt)\n\n";
+
+# Output subsystem index
+my $keyindex = "$outputdir/keyword-index.txt";
+open (KEYINDEX, ">$keyindex")
+    || die "couldn't open $keyindex: $!";
+print "Creating $keyindex...\n";
+print KEYINDEX $KEYHEADER;
+
+my $keyhtml = "$outputdir/keyword-index.html";
+open (KEYHTML, ">$keyhtml")
+    || die "couldn't open $keyhtml: $!";
+print "Creating $keyhtml...\n";
+print KEYHTML $HTMLHEADER;
+print KEYHTML "<h2>Examples by Keyword</h2>\n";
+
+foreach $keyword (sort keys %keywords) {
+    print KEYINDEX "= " . (uc $keyword) . " =\n\n";
+    print KEYHTML "<h3>" . (uc $keyword) . "</h3>\n";
+    print KEYHTML "<ul>\n";
+
+    foreach $meta (sort @{$keywords{$keyword}}) {
+	add_meta_txt(\*KEYINDEX,$meta);
+	add_meta_html(\*KEYHTML,$meta);
+    }
+    print KEYHTML "</ul>\n";
+}
+print KEYHTML $HTMLFOOTER;
+close (KEYINDEX);
+close (KEYHTML);
+
+my @supportfiles
+    = ("systemtapcorner.gif",
+       "systemtap.css",
+       "systemtaplogo.png");
+if ($inputdir ne $outputdir) {
+    my $file;
+    print "Copying support files...\n";
+    foreach $file (@supportfiles) {
+	my $orig = "$inputdir/$file";
+	my $dest = "$outputdir/$file";
+	print "Copying $file to $dest...\n";
+	copy("$orig", $dest) or die "$file cannot be copied to $dest, $!";
+    }
+}
+
+sub parse_meta_files {
+    my $file = $_;
+    my $filename = $File::Find::name;
+
+    if (-f $file && $file =~ /\.meta$/) {
+	open FILE, $file or die "couldn't open '$file': $!\n";
+
+	print "Parsing $filename...\n";
+	
+	my $title;
+	my $name;
+	my $keywords;
+	my $subsystem;
+	my $status;
+	my $exit;
+	my $output;
+	my $description;
+	while (<FILE>) {
+	    if (/^title: (.*)/) { $title = $1; }
+	    if (/^name: (.*)/) { $name = $1; }
+	    if (/^keywords: (.*)/) { $keywords = $1; }
+	    if (/^subsystem: (.*)/) { $subsystem = $1; }
+	    if (/^status: (.*)/) { $status = $1; }
+	    if (/^exit: (.*)/) { $exit = $1; }
+	    if (/^output: (.*)/) { $output = $1; }
+	    if (/^description: (.*)/) { $description = $1; }
+	}
+	close FILE;
+
+	# Remove extra whitespace
+	$keywords =~ s/^\s*//;
+	$keywords =~ s/\s*$//;
+	$subsystem =~ s/^\s*//;
+	$subsystem =~ s/\s*$//;
+
+	# The subdir without the inputdir prefix, nor any slashes.
+	my $subdir = substr $File::Find::dir, (length $inputdir);
+	$subdir =~ s/^\///;
+	if ($subdir ne "") {
+	    $name = "$subdir/$name";
+	}
+
+	my $script = {
+	    name => $name,
+	    title => $title,
+	    keywords => $keywords,
+	    subsystem => $subsystem,
+	    status => $status,
+	    exit => $exit,
+	    output => $output,
+	    description => $description
+	};
+
+	# chop off the search dir prefix.
+	$inputdir =~ s/\/$//;
+	$meta = substr $filename, (length $inputdir) + 1;
+	$scripts{$meta} = $script;
+
+	# Put .stp script in output dir if necessary and create
+	# subdirs if they don't exist yet.
+	if ($inputdir ne $outputdir) {
+	    # The subdir without the inputdir prefix, nor any slashes.
+	    my $destdir = substr $File::Find::dir, (length $inputdir);
+	    $destdir =~ s/^\///;
+	    if ($subdir ne "") {
+		if (! -d "$outputdir/$subdir") {
+		    mkpath("$outputdir/$subdir", 1, 0711);
+		}
+	    }
+	    my $orig = substr $name, (length $subdir);
+	    $orig =~ s/^\///;
+	    my $dest = "$outputdir/$name";
+	    print "Copying $orig to $dest...\n";
+	    copy($orig, $dest) or die "$orig cannot be copied to $dest, $!";
+	}
+    }
+}
diff --git a/testsuite/systemtap.examples/html_footer.tmpl b/testsuite/systemtap.examples/html_footer.tmpl
new file mode 100644
index 00000000..27eccd3c
--- /dev/null
+++ b/testsuite/systemtap.examples/html_footer.tmpl
@@ -0,0 +1,14 @@
+       	</td>
+       </tr>
+     </table>
+    </div>
+  </div>
+
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td align="center" class="footer"><a href=
+	  "http://sourceware.org/systemtap">SystemTap</a></td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/testsuite/systemtap.examples/html_header.tmpl b/testsuite/systemtap.examples/html_header.tmpl
new file mode 100644
index 00000000..33ce558f
--- /dev/null
+++ b/testsuite/systemtap.examples/html_header.tmpl
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+  <title>SystemTap Examples</title>
+  <link rel="stylesheet" href="systemtap.css" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+</head>
+
+<body>
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td valign="bottom" height="80"><img src="systemtaplogo.png"
+      alt="SystemTap logo" width="165" height="25"></td>
+      <td valign="bottom" class="topnavright" align="right">
+      <a href="http://sourceware.org/systemtap/">SystemTap</a>&nbsp;|&nbsp;
+      </td>
+    </tr>
+  </table>
+
+  <div class="mainbackground">
+    <div class="maintextregion">
+      <img src="systemtapcorner.gif">
+      <table cellspacing="2" cellpadding="4" border="0" width="99%"
+             style="margin-top:17;">
+      <tr>
+      	<td width="200">&nbsp;</td>
+      	<td valign="bottom"><h1>Examples</h1></td>
+      </tr>
+      <tr>
+    		<td>&nbsp;</td>
+    		<td valign="top">
+
+	      	<h2>Example Indexes</h2>
+		   	<ul>
+           		<li><a href="index.html">All Examples</a></li>
+           		<li><a href="subsystem-index.html">By Subsystem</a></li>
+           		<li><a href="keyword-index.html">By Keyword</a></li>
+         	</ul>
+
diff --git a/testsuite/systemtap.examples/systemtap.css b/testsuite/systemtap.examples/systemtap.css
new file mode 100644
index 00000000..445d95f4
--- /dev/null
+++ b/testsuite/systemtap.examples/systemtap.css
@@ -0,0 +1,164 @@
+body {
+	background-color: #cccccc;
+}
+
+.topnavright {
+	color: #787878;
+	text-align: right;
+	font-family: verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	margin-right: 10px;
+}
+
+.topnavright a:link {
+	text-decoration: none;
+	color: #944E0F;
+}
+
+.topnavright a:visited {
+	text-decoration: none;
+	color: #944E0F;
+}
+
+div.mainbackground {
+	background-color: #ffffff;
+	padding: 17 17 17 17;
+}
+
+div.maintextregion {
+	background-color: #5b5b5b;
+	color: #ffffff;
+}
+
+div.maintextregion h1 {
+	color: #F38019;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 28px
+}
+
+div.maintextregion h2 {
+	color: #F38019;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	margin-bottom: 2px;
+	font-size: 18px;
+	margin-top: 28px;
+}
+
+div.maintextregion h4 {
+	color: #ffffff;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+}
+
+div.maintextregion p {
+	color: #ffffff;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 150%;
+	text-align: justify;
+}
+
+div.maintextregion ul {
+	color: #ffffff;
+	list-style-type: square;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 150%;
+	text-align: justify;
+}
+
+div.maintextregion td ul ul {
+	color: #ffffff;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+div.maintextregion dt {
+	color: #ffffff;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	margin-top: 10px;
+}
+
+div.maintextregion pre {
+	color: #ffffff;
+	font-size: 14px;
+}
+
+div.maintextregion td pre {
+	color: #ffffff;
+	font-size: 14px;
+}
+
+div.maintextregion dd {
+	color: #ffffff;
+    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 150%;
+	text-align: justify;
+	margin-left: 10px;
+}
+
+div.maintextregion table {
+	margin-top: 20;
+}
+
+div.maintextregion th {
+	color: #ffffff;
+	background-color: #494949;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	text-align: left;
+}
+
+div.maintextregion tr.odd {
+	color: #ffffff;
+	background-color: #393939;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+div.maintextregion tr.even {
+	color: #ffffff;
+	background-color: #4d4d4d;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+div.maintextregion form {
+	color: #ffffff;
+	background-color: #4d4d4d;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	border: thin solid #424242;
+	padding: 6;
+}
+
+div.maintextregion dd.left {
+	color: #ffffff;
+	margin-left: 0;
+}
+
+a:link  {
+	color: #ff9600;
+	text-decoration: none;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+a:visited {
+	color: #ff9600;
+	text-decoration: none;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+.imgholder {
+	text-align: center;
+	padding: 8;
+}
+.footer a:link {
+	text-decoration: none;
+	color: #944E0F;
+	font-size: 12px;
+	font-weight: bold;
+}
+.footer a:visited {
+	text-decoration: none;
+	color: #944E0F;
+	font-size: 12px;
+	font-weight: bold;
+}
+
diff --git a/testsuite/systemtap.examples/systemtapcorner.gif b/testsuite/systemtap.examples/systemtapcorner.gif
new file mode 100644
index 00000000..c44f2c75
Binary files /dev/null and b/testsuite/systemtap.examples/systemtapcorner.gif differ
diff --git a/testsuite/systemtap.examples/systemtaplogo.png b/testsuite/systemtap.examples/systemtaplogo.png
new file mode 100644
index 00000000..c223babd
Binary files /dev/null and b/testsuite/systemtap.examples/systemtaplogo.png differ
-- 
cgit 


From 384c5fe974abe35ab11dce4446dc5eed86585a3b Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Thu, 7 Aug 2008 16:47:18 -0400
Subject: samples: separate into subdirectories by subsystem

---
 testsuite/systemtap.examples/ChangeLog             |   5 +
 testsuite/systemtap.examples/disktop.meta          |  13 -
 testsuite/systemtap.examples/disktop.stp           |  69 -----
 .../systemtap.examples/functioncallcount.meta      |  13 -
 testsuite/systemtap.examples/functioncallcount.stp |  17 --
 testsuite/systemtap.examples/futexes.meta          |  13 -
 testsuite/systemtap.examples/futexes.stp           |  36 ---
 testsuite/systemtap.examples/futexes.txt           |  18 --
 .../systemtap.examples/general/ansi_colors.stp     |  21 ++
 testsuite/systemtap.examples/general/click.wav     | Bin 0 -> 1290 bytes
 testsuite/systemtap.examples/general/graphs.meta   |  13 +
 testsuite/systemtap.examples/general/graphs.stp    |  60 ++++
 .../systemtap.examples/general/helloworld.meta     |  13 +
 .../systemtap.examples/general/helloworld.stp      |   2 +
 testsuite/systemtap.examples/general/key.stp       |  22 ++
 testsuite/systemtap.examples/general/keyhack.stp   |  15 +
 .../systemtap.examples/general/para-callgraph.meta |  13 +
 .../systemtap.examples/general/para-callgraph.stp  |  20 ++
 testsuite/systemtap.examples/general/return.wav    | Bin 0 -> 6584 bytes
 testsuite/systemtap.examples/graphs.meta           |  13 -
 testsuite/systemtap.examples/graphs.stp            |  60 ----
 testsuite/systemtap.examples/helloworld.meta       |  13 -
 testsuite/systemtap.examples/helloworld.stp        |   2 -
 testsuite/systemtap.examples/html/html_footer.tmpl |  14 +
 testsuite/systemtap.examples/html/html_header.tmpl |  41 +++
 testsuite/systemtap.examples/html/systemtap.css    | 164 +++++++++++
 .../systemtap.examples/html/systemtapcorner.gif    | Bin 0 -> 970 bytes
 .../systemtap.examples/html/systemtaplogo.png      | Bin 0 -> 1860 bytes
 testsuite/systemtap.examples/html_footer.tmpl      |  14 -
 testsuite/systemtap.examples/html_header.tmpl      |  41 ---
 testsuite/systemtap.examples/io/disktop.meta       |  13 +
 testsuite/systemtap.examples/io/disktop.stp        |  69 +++++
 testsuite/systemtap.examples/io/io_submit.meta     |  13 +
 testsuite/systemtap.examples/io/io_submit.stp      |  71 +++++
 testsuite/systemtap.examples/io/iostat-scsi.stp    |  81 ++++++
 testsuite/systemtap.examples/io/iostat-scsi.txt    |  14 +
 testsuite/systemtap.examples/io/iotime.meta        |  13 +
 testsuite/systemtap.examples/io/iotime.stp         | 113 ++++++++
 testsuite/systemtap.examples/io/iotop.meta         |  13 +
 testsuite/systemtap.examples/io/iotop.stp          |  25 ++
 testsuite/systemtap.examples/io/traceio.meta       |  13 +
 testsuite/systemtap.examples/io/traceio.stp        |  32 +++
 testsuite/systemtap.examples/io/traceio2.meta      |  13 +
 testsuite/systemtap.examples/io/traceio2.stp       |  20 ++
 testsuite/systemtap.examples/io_submit.meta        |  13 -
 testsuite/systemtap.examples/io_submit.stp         |  71 -----
 testsuite/systemtap.examples/iostat-scsi.stp       |  81 ------
 testsuite/systemtap.examples/iostat-scsi.txt       |  14 -
 testsuite/systemtap.examples/iotime.meta           |  13 -
 testsuite/systemtap.examples/iotime.stp            | 113 --------
 testsuite/systemtap.examples/iotop.meta            |  13 -
 testsuite/systemtap.examples/iotop.stp             |  25 --
 testsuite/systemtap.examples/nettop.meta           |  13 -
 testsuite/systemtap.examples/nettop.stp            |  42 ---
 testsuite/systemtap.examples/nettop.txt            |  20 --
 testsuite/systemtap.examples/network/nettop.meta   |  13 +
 testsuite/systemtap.examples/network/nettop.stp    |  42 +++
 testsuite/systemtap.examples/network/nettop.txt    |  20 ++
 .../systemtap.examples/network/socket-trace.meta   |  13 +
 .../systemtap.examples/network/socket-trace.stp    |   8 +
 testsuite/systemtap.examples/network/socktop       | 318 +++++++++++++++++++++
 testsuite/systemtap.examples/network/socktop.txt   |  66 +++++
 testsuite/systemtap.examples/para-callgraph.meta   |  13 -
 testsuite/systemtap.examples/para-callgraph.stp    |  20 --
 testsuite/systemtap.examples/pf2.meta              |  13 -
 testsuite/systemtap.examples/pf2.stp               |  16 --
 testsuite/systemtap.examples/pf2.txt               |  21 --
 testsuite/systemtap.examples/process/futexes.meta  |  13 +
 testsuite/systemtap.examples/process/futexes.stp   |  36 +++
 testsuite/systemtap.examples/process/futexes.txt   |  18 ++
 testsuite/systemtap.examples/process/pf2.meta      |  13 +
 testsuite/systemtap.examples/process/pf2.stp       |  16 ++
 testsuite/systemtap.examples/process/pf2.txt       |  21 ++
 .../systemtap.examples/process/proc_snoop.stp      |  55 ++++
 .../systemtap.examples/process/sig_by_pid.meta     |  13 +
 .../systemtap.examples/process/sig_by_pid.stp      |  42 +++
 .../systemtap.examples/process/sig_by_pid.txt      |  24 ++
 .../systemtap.examples/process/sig_by_proc.meta    |  13 +
 .../systemtap.examples/process/sig_by_proc.stp     |  36 +++
 .../systemtap.examples/process/sig_by_proc.txt     |  20 ++
 testsuite/systemtap.examples/process/sigkill.meta  |  14 +
 testsuite/systemtap.examples/process/sigkill.stp   |  23 ++
 testsuite/systemtap.examples/process/sigmon.meta   |  14 +
 testsuite/systemtap.examples/process/sigmon.stp    |  35 +++
 .../process/sleepingBeauties.meta                  |  13 +
 .../process/sleepingBeauties.stp                   |  58 ++++
 .../systemtap.examples/process/sleeptime.meta      |  13 +
 testsuite/systemtap.examples/process/sleeptime.stp |  62 ++++
 .../process/syscalls_by_pid.meta                   |  13 +
 .../systemtap.examples/process/syscalls_by_pid.stp |  28 ++
 .../systemtap.examples/process/syscalls_by_pid.txt |  35 +++
 .../process/syscalls_by_proc.meta                  |  13 +
 .../process/syscalls_by_proc.stp                   |  28 ++
 .../process/syscalls_by_proc.txt                   |  58 ++++
 testsuite/systemtap.examples/process/syscalltimes  | 248 ++++++++++++++++
 .../systemtap.examples/process/syscalltimes.txt    | 155 ++++++++++
 .../systemtap.examples/process/wait4time.meta      |  13 +
 testsuite/systemtap.examples/process/wait4time.stp |  59 ++++
 .../profiling/functioncallcount.meta               |  13 +
 .../profiling/functioncallcount.stp                |  17 ++
 .../systemtap.examples/profiling/thread-times.meta |  13 +
 .../systemtap.examples/profiling/thread-times.stp  |  32 +++
 testsuite/systemtap.examples/sig_by_pid.meta       |  13 -
 testsuite/systemtap.examples/sig_by_pid.stp        |  42 ---
 testsuite/systemtap.examples/sig_by_pid.txt        |  24 --
 testsuite/systemtap.examples/sig_by_proc.meta      |  13 -
 testsuite/systemtap.examples/sig_by_proc.stp       |  36 ---
 testsuite/systemtap.examples/sig_by_proc.txt       |  20 --
 testsuite/systemtap.examples/sigkill.meta          |  14 -
 testsuite/systemtap.examples/sigkill.stp           |  23 --
 testsuite/systemtap.examples/sigmon.meta           |  14 -
 testsuite/systemtap.examples/sigmon.stp            |  35 ---
 testsuite/systemtap.examples/sleepingBeauties.meta |  13 -
 testsuite/systemtap.examples/sleepingBeauties.stp  |  58 ----
 testsuite/systemtap.examples/sleeptime.meta        |  13 -
 testsuite/systemtap.examples/sleeptime.stp         |  62 ----
 .../systemtap.examples/small_demos/ansi_colors.stp |  21 --
 testsuite/systemtap.examples/small_demos/click.wav | Bin 1290 -> 0 bytes
 testsuite/systemtap.examples/small_demos/close.stp |  14 -
 .../systemtap.examples/small_demos/demo_script.txt | 102 -------
 .../systemtap.examples/small_demos/fileopen.stp    |  24 --
 testsuite/systemtap.examples/small_demos/key.stp   |  22 --
 .../systemtap.examples/small_demos/keyhack.stp     |  15 -
 .../systemtap.examples/small_demos/kmalloc.stp     |  22 --
 .../systemtap.examples/small_demos/kmalloc2.stp    |  26 --
 .../systemtap.examples/small_demos/proc_snoop.stp  |  55 ----
 testsuite/systemtap.examples/small_demos/prof.stp  |  35 ---
 .../systemtap.examples/small_demos/return.wav      | Bin 6584 -> 0 bytes
 .../systemtap.examples/small_demos/rwtiming.stp    |  74 -----
 .../systemtap.examples/small_demos/sched_snoop.stp |  35 ---
 testsuite/systemtap.examples/small_demos/sys.stp   |  17 --
 testsuite/systemtap.examples/small_demos/top.stp   |  24 --
 testsuite/systemtap.examples/socket-trace.meta     |  13 -
 testsuite/systemtap.examples/socket-trace.stp      |   8 -
 testsuite/systemtap.examples/socktop               | 318 ---------------------
 testsuite/systemtap.examples/socktop.txt           |  66 -----
 testsuite/systemtap.examples/syscalls_by_pid.meta  |  13 -
 testsuite/systemtap.examples/syscalls_by_pid.stp   |  28 --
 testsuite/systemtap.examples/syscalls_by_pid.txt   |  35 ---
 testsuite/systemtap.examples/syscalls_by_proc.meta |  13 -
 testsuite/systemtap.examples/syscalls_by_proc.stp  |  28 --
 testsuite/systemtap.examples/syscalls_by_proc.txt  |  58 ----
 testsuite/systemtap.examples/syscalltimes          | 248 ----------------
 testsuite/systemtap.examples/syscalltimes.txt      | 155 ----------
 testsuite/systemtap.examples/systemtap.css         | 164 -----------
 testsuite/systemtap.examples/systemtapcorner.gif   | Bin 970 -> 0 bytes
 testsuite/systemtap.examples/systemtaplogo.png     | Bin 1860 -> 0 bytes
 testsuite/systemtap.examples/thread-times.meta     |  13 -
 testsuite/systemtap.examples/thread-times.stp      |  32 ---
 testsuite/systemtap.examples/traceio.meta          |  13 -
 testsuite/systemtap.examples/traceio.stp           |  32 ---
 testsuite/systemtap.examples/traceio2.meta         |  13 -
 testsuite/systemtap.examples/traceio2.stp          |  20 --
 testsuite/systemtap.examples/wait4time.meta        |  13 -
 testsuite/systemtap.examples/wait4time.stp         |  59 ----
 155 files changed, 2663 insertions(+), 3031 deletions(-)
 delete mode 100644 testsuite/systemtap.examples/disktop.meta
 delete mode 100644 testsuite/systemtap.examples/disktop.stp
 delete mode 100644 testsuite/systemtap.examples/functioncallcount.meta
 delete mode 100644 testsuite/systemtap.examples/functioncallcount.stp
 delete mode 100644 testsuite/systemtap.examples/futexes.meta
 delete mode 100755 testsuite/systemtap.examples/futexes.stp
 delete mode 100644 testsuite/systemtap.examples/futexes.txt
 create mode 100755 testsuite/systemtap.examples/general/ansi_colors.stp
 create mode 100644 testsuite/systemtap.examples/general/click.wav
 create mode 100644 testsuite/systemtap.examples/general/graphs.meta
 create mode 100644 testsuite/systemtap.examples/general/graphs.stp
 create mode 100644 testsuite/systemtap.examples/general/helloworld.meta
 create mode 100755 testsuite/systemtap.examples/general/helloworld.stp
 create mode 100755 testsuite/systemtap.examples/general/key.stp
 create mode 100755 testsuite/systemtap.examples/general/keyhack.stp
 create mode 100644 testsuite/systemtap.examples/general/para-callgraph.meta
 create mode 100644 testsuite/systemtap.examples/general/para-callgraph.stp
 create mode 100644 testsuite/systemtap.examples/general/return.wav
 delete mode 100644 testsuite/systemtap.examples/graphs.meta
 delete mode 100644 testsuite/systemtap.examples/graphs.stp
 delete mode 100644 testsuite/systemtap.examples/helloworld.meta
 delete mode 100755 testsuite/systemtap.examples/helloworld.stp
 create mode 100644 testsuite/systemtap.examples/html/html_footer.tmpl
 create mode 100644 testsuite/systemtap.examples/html/html_header.tmpl
 create mode 100644 testsuite/systemtap.examples/html/systemtap.css
 create mode 100644 testsuite/systemtap.examples/html/systemtapcorner.gif
 create mode 100644 testsuite/systemtap.examples/html/systemtaplogo.png
 delete mode 100644 testsuite/systemtap.examples/html_footer.tmpl
 delete mode 100644 testsuite/systemtap.examples/html_header.tmpl
 create mode 100644 testsuite/systemtap.examples/io/disktop.meta
 create mode 100644 testsuite/systemtap.examples/io/disktop.stp
 create mode 100644 testsuite/systemtap.examples/io/io_submit.meta
 create mode 100644 testsuite/systemtap.examples/io/io_submit.stp
 create mode 100755 testsuite/systemtap.examples/io/iostat-scsi.stp
 create mode 100644 testsuite/systemtap.examples/io/iostat-scsi.txt
 create mode 100644 testsuite/systemtap.examples/io/iotime.meta
 create mode 100755 testsuite/systemtap.examples/io/iotime.stp
 create mode 100644 testsuite/systemtap.examples/io/iotop.meta
 create mode 100644 testsuite/systemtap.examples/io/iotop.stp
 create mode 100644 testsuite/systemtap.examples/io/traceio.meta
 create mode 100644 testsuite/systemtap.examples/io/traceio.stp
 create mode 100644 testsuite/systemtap.examples/io/traceio2.meta
 create mode 100644 testsuite/systemtap.examples/io/traceio2.stp
 delete mode 100644 testsuite/systemtap.examples/io_submit.meta
 delete mode 100644 testsuite/systemtap.examples/io_submit.stp
 delete mode 100755 testsuite/systemtap.examples/iostat-scsi.stp
 delete mode 100644 testsuite/systemtap.examples/iostat-scsi.txt
 delete mode 100644 testsuite/systemtap.examples/iotime.meta
 delete mode 100755 testsuite/systemtap.examples/iotime.stp
 delete mode 100644 testsuite/systemtap.examples/iotop.meta
 delete mode 100644 testsuite/systemtap.examples/iotop.stp
 delete mode 100644 testsuite/systemtap.examples/nettop.meta
 delete mode 100755 testsuite/systemtap.examples/nettop.stp
 delete mode 100644 testsuite/systemtap.examples/nettop.txt
 create mode 100644 testsuite/systemtap.examples/network/nettop.meta
 create mode 100755 testsuite/systemtap.examples/network/nettop.stp
 create mode 100644 testsuite/systemtap.examples/network/nettop.txt
 create mode 100644 testsuite/systemtap.examples/network/socket-trace.meta
 create mode 100755 testsuite/systemtap.examples/network/socket-trace.stp
 create mode 100755 testsuite/systemtap.examples/network/socktop
 create mode 100644 testsuite/systemtap.examples/network/socktop.txt
 delete mode 100644 testsuite/systemtap.examples/para-callgraph.meta
 delete mode 100644 testsuite/systemtap.examples/para-callgraph.stp
 delete mode 100644 testsuite/systemtap.examples/pf2.meta
 delete mode 100755 testsuite/systemtap.examples/pf2.stp
 delete mode 100644 testsuite/systemtap.examples/pf2.txt
 create mode 100644 testsuite/systemtap.examples/process/futexes.meta
 create mode 100755 testsuite/systemtap.examples/process/futexes.stp
 create mode 100644 testsuite/systemtap.examples/process/futexes.txt
 create mode 100644 testsuite/systemtap.examples/process/pf2.meta
 create mode 100755 testsuite/systemtap.examples/process/pf2.stp
 create mode 100644 testsuite/systemtap.examples/process/pf2.txt
 create mode 100755 testsuite/systemtap.examples/process/proc_snoop.stp
 create mode 100644 testsuite/systemtap.examples/process/sig_by_pid.meta
 create mode 100755 testsuite/systemtap.examples/process/sig_by_pid.stp
 create mode 100644 testsuite/systemtap.examples/process/sig_by_pid.txt
 create mode 100644 testsuite/systemtap.examples/process/sig_by_proc.meta
 create mode 100755 testsuite/systemtap.examples/process/sig_by_proc.stp
 create mode 100644 testsuite/systemtap.examples/process/sig_by_proc.txt
 create mode 100644 testsuite/systemtap.examples/process/sigkill.meta
 create mode 100644 testsuite/systemtap.examples/process/sigkill.stp
 create mode 100644 testsuite/systemtap.examples/process/sigmon.meta
 create mode 100755 testsuite/systemtap.examples/process/sigmon.stp
 create mode 100644 testsuite/systemtap.examples/process/sleepingBeauties.meta
 create mode 100644 testsuite/systemtap.examples/process/sleepingBeauties.stp
 create mode 100644 testsuite/systemtap.examples/process/sleeptime.meta
 create mode 100755 testsuite/systemtap.examples/process/sleeptime.stp
 create mode 100644 testsuite/systemtap.examples/process/syscalls_by_pid.meta
 create mode 100755 testsuite/systemtap.examples/process/syscalls_by_pid.stp
 create mode 100644 testsuite/systemtap.examples/process/syscalls_by_pid.txt
 create mode 100644 testsuite/systemtap.examples/process/syscalls_by_proc.meta
 create mode 100755 testsuite/systemtap.examples/process/syscalls_by_proc.stp
 create mode 100644 testsuite/systemtap.examples/process/syscalls_by_proc.txt
 create mode 100755 testsuite/systemtap.examples/process/syscalltimes
 create mode 100644 testsuite/systemtap.examples/process/syscalltimes.txt
 create mode 100644 testsuite/systemtap.examples/process/wait4time.meta
 create mode 100755 testsuite/systemtap.examples/process/wait4time.stp
 create mode 100644 testsuite/systemtap.examples/profiling/functioncallcount.meta
 create mode 100644 testsuite/systemtap.examples/profiling/functioncallcount.stp
 create mode 100644 testsuite/systemtap.examples/profiling/thread-times.meta
 create mode 100644 testsuite/systemtap.examples/profiling/thread-times.stp
 delete mode 100644 testsuite/systemtap.examples/sig_by_pid.meta
 delete mode 100755 testsuite/systemtap.examples/sig_by_pid.stp
 delete mode 100644 testsuite/systemtap.examples/sig_by_pid.txt
 delete mode 100644 testsuite/systemtap.examples/sig_by_proc.meta
 delete mode 100755 testsuite/systemtap.examples/sig_by_proc.stp
 delete mode 100644 testsuite/systemtap.examples/sig_by_proc.txt
 delete mode 100644 testsuite/systemtap.examples/sigkill.meta
 delete mode 100644 testsuite/systemtap.examples/sigkill.stp
 delete mode 100644 testsuite/systemtap.examples/sigmon.meta
 delete mode 100755 testsuite/systemtap.examples/sigmon.stp
 delete mode 100644 testsuite/systemtap.examples/sleepingBeauties.meta
 delete mode 100644 testsuite/systemtap.examples/sleepingBeauties.stp
 delete mode 100644 testsuite/systemtap.examples/sleeptime.meta
 delete mode 100755 testsuite/systemtap.examples/sleeptime.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/ansi_colors.stp
 delete mode 100644 testsuite/systemtap.examples/small_demos/click.wav
 delete mode 100755 testsuite/systemtap.examples/small_demos/close.stp
 delete mode 100644 testsuite/systemtap.examples/small_demos/demo_script.txt
 delete mode 100755 testsuite/systemtap.examples/small_demos/fileopen.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/key.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/keyhack.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/kmalloc.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/kmalloc2.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/proc_snoop.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/prof.stp
 delete mode 100644 testsuite/systemtap.examples/small_demos/return.wav
 delete mode 100755 testsuite/systemtap.examples/small_demos/rwtiming.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/sched_snoop.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/sys.stp
 delete mode 100755 testsuite/systemtap.examples/small_demos/top.stp
 delete mode 100644 testsuite/systemtap.examples/socket-trace.meta
 delete mode 100755 testsuite/systemtap.examples/socket-trace.stp
 delete mode 100755 testsuite/systemtap.examples/socktop
 delete mode 100644 testsuite/systemtap.examples/socktop.txt
 delete mode 100644 testsuite/systemtap.examples/syscalls_by_pid.meta
 delete mode 100755 testsuite/systemtap.examples/syscalls_by_pid.stp
 delete mode 100644 testsuite/systemtap.examples/syscalls_by_pid.txt
 delete mode 100644 testsuite/systemtap.examples/syscalls_by_proc.meta
 delete mode 100755 testsuite/systemtap.examples/syscalls_by_proc.stp
 delete mode 100644 testsuite/systemtap.examples/syscalls_by_proc.txt
 delete mode 100755 testsuite/systemtap.examples/syscalltimes
 delete mode 100644 testsuite/systemtap.examples/syscalltimes.txt
 delete mode 100644 testsuite/systemtap.examples/systemtap.css
 delete mode 100644 testsuite/systemtap.examples/systemtapcorner.gif
 delete mode 100644 testsuite/systemtap.examples/systemtaplogo.png
 delete mode 100644 testsuite/systemtap.examples/thread-times.meta
 delete mode 100644 testsuite/systemtap.examples/thread-times.stp
 delete mode 100644 testsuite/systemtap.examples/traceio.meta
 delete mode 100644 testsuite/systemtap.examples/traceio.stp
 delete mode 100644 testsuite/systemtap.examples/traceio2.meta
 delete mode 100644 testsuite/systemtap.examples/traceio2.stp
 delete mode 100644 testsuite/systemtap.examples/wait4time.meta
 delete mode 100755 testsuite/systemtap.examples/wait4time.stp

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index fa6a3aa3..89503a64 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
+
+	* small_demos: Unique parts kept, others dropped.
+	* all other samples: Moved into new subdirectories.
+
 2008-08-07  Mark Wielaard  <mwielaard@redhat.com>
 
 	* examples-index-gen.pl: New file.
diff --git a/testsuite/systemtap.examples/disktop.meta b/testsuite/systemtap.examples/disktop.meta
deleted file mode 100644
index b063075b..00000000
--- a/testsuite/systemtap.examples/disktop.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Summarize Disk Read/Write Traffic
-name: disktop.stp
-version: 1.0
-author: Oracle
-keywords: disk
-subsystem: disk
-status: production
-exit: user-controlled
-output: timed
-scope: system-wide
-description: Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.
-test_check: stap -p4 disktop.stp
-test_installcheck: stap disktop.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/disktop.stp b/testsuite/systemtap.examples/disktop.stp
deleted file mode 100644
index 2637d735..00000000
--- a/testsuite/systemtap.examples/disktop.stp
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env stap 
-#
-# Copyright (C) 2007 Oracle Corp.
-#
-# Get the status of reading/writing disk every 5 seconds, output top ten entries 
-#
-# This is free software,GNU General Public License (GPL); either version 2, or (at your option) any
-# later version.
-#
-# Usage:
-#  ./disktop.stp
-#
-
-global io_stat,device
-global read_bytes,write_bytes
-
-probe kernel.function("vfs_read").return {
-	if ($return>0) {
-		dev = __file_dev($file)
-		devname = __find_bdevname(dev,__file_bdev($file))
-
-		if (devname!="N/A") {/*skip read from cache*/
-			io_stat[pid(),execname(),uid(),ppid(),"R"] += $return
-			device[pid(),execname(),uid(),ppid(),"R"] = devname
-			read_bytes += $return
-		}
-	}
-}
-
-probe kernel.function("vfs_write").return {
-	if ($return>0) {
-		dev = __file_dev($file)
-		devname = __find_bdevname(dev,__file_bdev($file))
-
-		if (devname!="N/A") { /*skip update cache*/
-			io_stat[pid(),execname(),uid(),ppid(),"W"] += $return
-			device[pid(),execname(),uid(),ppid(),"W"] = devname
-			write_bytes += $return
-		}
-	}
-}
-
-probe timer.ms(5000) {
-	/* skip non-read/write disk */
-	if (read_bytes+write_bytes) {
-
-		printf("\n%-25s, %-8s%4dKb/sec, %-7s%6dKb, %-7s%6dKb\n\n",ctime(gettimeofday_s()),"Average:",
-      		((read_bytes+write_bytes)/1024)/5,"Read:",read_bytes/1024,"Write:",write_bytes/1024)
-
-		/* print header */
-		printf("%8s %8s %8s %25s %8s %4s %12s\n","UID","PID","PPID","CMD","DEVICE","T","BYTES")
-	}
-	/* print top ten I/O */
-	foreach ([process,cmd,userid,parent,action] in io_stat- limit 10)
-	  printf("%8d %8d %8d %25s %8s %4s %12d\n",userid,process,parent,cmd,device[process,cmd,userid,parent,action],action,io_stat[process,cmd,userid,parent,action])
-
-	/* clear data */
-	delete io_stat
-	delete device
-	read_bytes = 0
-	write_bytes = 0	
-}
-
-probe end{
-	delete io_stat
-	delete device
-	delete read_bytes
-	delete write_bytes	
-}
diff --git a/testsuite/systemtap.examples/functioncallcount.meta b/testsuite/systemtap.examples/functioncallcount.meta
deleted file mode 100644
index 4d419528..00000000
--- a/testsuite/systemtap.examples/functioncallcount.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Count Times Functions Called
-name: functioncallcount.stp
-version: 1.0
-author: anonymous
-keywords: profiling functions
-subsystem: kernel
-status: production
-exit: user-controlled
-output: sorted-list on-exit
-scope: system-wide
-description: The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.
-test_check: stap -p4 functioncallcount.stp "*@mm/*.c"
-test_installcheck: stap  functioncallcount.stp "*@mm/*.c" -c "sleep 1"
diff --git a/testsuite/systemtap.examples/functioncallcount.stp b/testsuite/systemtap.examples/functioncallcount.stp
deleted file mode 100644
index e393b612..00000000
--- a/testsuite/systemtap.examples/functioncallcount.stp
+++ /dev/null
@@ -1,17 +0,0 @@
-# The following line command will probe all the functions
-# in kernel's memory management code:
-#
-# stap  functioncallcount.stp "*@mm/*.c"
-
-probe kernel.function(@1) {  # probe functions listed on commandline
-  called[probefunc()] <<< 1  # add a count efficiently
-}
-
-global called
-
-probe end {
-  foreach (fn in called-)  # Sort by call count (in decreasing order)
-  #       (fn+ in called)  # Sort by function name
-    printf("%s %d\n", fn, @count(called[fn]))
-  exit()
-}
diff --git a/testsuite/systemtap.examples/futexes.meta b/testsuite/systemtap.examples/futexes.meta
deleted file mode 100644
index ff303122..00000000
--- a/testsuite/systemtap.examples/futexes.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: System-Wide Futex Contention
-name: futexes.stp
-version: 1.0
-author: anonymous
-keywords: syscall locking futex
-subsystem: locking
-status: production
-exit: user-controlled
-output: sorted-list on-exit
-scope: system-wide
-description: The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.
-test_check: stap -p4 futexes.stp
-test_installcheck: stap futexes.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/futexes.stp b/testsuite/systemtap.examples/futexes.stp
deleted file mode 100755
index 16c62937..00000000
--- a/testsuite/systemtap.examples/futexes.stp
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env stap
-
-# This script tries to identify contended user-space locks by hooking
-# into the futex system call.
-
-global thread_thislock # short
-global thread_blocktime # 
-global FUTEX_WAIT = 0 /*, FUTEX_WAKE = 1 */
-
-global lock_waits # long-lived stats on (tid,lock) blockage elapsed time
-global process_names # long-lived pid-to-execname mapping
-
-probe syscall.futex {  
-   if (op != FUTEX_WAIT) next  # we don't care about originators of WAKE events
-   t = tid ()
-   process_names[pid()] = execname()
-   thread_thislock[t] = $uaddr
-   thread_blocktime[t] = gettimeofday_us()
-}
-
-probe syscall.futex.return {  
-   t = tid()
-   ts = thread_blocktime[t]
-   if (ts) {
-     elapsed = gettimeofday_us() - ts
-     lock_waits[pid(), thread_thislock[t]] <<< elapsed
-     delete thread_blocktime[t]
-     delete thread_thislock[t]
-   }
-}
-
-probe end {
-   foreach ([pid+, lock] in lock_waits) 
-     printf ("%s[%d] lock %p contended %d times, %d avg us\n",
-       process_names[pid], pid, lock, @count(lock_waits[pid,lock]), @avg(lock_waits[pid,lock]))
-}
diff --git a/testsuite/systemtap.examples/futexes.txt b/testsuite/systemtap.examples/futexes.txt
deleted file mode 100644
index 51de4352..00000000
--- a/testsuite/systemtap.examples/futexes.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-From: http://sourceware.org/systemtap/wiki/WSFutexContention
-
-# stap futexes.stp
-^C
-liferea-bin[3613] lock 0x0a117340 contended 1 times, 71 avg us
-java_vm[8155] lock 0x09baa45c contended 9 times, 1004013 avg us
-java_vm[8155] lock 0x09d6f9ac contended 186 times, 55964 avg us
-xmms[16738] lock 0xbfe29eec contended 777 times, 69 avg us
-xmms[16738] lock 0xbfe29ecc contended 119 times, 64 avg us
-xmms[16738] lock 0xbfe29ebc contended 111 times, 68 avg us
-xmms[16738] lock 0xbfe29ef0 contended 742 times, 91 avg us
-xmms[16738] lock 0xbfe29ed0 contended 107 times, 101 avg us
-xmms[16738] lock 0xbfe29ec0 contended 107 times, 74 avg us
-firefox-bin[21801] lock 0x096d16f4 contended 24 times, 12 avg us
-firefox-bin[21801] lock 0x096d1198 contended 2 times, 4 avg us
-firefox-bin[21801] lock 0x096d16f8 contended 150 times, 64997 avg us
-named[23869] lock 0x41ab0b84 contended 1 times, 131 avg us
-named[23869] lock 0x41ab0b50 contended 1 times, 26 avg us
diff --git a/testsuite/systemtap.examples/general/ansi_colors.stp b/testsuite/systemtap.examples/general/ansi_colors.stp
new file mode 100755
index 00000000..0d9d7c47
--- /dev/null
+++ b/testsuite/systemtap.examples/general/ansi_colors.stp
@@ -0,0 +1,21 @@
+#! /usr/bin/env stap
+
+probe begin {
+        printf("a \\ b |");
+	for (c = 40; c < 48; c++)
+		printf("   %d   ", c);
+	printf("\12");
+	for (l = 0; l < 71; l++)
+		printf("-");
+	printf("\12");
+
+	for (r = 30; r < 38; r++)
+		for (t = 0; t < 2; t++) {
+			printf("%d    |", r);
+			for (c = 40; c < 48; c++)
+				printf("\033[%d;%d%s %s \033[0;0m",
+					r, c, !t ? "m" : ";1m", !t ? "Normal" : "Bold  ");
+			printf("\12");
+		}
+	exit();
+}
diff --git a/testsuite/systemtap.examples/general/click.wav b/testsuite/systemtap.examples/general/click.wav
new file mode 100644
index 00000000..8214b229
Binary files /dev/null and b/testsuite/systemtap.examples/general/click.wav differ
diff --git a/testsuite/systemtap.examples/general/graphs.meta b/testsuite/systemtap.examples/general/graphs.meta
new file mode 100644
index 00000000..60a522b3
--- /dev/null
+++ b/testsuite/systemtap.examples/general/graphs.meta
@@ -0,0 +1,13 @@
+title: Graphing Disk and CPU Utilization
+name: graphs.stp
+version: 1.0
+author: anonymous
+keywords: disk cpu use graph
+subsystem: disk cpu
+status: production
+exit: user-controlled
+output: plot data
+scope: system-wide
+description: The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.
+test_check: stap -p4 graphs.stp
+test_installcheck: stap graphs.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/general/graphs.stp b/testsuite/systemtap.examples/general/graphs.stp
new file mode 100644
index 00000000..0c8e3796
--- /dev/null
+++ b/testsuite/systemtap.examples/general/graphs.stp
@@ -0,0 +1,60 @@
+#! stap
+
+# ------------------------------------------------------------------------
+# data collection
+
+# disk I/O stats
+probe begin { qnames["ioblock"] ++; qsq_start ("ioblock") }
+probe ioblock.request { qs_wait ("ioblock") qs_run("ioblock") }
+probe ioblock.end { qs_done ("ioblock") }
+
+# CPU utilization
+probe begin { qnames["cpu"] ++; qsq_start ("cpu") }
+probe scheduler.cpu_on { if (!idle) {qs_wait ("cpu") qs_run ("cpu") }}
+probe scheduler.cpu_off { if (!idle) qs_done ("cpu") }
+
+
+# ------------------------------------------------------------------------
+# utilization history tracking
+
+global N
+probe begin { N = 50 }
+
+global qnames, util, histidx
+
+function qsq_util_reset(q) {
+  u=qsq_utilization (q, 100)
+  qsq_start (q)
+  return u
+}
+
+probe timer.ms(100) {  # collect utilization percentages frequently
+  histidx = (histidx + 1) % N  # into circular buffer
+  foreach (q in qnames)
+    util[histidx,q] = qsq_util_reset(q)
+}
+
+
+# ------------------------------------------------------------------------
+# general gnuplot graphical report generation
+
+probe timer.ms(1000) {
+  # emit gnuplot command to display recent history
+
+  printf ("set yrange [0:100]\n")
+  printf ("plot ")
+  foreach (q in qnames+)
+    {
+      if (++nq >= 2) printf (", ")
+      printf ("'-' title \"%s\" with lines", q)
+    }
+  printf ("\n")
+
+  foreach (q in qnames+) {
+    for (i = (histidx + 1) % N; i != histidx; i = (i + 1) % N)
+      printf("%d\n", util[i,q])
+    printf ("e\n")
+  }
+
+  printf ("pause 1\n")
+}
diff --git a/testsuite/systemtap.examples/general/helloworld.meta b/testsuite/systemtap.examples/general/helloworld.meta
new file mode 100644
index 00000000..60bc53f2
--- /dev/null
+++ b/testsuite/systemtap.examples/general/helloworld.meta
@@ -0,0 +1,13 @@
+title: SystemTap "Hello World" Program
+name: helloworld.stp
+version: 1.0
+keywords: simple
+author: anonymous
+subsystem: none
+status: production
+exit: fixed
+output: text
+scope: system-wide
+description: A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.
+test_check: stap -p4 helloworld.stp
+test_installcheck: stap helloworld.stp
diff --git a/testsuite/systemtap.examples/general/helloworld.stp b/testsuite/systemtap.examples/general/helloworld.stp
new file mode 100755
index 00000000..efe45b79
--- /dev/null
+++ b/testsuite/systemtap.examples/general/helloworld.stp
@@ -0,0 +1,2 @@
+#! /usr/bin/env stap
+probe begin { println("hello world") exit () }
diff --git a/testsuite/systemtap.examples/general/key.stp b/testsuite/systemtap.examples/general/key.stp
new file mode 100755
index 00000000..6d2d6c3f
--- /dev/null
+++ b/testsuite/systemtap.examples/general/key.stp
@@ -0,0 +1,22 @@
+#! /usr/bin/env stap
+
+# Useless, but amusing. Based on an idea I saw on a
+# dtrace site. (wav files are from emacs).
+
+// KEY_ENTER = 28
+probe kernel.function("kbd_event") {
+	if ($event_type == 1 && $value) {
+		if ($event_code == 28)
+			system("play return.wav &> /dev/null")
+		else
+			system("play click.wav &> /dev/null")
+	}
+}
+
+probe begin {
+	printf("TYPEWRITER ON\n")
+}
+
+probe end {
+	printf("DONE\n")
+}
diff --git a/testsuite/systemtap.examples/general/keyhack.stp b/testsuite/systemtap.examples/general/keyhack.stp
new file mode 100755
index 00000000..3137baad
--- /dev/null
+++ b/testsuite/systemtap.examples/general/keyhack.stp
@@ -0,0 +1,15 @@
+#! /usr/bin/env stap
+
+# This is not useful, but it demonstrates that
+# Systemtap can modify variables in a running kernel.
+
+# Usage: ./keyhack.stp -g
+
+probe kernel.function("kbd_event") {
+	# Changes 'm' to 'b' .
+	if ($event_code == 50) $event_code = 48
+}
+
+probe end {
+	printf("\nDONE\n")
+}
diff --git a/testsuite/systemtap.examples/general/para-callgraph.meta b/testsuite/systemtap.examples/general/para-callgraph.meta
new file mode 100644
index 00000000..3ce4b648
--- /dev/null
+++ b/testsuite/systemtap.examples/general/para-callgraph.meta
@@ -0,0 +1,13 @@
+title: Tracing Calls for Sections of Code
+name: para-callgraph.stp
+version: 1.0
+author: anonymous
+keywords: trace callgraph
+subsystem: kernel
+status: production
+exit: user-controlled
+output: trace
+scope: system-wide
+description: The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.
+test_check: stap -p4 para-callgraph.stp sys_read "*@fs/*.c"
+test_installcheck: stap  para-callgraph.stp sys_read "*@fs/*.c" -c "sleep 1"
diff --git a/testsuite/systemtap.examples/general/para-callgraph.stp b/testsuite/systemtap.examples/general/para-callgraph.stp
new file mode 100644
index 00000000..1afb8837
--- /dev/null
+++ b/testsuite/systemtap.examples/general/para-callgraph.stp
@@ -0,0 +1,20 @@
+function trace(entry_p) {
+   if(tid() in trace)
+       printf("%s%s%s\n",thread_indent(entry_p),
+		       	 (entry_p>0?"->":"<-"),
+		         probefunc())
+}
+
+global trace
+probe kernel.function(@1).call {
+   if (execname() == "stapio") next # skip our own helper process
+   trace[tid()] = 1
+   trace(1)
+}
+probe kernel.function(@1).return {
+   trace(-1)
+   delete trace[tid()]
+}
+
+probe kernel.function(@2).call { trace(1) }
+probe kernel.function(@2).return { trace(-1) }
diff --git a/testsuite/systemtap.examples/general/return.wav b/testsuite/systemtap.examples/general/return.wav
new file mode 100644
index 00000000..20f978cc
Binary files /dev/null and b/testsuite/systemtap.examples/general/return.wav differ
diff --git a/testsuite/systemtap.examples/graphs.meta b/testsuite/systemtap.examples/graphs.meta
deleted file mode 100644
index 60a522b3..00000000
--- a/testsuite/systemtap.examples/graphs.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Graphing Disk and CPU Utilization
-name: graphs.stp
-version: 1.0
-author: anonymous
-keywords: disk cpu use graph
-subsystem: disk cpu
-status: production
-exit: user-controlled
-output: plot data
-scope: system-wide
-description: The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.
-test_check: stap -p4 graphs.stp
-test_installcheck: stap graphs.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/graphs.stp b/testsuite/systemtap.examples/graphs.stp
deleted file mode 100644
index 0c8e3796..00000000
--- a/testsuite/systemtap.examples/graphs.stp
+++ /dev/null
@@ -1,60 +0,0 @@
-#! stap
-
-# ------------------------------------------------------------------------
-# data collection
-
-# disk I/O stats
-probe begin { qnames["ioblock"] ++; qsq_start ("ioblock") }
-probe ioblock.request { qs_wait ("ioblock") qs_run("ioblock") }
-probe ioblock.end { qs_done ("ioblock") }
-
-# CPU utilization
-probe begin { qnames["cpu"] ++; qsq_start ("cpu") }
-probe scheduler.cpu_on { if (!idle) {qs_wait ("cpu") qs_run ("cpu") }}
-probe scheduler.cpu_off { if (!idle) qs_done ("cpu") }
-
-
-# ------------------------------------------------------------------------
-# utilization history tracking
-
-global N
-probe begin { N = 50 }
-
-global qnames, util, histidx
-
-function qsq_util_reset(q) {
-  u=qsq_utilization (q, 100)
-  qsq_start (q)
-  return u
-}
-
-probe timer.ms(100) {  # collect utilization percentages frequently
-  histidx = (histidx + 1) % N  # into circular buffer
-  foreach (q in qnames)
-    util[histidx,q] = qsq_util_reset(q)
-}
-
-
-# ------------------------------------------------------------------------
-# general gnuplot graphical report generation
-
-probe timer.ms(1000) {
-  # emit gnuplot command to display recent history
-
-  printf ("set yrange [0:100]\n")
-  printf ("plot ")
-  foreach (q in qnames+)
-    {
-      if (++nq >= 2) printf (", ")
-      printf ("'-' title \"%s\" with lines", q)
-    }
-  printf ("\n")
-
-  foreach (q in qnames+) {
-    for (i = (histidx + 1) % N; i != histidx; i = (i + 1) % N)
-      printf("%d\n", util[i,q])
-    printf ("e\n")
-  }
-
-  printf ("pause 1\n")
-}
diff --git a/testsuite/systemtap.examples/helloworld.meta b/testsuite/systemtap.examples/helloworld.meta
deleted file mode 100644
index 60bc53f2..00000000
--- a/testsuite/systemtap.examples/helloworld.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: SystemTap "Hello World" Program
-name: helloworld.stp
-version: 1.0
-keywords: simple
-author: anonymous
-subsystem: none
-status: production
-exit: fixed
-output: text
-scope: system-wide
-description: A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.
-test_check: stap -p4 helloworld.stp
-test_installcheck: stap helloworld.stp
diff --git a/testsuite/systemtap.examples/helloworld.stp b/testsuite/systemtap.examples/helloworld.stp
deleted file mode 100755
index efe45b79..00000000
--- a/testsuite/systemtap.examples/helloworld.stp
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env stap
-probe begin { println("hello world") exit () }
diff --git a/testsuite/systemtap.examples/html/html_footer.tmpl b/testsuite/systemtap.examples/html/html_footer.tmpl
new file mode 100644
index 00000000..27eccd3c
--- /dev/null
+++ b/testsuite/systemtap.examples/html/html_footer.tmpl
@@ -0,0 +1,14 @@
+       	</td>
+       </tr>
+     </table>
+    </div>
+  </div>
+
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td align="center" class="footer"><a href=
+	  "http://sourceware.org/systemtap">SystemTap</a></td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/testsuite/systemtap.examples/html/html_header.tmpl b/testsuite/systemtap.examples/html/html_header.tmpl
new file mode 100644
index 00000000..33ce558f
--- /dev/null
+++ b/testsuite/systemtap.examples/html/html_header.tmpl
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+  <title>SystemTap Examples</title>
+  <link rel="stylesheet" href="systemtap.css" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+</head>
+
+<body>
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td valign="bottom" height="80"><img src="systemtaplogo.png"
+      alt="SystemTap logo" width="165" height="25"></td>
+      <td valign="bottom" class="topnavright" align="right">
+      <a href="http://sourceware.org/systemtap/">SystemTap</a>&nbsp;|&nbsp;
+      </td>
+    </tr>
+  </table>
+
+  <div class="mainbackground">
+    <div class="maintextregion">
+      <img src="systemtapcorner.gif">
+      <table cellspacing="2" cellpadding="4" border="0" width="99%"
+             style="margin-top:17;">
+      <tr>
+      	<td width="200">&nbsp;</td>
+      	<td valign="bottom"><h1>Examples</h1></td>
+      </tr>
+      <tr>
+    		<td>&nbsp;</td>
+    		<td valign="top">
+
+	      	<h2>Example Indexes</h2>
+		   	<ul>
+           		<li><a href="index.html">All Examples</a></li>
+           		<li><a href="subsystem-index.html">By Subsystem</a></li>
+           		<li><a href="keyword-index.html">By Keyword</a></li>
+         	</ul>
+
diff --git a/testsuite/systemtap.examples/html/systemtap.css b/testsuite/systemtap.examples/html/systemtap.css
new file mode 100644
index 00000000..445d95f4
--- /dev/null
+++ b/testsuite/systemtap.examples/html/systemtap.css
@@ -0,0 +1,164 @@
+body {
+	background-color: #cccccc;
+}
+
+.topnavright {
+	color: #787878;
+	text-align: right;
+	font-family: verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	margin-right: 10px;
+}
+
+.topnavright a:link {
+	text-decoration: none;
+	color: #944E0F;
+}
+
+.topnavright a:visited {
+	text-decoration: none;
+	color: #944E0F;
+}
+
+div.mainbackground {
+	background-color: #ffffff;
+	padding: 17 17 17 17;
+}
+
+div.maintextregion {
+	background-color: #5b5b5b;
+	color: #ffffff;
+}
+
+div.maintextregion h1 {
+	color: #F38019;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 28px
+}
+
+div.maintextregion h2 {
+	color: #F38019;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	margin-bottom: 2px;
+	font-size: 18px;
+	margin-top: 28px;
+}
+
+div.maintextregion h4 {
+	color: #ffffff;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+}
+
+div.maintextregion p {
+	color: #ffffff;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 150%;
+	text-align: justify;
+}
+
+div.maintextregion ul {
+	color: #ffffff;
+	list-style-type: square;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 150%;
+	text-align: justify;
+}
+
+div.maintextregion td ul ul {
+	color: #ffffff;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+div.maintextregion dt {
+	color: #ffffff;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	margin-top: 10px;
+}
+
+div.maintextregion pre {
+	color: #ffffff;
+	font-size: 14px;
+}
+
+div.maintextregion td pre {
+	color: #ffffff;
+	font-size: 14px;
+}
+
+div.maintextregion dd {
+	color: #ffffff;
+    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 150%;
+	text-align: justify;
+	margin-left: 10px;
+}
+
+div.maintextregion table {
+	margin-top: 20;
+}
+
+div.maintextregion th {
+	color: #ffffff;
+	background-color: #494949;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	text-align: left;
+}
+
+div.maintextregion tr.odd {
+	color: #ffffff;
+	background-color: #393939;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+div.maintextregion tr.even {
+	color: #ffffff;
+	background-color: #4d4d4d;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+div.maintextregion form {
+	color: #ffffff;
+	background-color: #4d4d4d;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+	border: thin solid #424242;
+	padding: 6;
+}
+
+div.maintextregion dd.left {
+	color: #ffffff;
+	margin-left: 0;
+}
+
+a:link  {
+	color: #ff9600;
+	text-decoration: none;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+a:visited {
+	color: #ff9600;
+	text-decoration: none;
+	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
+}
+
+.imgholder {
+	text-align: center;
+	padding: 8;
+}
+.footer a:link {
+	text-decoration: none;
+	color: #944E0F;
+	font-size: 12px;
+	font-weight: bold;
+}
+.footer a:visited {
+	text-decoration: none;
+	color: #944E0F;
+	font-size: 12px;
+	font-weight: bold;
+}
+
diff --git a/testsuite/systemtap.examples/html/systemtapcorner.gif b/testsuite/systemtap.examples/html/systemtapcorner.gif
new file mode 100644
index 00000000..c44f2c75
Binary files /dev/null and b/testsuite/systemtap.examples/html/systemtapcorner.gif differ
diff --git a/testsuite/systemtap.examples/html/systemtaplogo.png b/testsuite/systemtap.examples/html/systemtaplogo.png
new file mode 100644
index 00000000..c223babd
Binary files /dev/null and b/testsuite/systemtap.examples/html/systemtaplogo.png differ
diff --git a/testsuite/systemtap.examples/html_footer.tmpl b/testsuite/systemtap.examples/html_footer.tmpl
deleted file mode 100644
index 27eccd3c..00000000
--- a/testsuite/systemtap.examples/html_footer.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-       	</td>
-       </tr>
-     </table>
-    </div>
-  </div>
-
-  <table cellspacing="2" cellpadding="2" border="0" width="100%">
-    <tr>
-      <td align="center" class="footer"><a href=
-	  "http://sourceware.org/systemtap">SystemTap</a></td>
-    </tr>
-  </table>
-</body>
-</html>
diff --git a/testsuite/systemtap.examples/html_header.tmpl b/testsuite/systemtap.examples/html_header.tmpl
deleted file mode 100644
index 33ce558f..00000000
--- a/testsuite/systemtap.examples/html_header.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-  <title>SystemTap Examples</title>
-  <link rel="stylesheet" href="systemtap.css" type="text/css">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <meta http-equiv="Content-Style-Type" content="text/css">
-</head>
-
-<body>
-  <table cellspacing="2" cellpadding="2" border="0" width="100%">
-    <tr>
-      <td valign="bottom" height="80"><img src="systemtaplogo.png"
-      alt="SystemTap logo" width="165" height="25"></td>
-      <td valign="bottom" class="topnavright" align="right">
-      <a href="http://sourceware.org/systemtap/">SystemTap</a>&nbsp;|&nbsp;
-      </td>
-    </tr>
-  </table>
-
-  <div class="mainbackground">
-    <div class="maintextregion">
-      <img src="systemtapcorner.gif">
-      <table cellspacing="2" cellpadding="4" border="0" width="99%"
-             style="margin-top:17;">
-      <tr>
-      	<td width="200">&nbsp;</td>
-      	<td valign="bottom"><h1>Examples</h1></td>
-      </tr>
-      <tr>
-    		<td>&nbsp;</td>
-    		<td valign="top">
-
-	      	<h2>Example Indexes</h2>
-		   	<ul>
-           		<li><a href="index.html">All Examples</a></li>
-           		<li><a href="subsystem-index.html">By Subsystem</a></li>
-           		<li><a href="keyword-index.html">By Keyword</a></li>
-         	</ul>
-
diff --git a/testsuite/systemtap.examples/io/disktop.meta b/testsuite/systemtap.examples/io/disktop.meta
new file mode 100644
index 00000000..b063075b
--- /dev/null
+++ b/testsuite/systemtap.examples/io/disktop.meta
@@ -0,0 +1,13 @@
+title: Summarize Disk Read/Write Traffic
+name: disktop.stp
+version: 1.0
+author: Oracle
+keywords: disk
+subsystem: disk
+status: production
+exit: user-controlled
+output: timed
+scope: system-wide
+description: Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.
+test_check: stap -p4 disktop.stp
+test_installcheck: stap disktop.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/io/disktop.stp b/testsuite/systemtap.examples/io/disktop.stp
new file mode 100644
index 00000000..2637d735
--- /dev/null
+++ b/testsuite/systemtap.examples/io/disktop.stp
@@ -0,0 +1,69 @@
+#!/usr/bin/env stap 
+#
+# Copyright (C) 2007 Oracle Corp.
+#
+# Get the status of reading/writing disk every 5 seconds, output top ten entries 
+#
+# This is free software,GNU General Public License (GPL); either version 2, or (at your option) any
+# later version.
+#
+# Usage:
+#  ./disktop.stp
+#
+
+global io_stat,device
+global read_bytes,write_bytes
+
+probe kernel.function("vfs_read").return {
+	if ($return>0) {
+		dev = __file_dev($file)
+		devname = __find_bdevname(dev,__file_bdev($file))
+
+		if (devname!="N/A") {/*skip read from cache*/
+			io_stat[pid(),execname(),uid(),ppid(),"R"] += $return
+			device[pid(),execname(),uid(),ppid(),"R"] = devname
+			read_bytes += $return
+		}
+	}
+}
+
+probe kernel.function("vfs_write").return {
+	if ($return>0) {
+		dev = __file_dev($file)
+		devname = __find_bdevname(dev,__file_bdev($file))
+
+		if (devname!="N/A") { /*skip update cache*/
+			io_stat[pid(),execname(),uid(),ppid(),"W"] += $return
+			device[pid(),execname(),uid(),ppid(),"W"] = devname
+			write_bytes += $return
+		}
+	}
+}
+
+probe timer.ms(5000) {
+	/* skip non-read/write disk */
+	if (read_bytes+write_bytes) {
+
+		printf("\n%-25s, %-8s%4dKb/sec, %-7s%6dKb, %-7s%6dKb\n\n",ctime(gettimeofday_s()),"Average:",
+      		((read_bytes+write_bytes)/1024)/5,"Read:",read_bytes/1024,"Write:",write_bytes/1024)
+
+		/* print header */
+		printf("%8s %8s %8s %25s %8s %4s %12s\n","UID","PID","PPID","CMD","DEVICE","T","BYTES")
+	}
+	/* print top ten I/O */
+	foreach ([process,cmd,userid,parent,action] in io_stat- limit 10)
+	  printf("%8d %8d %8d %25s %8s %4s %12d\n",userid,process,parent,cmd,device[process,cmd,userid,parent,action],action,io_stat[process,cmd,userid,parent,action])
+
+	/* clear data */
+	delete io_stat
+	delete device
+	read_bytes = 0
+	write_bytes = 0	
+}
+
+probe end{
+	delete io_stat
+	delete device
+	delete read_bytes
+	delete write_bytes	
+}
diff --git a/testsuite/systemtap.examples/io/io_submit.meta b/testsuite/systemtap.examples/io/io_submit.meta
new file mode 100644
index 00000000..911cb837
--- /dev/null
+++ b/testsuite/systemtap.examples/io/io_submit.meta
@@ -0,0 +1,13 @@
+title: Tally Reschedule Reason During AIO io_submit Call
+name: io_submit.stp
+version: 1.0
+author: Oracle
+keywords: io backtrace
+subsystem: io
+status: production
+exit: user-controlled
+output: sorted on-exit
+scope: system-wide
+description: When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.
+test_check: stap -p4 io_submit.stp
+test_installcheck: stap io_submit.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/io/io_submit.stp b/testsuite/systemtap.examples/io/io_submit.stp
new file mode 100644
index 00000000..735dd6f9
--- /dev/null
+++ b/testsuite/systemtap.examples/io/io_submit.stp
@@ -0,0 +1,71 @@
+#!/bin/env stap
+#
+# Copyright (C) 2007 Oracle Corp. Chris Mason <chris.mason@oracle.com>
+#
+# This was implemented to find the most common causes of schedule during
+# the AIO io_submit call.  It does this by recording which pids are inside
+# AIO, and recording the current stack trace if one of those pids is
+# inside schedule.
+# When the probe exits, it prints out the 30 most common call stacks for
+# schedule().
+#
+# This file is free software. You can redistribute it and/or modify it under 
+# the terms of the GNU General Public License (GPL); either version 2, or (at
+# your option) any later version.
+
+global in_iosubmit
+global traces
+
+/*
+ * add a probe to sys_io_submit, on entry, record in the in_iosubmit
+ * hash table that this proc is in io_submit
+ */
+probe syscall.io_submit {
+	in_iosubmit[tid()] = 1
+}
+
+/*
+ * when we return from sys_io_submit, record that we're no longer there
+ */
+probe syscall.io_submit.return {
+	/* this assumes a given proc will do lots of io_submit calls, and
+	 * so doesn't do the more expensive "delete in_iosubmit[p]".  If
+	 * there are lots of procs doing small number of io_submit calls,
+	 * the hash may grow pretty big, so using delete may be better
+	 */
+	in_iosubmit[tid()] = 0
+}
+
+/*
+ * every time we call schedule, check to see if we started off in
+ * io_submit.  If so, record our backtrace into the traces histogram
+ */
+probe kernel.function("schedule") {
+	if (tid() in in_iosubmit) {
+		traces[backtrace()]++
+
+		/*
+		 * change this to if (1) if you want a backtrace every time
+		 * you go into schedule from io_submit.  Unfortunately, the traces
+		 * saved into the traces histogram above are truncated to just a
+		 * few lines.  so the only way to see the full trace is via the
+		 * more verbose print_backtrace() right here.
+		 */
+		if (0) {
+			printf("schedule in io_submit!\n")
+			print_backtrace()
+		}
+	}
+}
+
+/*
+ * when stap is done (via ctrl-c) go through the record of all the
+ * trace paths and print the 30 most common.
+ */
+probe end {
+	foreach (stack in traces- limit 30) {
+		printf("%d:", traces[stack])
+		print_stack(stack);
+	}
+}
+
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
+}
diff --git a/testsuite/systemtap.examples/io/iostat-scsi.txt b/testsuite/systemtap.examples/io/iostat-scsi.txt
new file mode 100644
index 00000000..8222f659
--- /dev/null
+++ b/testsuite/systemtap.examples/io/iostat-scsi.txt
@@ -0,0 +1,14 @@
+From: http://sourceware.org/systemtap/wiki/WSiostatSCSI
+
+# stap -g iostat-scsi.stp 10 # seconds between reports
+  Device:       tps blk_read/s blk_wrtn/s  blk_read  blk_wrtn
+      sda      1.30      2.40    105.60        24      1056
+
+      sda      0.30      0.00      4.00         0        40
+
+      sda     21.30      1.60    428.80        16      4288
+
+      sda     30.40   2820.80     11.60     28208       116
+
+      sda     38.10   2816.80     53.60     28168       536
+^C
diff --git a/testsuite/systemtap.examples/io/iotime.meta b/testsuite/systemtap.examples/io/iotime.meta
new file mode 100644
index 00000000..f656ff85
--- /dev/null
+++ b/testsuite/systemtap.examples/io/iotime.meta
@@ -0,0 +1,13 @@
+title: Trace Time Spent in Read and Write for Files 
+name: iotime.stp
+version: 1.0
+author: Daniel Berrange and Will Cohen
+keywords: syscall read write time io
+subsystem: syscall
+status: production
+exit: user-controlled
+output: trace
+scope: system-wide
+description: The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.
+test_check: stap -p4 iotime.stp
+test_installcheck: stap iotime.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/io/iotime.stp b/testsuite/systemtap.examples/io/iotime.stp
new file mode 100755
index 00000000..4fbd6b6e
--- /dev/null
+++ b/testsuite/systemtap.examples/io/iotime.stp
@@ -0,0 +1,113 @@
+#! /usr/bin/env stap
+
+/*
+ * Copyright (C) 2006-2007 Red Hat Inc.
+ * 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Print out the amount of time spent in the read and write systemcall
+ * when a process closes each file is closed. Note that the systemtap 
+ * script needs to be running before the open operations occur for
+ * the script to record data.
+ *
+ * This script could be used to to find out which files are slow to load
+ * on a machine. e.g.
+ *
+ * stap iotime.stp -c 'firefox'
+ *
+ * Output format is:
+ * timestamp pid (executabable) info_type path ...
+ *
+ * 200283135 2573 (cupsd) access /etc/printcap read: 0 write: 7063
+ * 200283143 2573 (cupsd) iotime /etc/printcap time: 69
+ *
+ */
+
+global start
+global entry_io
+global fd_io
+global time_io
+
+function timestamp:long() {
+  return gettimeofday_us() - start
+}
+
+function proc:string() {
+  return sprintf("%d (%s)", pid(), execname())
+}
+
+probe begin {
+ start = gettimeofday_us()
+}
+
+global filenames
+global filehandles
+global fileread
+global filewrite
+
+probe syscall.open {
+  filenames[pid()] = user_string($filename)
+} 
+
+probe syscall.open.return {
+  if ($return != -1) {
+    filehandles[pid(), $return] = filenames[pid()]
+    fileread[pid(), $return] = 0
+    filewrite[pid(), $return] = 0
+  } else {
+    printf("%d %s access %s fail\n", timestamp(), proc(), filenames[pid()])
+  }
+  delete filenames[pid()]
+}
+
+probe syscall.read {
+  if ($count > 0) {
+    fileread[pid(), $fd] += $count
+  }
+  t = gettimeofday_us(); p = pid()
+  entry_io[p] = t
+  fd_io[p] = $fd
+}
+
+probe syscall.read.return {
+  t = gettimeofday_us(); p = pid()
+  fd = fd_io[p]
+  time_io[p,fd] <<< t - entry_io[p]
+}
+
+probe syscall.write {
+  if ($count > 0) {
+    filewrite[pid(), $fd] += $count
+  }
+  t = gettimeofday_us(); p = pid()
+  entry_io[p] = t
+  fd_io[p] = $fd
+}
+
+probe syscall.write.return {
+  t = gettimeofday_us(); p = pid()
+  fd = fd_io[p]
+  time_io[p,fd] <<< t - entry_io[p]
+}
+
+probe syscall.close {
+  if (filehandles[pid(), $fd] != "") {
+    printf("%d %s access %s read: %d write: %d\n",  timestamp(), proc(),
+	filehandles[pid(), $fd], fileread[pid(), $fd], filewrite[pid(), $fd])
+    if (@count(time_io[pid(), $fd]))
+      printf("%d %s iotime %s time: %d\n",  timestamp(), proc(),
+	filehandles[pid(), $fd], @sum(time_io[pid(), $fd]))
+   }
+  delete fileread[pid(), $fd]
+  delete filewrite[pid(), $fd]
+  delete filehandles[pid(), $fd]
+  delete fd_io[pid()]
+  delete entry_io[pid()]
+  delete time_io[pid(),$fd]
+}
diff --git a/testsuite/systemtap.examples/io/iotop.meta b/testsuite/systemtap.examples/io/iotop.meta
new file mode 100644
index 00000000..d5331eda
--- /dev/null
+++ b/testsuite/systemtap.examples/io/iotop.meta
@@ -0,0 +1,13 @@
+title: Periodically Print I/O Activity by Process Name
+name: iotop.stp
+version: 1.0
+author: anonymous
+keywords: io
+subsystem: io
+status: production
+exit: user-controlled
+output: timed
+scope: system-wide
+description: Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.
+test_check: stap -p4 iotop.stp
+test_installcheck: stap iotop.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/io/iotop.stp b/testsuite/systemtap.examples/io/iotop.stp
new file mode 100644
index 00000000..6050343c
--- /dev/null
+++ b/testsuite/systemtap.examples/io/iotop.stp
@@ -0,0 +1,25 @@
+global reads, writes, total_io
+
+probe kernel.function("vfs_read") {
+    reads[execname()] += $count
+}
+
+probe kernel.function("vfs_write") {
+    writes[execname()] += $count
+}
+
+# print top 10 IO processes every 5 seconds
+probe timer.s(5) {
+    foreach (name in writes)
+        total_io[name] += writes[name]
+    foreach (name in reads)
+        total_io[name] += reads[name]
+    printf ("%16s\t%10s\t%10s\n", "Process", "KB Read", "KB Written")
+    foreach (name in total_io- limit 10)
+        printf("%16s\t%10d\t%10d\n", name,
+               reads[name]/1024, writes[name]/1024)
+    delete reads
+    delete writes
+    delete total_io
+    print("\n")
+}
diff --git a/testsuite/systemtap.examples/io/traceio.meta b/testsuite/systemtap.examples/io/traceio.meta
new file mode 100644
index 00000000..da0b99f3
--- /dev/null
+++ b/testsuite/systemtap.examples/io/traceio.meta
@@ -0,0 +1,13 @@
+title: Track Cumulative I/O Activity by Process Name
+name: traceio.stp
+version: 1.0
+author: Red Hat
+keywords: io
+subsystem: io
+status: production
+exit: user-controlled
+output: timed
+scope: system-wide
+description: Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.
+test_check: stap -p4 traceio.stp
+test_installcheck: stap traceio.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/io/traceio.stp b/testsuite/systemtap.examples/io/traceio.stp
new file mode 100644
index 00000000..d3757c23
--- /dev/null
+++ b/testsuite/systemtap.examples/io/traceio.stp
@@ -0,0 +1,32 @@
+#!/usr/bin/env stap
+# traceio.stp
+# Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+
+global reads, writes, total_io
+
+probe kernel.function("vfs_read").return {
+	reads[execname()] += $return
+}
+
+probe kernel.function("vfs_write").return {
+	writes[execname()] += $return
+}
+
+probe timer.s(1) {
+	foreach (p in reads)
+		total_io[p] += reads[p]
+	foreach (p in writes)
+		total_io[p] += writes[p]
+	foreach(p in total_io- limit 10)
+		printf("%15s r: %8d KiB w: %8d KiB\n",
+			p, reads[p]/1024,
+			writes[p]/1024)
+		printf("\n")
+	# Note we don't zero out reads, writes and total_io,
+	# so the values are cumulative since the script started.
+}
diff --git a/testsuite/systemtap.examples/io/traceio2.meta b/testsuite/systemtap.examples/io/traceio2.meta
new file mode 100644
index 00000000..4b63108c
--- /dev/null
+++ b/testsuite/systemtap.examples/io/traceio2.meta
@@ -0,0 +1,13 @@
+title: Watch I/O Activity on a Particular Device
+name: traceio2.stp
+version: 1.0
+author: Red Hat
+keywords: io
+subsystem: io
+status: production
+exit: user-controlled
+output: trace
+scope: system-wide
+description: Print out the executable name and process number as reads and writes to the specified device occur.
+test_check: stap -p4 traceio2.stp 0x0801
+test_installcheck: stap traceio2.stp 0x0801 -c "sleep 1"
diff --git a/testsuite/systemtap.examples/io/traceio2.stp b/testsuite/systemtap.examples/io/traceio2.stp
new file mode 100644
index 00000000..656c38b3
--- /dev/null
+++ b/testsuite/systemtap.examples/io/traceio2.stp
@@ -0,0 +1,20 @@
+global device_of_interest
+
+probe begin {
+  /* The following is not the most efficient way to do this.
+      One could directly put the result of usrdev2kerndev()
+      into device_of_interest.  However, want to test out
+      the other device functions */
+  dev = usrdev2kerndev($1)
+  device_of_interest = MKDEV(MAJOR(dev), MINOR(dev))
+}
+
+probe kernel.function ("vfs_write"),
+      kernel.function ("vfs_read")
+{
+        dev_nr = $file->f_path->dentry->d_inode->i_sb->s_dev
+
+        if (dev_nr == device_of_interest)
+                printf ("%s(%d) %s 0x%x\n",
+		        execname(), pid(), probefunc(), dev_nr)
+}
diff --git a/testsuite/systemtap.examples/io_submit.meta b/testsuite/systemtap.examples/io_submit.meta
deleted file mode 100644
index 911cb837..00000000
--- a/testsuite/systemtap.examples/io_submit.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Tally Reschedule Reason During AIO io_submit Call
-name: io_submit.stp
-version: 1.0
-author: Oracle
-keywords: io backtrace
-subsystem: io
-status: production
-exit: user-controlled
-output: sorted on-exit
-scope: system-wide
-description: When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.
-test_check: stap -p4 io_submit.stp
-test_installcheck: stap io_submit.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/io_submit.stp b/testsuite/systemtap.examples/io_submit.stp
deleted file mode 100644
index 735dd6f9..00000000
--- a/testsuite/systemtap.examples/io_submit.stp
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/env stap
-#
-# Copyright (C) 2007 Oracle Corp. Chris Mason <chris.mason@oracle.com>
-#
-# This was implemented to find the most common causes of schedule during
-# the AIO io_submit call.  It does this by recording which pids are inside
-# AIO, and recording the current stack trace if one of those pids is
-# inside schedule.
-# When the probe exits, it prints out the 30 most common call stacks for
-# schedule().
-#
-# This file is free software. You can redistribute it and/or modify it under 
-# the terms of the GNU General Public License (GPL); either version 2, or (at
-# your option) any later version.
-
-global in_iosubmit
-global traces
-
-/*
- * add a probe to sys_io_submit, on entry, record in the in_iosubmit
- * hash table that this proc is in io_submit
- */
-probe syscall.io_submit {
-	in_iosubmit[tid()] = 1
-}
-
-/*
- * when we return from sys_io_submit, record that we're no longer there
- */
-probe syscall.io_submit.return {
-	/* this assumes a given proc will do lots of io_submit calls, and
-	 * so doesn't do the more expensive "delete in_iosubmit[p]".  If
-	 * there are lots of procs doing small number of io_submit calls,
-	 * the hash may grow pretty big, so using delete may be better
-	 */
-	in_iosubmit[tid()] = 0
-}
-
-/*
- * every time we call schedule, check to see if we started off in
- * io_submit.  If so, record our backtrace into the traces histogram
- */
-probe kernel.function("schedule") {
-	if (tid() in in_iosubmit) {
-		traces[backtrace()]++
-
-		/*
-		 * change this to if (1) if you want a backtrace every time
-		 * you go into schedule from io_submit.  Unfortunately, the traces
-		 * saved into the traces histogram above are truncated to just a
-		 * few lines.  so the only way to see the full trace is via the
-		 * more verbose print_backtrace() right here.
-		 */
-		if (0) {
-			printf("schedule in io_submit!\n")
-			print_backtrace()
-		}
-	}
-}
-
-/*
- * when stap is done (via ctrl-c) go through the record of all the
- * trace paths and print the 30 most common.
- */
-probe end {
-	foreach (stack in traces- limit 30) {
-		printf("%d:", traces[stack])
-		print_stack(stack);
-	}
-}
-
diff --git a/testsuite/systemtap.examples/iostat-scsi.stp b/testsuite/systemtap.examples/iostat-scsi.stp
deleted file mode 100755
index ef778e53..00000000
--- a/testsuite/systemtap.examples/iostat-scsi.stp
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /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
-}
diff --git a/testsuite/systemtap.examples/iostat-scsi.txt b/testsuite/systemtap.examples/iostat-scsi.txt
deleted file mode 100644
index 8222f659..00000000
--- a/testsuite/systemtap.examples/iostat-scsi.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-From: http://sourceware.org/systemtap/wiki/WSiostatSCSI
-
-# stap -g iostat-scsi.stp 10 # seconds between reports
-  Device:       tps blk_read/s blk_wrtn/s  blk_read  blk_wrtn
-      sda      1.30      2.40    105.60        24      1056
-
-      sda      0.30      0.00      4.00         0        40
-
-      sda     21.30      1.60    428.80        16      4288
-
-      sda     30.40   2820.80     11.60     28208       116
-
-      sda     38.10   2816.80     53.60     28168       536
-^C
diff --git a/testsuite/systemtap.examples/iotime.meta b/testsuite/systemtap.examples/iotime.meta
deleted file mode 100644
index f656ff85..00000000
--- a/testsuite/systemtap.examples/iotime.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Trace Time Spent in Read and Write for Files 
-name: iotime.stp
-version: 1.0
-author: Daniel Berrange and Will Cohen
-keywords: syscall read write time io
-subsystem: syscall
-status: production
-exit: user-controlled
-output: trace
-scope: system-wide
-description: The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.
-test_check: stap -p4 iotime.stp
-test_installcheck: stap iotime.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/iotime.stp b/testsuite/systemtap.examples/iotime.stp
deleted file mode 100755
index 4fbd6b6e..00000000
--- a/testsuite/systemtap.examples/iotime.stp
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /usr/bin/env stap
-
-/*
- * Copyright (C) 2006-2007 Red Hat Inc.
- * 
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Print out the amount of time spent in the read and write systemcall
- * when a process closes each file is closed. Note that the systemtap 
- * script needs to be running before the open operations occur for
- * the script to record data.
- *
- * This script could be used to to find out which files are slow to load
- * on a machine. e.g.
- *
- * stap iotime.stp -c 'firefox'
- *
- * Output format is:
- * timestamp pid (executabable) info_type path ...
- *
- * 200283135 2573 (cupsd) access /etc/printcap read: 0 write: 7063
- * 200283143 2573 (cupsd) iotime /etc/printcap time: 69
- *
- */
-
-global start
-global entry_io
-global fd_io
-global time_io
-
-function timestamp:long() {
-  return gettimeofday_us() - start
-}
-
-function proc:string() {
-  return sprintf("%d (%s)", pid(), execname())
-}
-
-probe begin {
- start = gettimeofday_us()
-}
-
-global filenames
-global filehandles
-global fileread
-global filewrite
-
-probe syscall.open {
-  filenames[pid()] = user_string($filename)
-} 
-
-probe syscall.open.return {
-  if ($return != -1) {
-    filehandles[pid(), $return] = filenames[pid()]
-    fileread[pid(), $return] = 0
-    filewrite[pid(), $return] = 0
-  } else {
-    printf("%d %s access %s fail\n", timestamp(), proc(), filenames[pid()])
-  }
-  delete filenames[pid()]
-}
-
-probe syscall.read {
-  if ($count > 0) {
-    fileread[pid(), $fd] += $count
-  }
-  t = gettimeofday_us(); p = pid()
-  entry_io[p] = t
-  fd_io[p] = $fd
-}
-
-probe syscall.read.return {
-  t = gettimeofday_us(); p = pid()
-  fd = fd_io[p]
-  time_io[p,fd] <<< t - entry_io[p]
-}
-
-probe syscall.write {
-  if ($count > 0) {
-    filewrite[pid(), $fd] += $count
-  }
-  t = gettimeofday_us(); p = pid()
-  entry_io[p] = t
-  fd_io[p] = $fd
-}
-
-probe syscall.write.return {
-  t = gettimeofday_us(); p = pid()
-  fd = fd_io[p]
-  time_io[p,fd] <<< t - entry_io[p]
-}
-
-probe syscall.close {
-  if (filehandles[pid(), $fd] != "") {
-    printf("%d %s access %s read: %d write: %d\n",  timestamp(), proc(),
-	filehandles[pid(), $fd], fileread[pid(), $fd], filewrite[pid(), $fd])
-    if (@count(time_io[pid(), $fd]))
-      printf("%d %s iotime %s time: %d\n",  timestamp(), proc(),
-	filehandles[pid(), $fd], @sum(time_io[pid(), $fd]))
-   }
-  delete fileread[pid(), $fd]
-  delete filewrite[pid(), $fd]
-  delete filehandles[pid(), $fd]
-  delete fd_io[pid()]
-  delete entry_io[pid()]
-  delete time_io[pid(),$fd]
-}
diff --git a/testsuite/systemtap.examples/iotop.meta b/testsuite/systemtap.examples/iotop.meta
deleted file mode 100644
index d5331eda..00000000
--- a/testsuite/systemtap.examples/iotop.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Periodically Print I/O Activity by Process Name
-name: iotop.stp
-version: 1.0
-author: anonymous
-keywords: io
-subsystem: io
-status: production
-exit: user-controlled
-output: timed
-scope: system-wide
-description: Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.
-test_check: stap -p4 iotop.stp
-test_installcheck: stap iotop.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/iotop.stp b/testsuite/systemtap.examples/iotop.stp
deleted file mode 100644
index 6050343c..00000000
--- a/testsuite/systemtap.examples/iotop.stp
+++ /dev/null
@@ -1,25 +0,0 @@
-global reads, writes, total_io
-
-probe kernel.function("vfs_read") {
-    reads[execname()] += $count
-}
-
-probe kernel.function("vfs_write") {
-    writes[execname()] += $count
-}
-
-# print top 10 IO processes every 5 seconds
-probe timer.s(5) {
-    foreach (name in writes)
-        total_io[name] += writes[name]
-    foreach (name in reads)
-        total_io[name] += reads[name]
-    printf ("%16s\t%10s\t%10s\n", "Process", "KB Read", "KB Written")
-    foreach (name in total_io- limit 10)
-        printf("%16s\t%10d\t%10d\n", name,
-               reads[name]/1024, writes[name]/1024)
-    delete reads
-    delete writes
-    delete total_io
-    print("\n")
-}
diff --git a/testsuite/systemtap.examples/nettop.meta b/testsuite/systemtap.examples/nettop.meta
deleted file mode 100644
index 61d1c153..00000000
--- a/testsuite/systemtap.examples/nettop.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Periodic Listing of Processes Using Network Interfaces
-name: nettop.stp
-version: 1.0
-author: anonymous
-keywords: network traffic per-process
-subsystem: network
-status: production
-exit: user-controlled
-output: timed
-scope: system-wide
-description: Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.
-test_check: stap -p4 nettop.stp
-test_installcheck: stap nettop.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/nettop.stp b/testsuite/systemtap.examples/nettop.stp
deleted file mode 100755
index 96db413a..00000000
--- a/testsuite/systemtap.examples/nettop.stp
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env stap
-
-global ifxmit, ifrecv
-
-probe netdev.transmit
-{
-        ifxmit[pid(), dev_name, execname(), uid()] <<< length
-}
-
-probe netdev.receive
-{
-        ifrecv[pid(), dev_name, execname(), uid()] <<< length
-}
-
-
-function print_activity()
-{
-        printf("%5s %5s %-7s %7s %7s %7s %7s %-15s\n",
-                "PID", "UID", "DEV", "XMIT_PK", "RECV_PK",
-                "XMIT_KB", "RECV_KB", "COMMAND")
-
-        foreach ([pid, dev, exec, uid] in ifrecv-) {
-                n_xmit = @count(ifxmit[pid, dev, exec, uid])
-                n_recv = @count(ifrecv[pid, dev, exec, uid])
-                printf("%5d %5d %-7s %7d %7d %7d %7d %-15s\n",
-                        pid, uid, dev, n_xmit, n_recv,
-                        n_xmit ? @sum(ifxmit[pid, dev, exec, uid])/1024 : 0,
-                        n_recv ? @sum(ifrecv[pid, dev, exec, uid])/1024 : 0,
-                        exec)
-        }
-
-        print("\n")
-
-        delete ifxmit
-        delete ifrecv
-}
-
-probe timer.ms(5000), end, error
-{
-        print_activity()
-}
-
diff --git a/testsuite/systemtap.examples/nettop.txt b/testsuite/systemtap.examples/nettop.txt
deleted file mode 100644
index 2bfd4967..00000000
--- a/testsuite/systemtap.examples/nettop.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-From: http://sourceware.org/systemtap/wiki/WSNetTop
-
-# stap nettop.stp
-  PID   UID DEV     XMIT_PK RECV_PK XMIT_KB RECV_KB COMMAND
-    0     0 eth0         66     344      18      19 swapper
- 2469     0 eth0        214      39     167       1 Xvnc
-23470     0 eth0         24      35       5       1 firefox-bin
- 2281     0 eth0          1       1       0       0 wcstatusd
-22446     0 eth0          1       0       1       0 sshd
- 2538     0 eth0          0       1       0       0 metacity
-23557     0 eth0          0       1       0       0 sh
-23559     0 eth0          0       1       0       0 lspci
-23566     0 eth0          0       1       0       0 sh
-
-  PID   UID DEV     XMIT_PK RECV_PK XMIT_KB RECV_KB COMMAND
-    0     0 eth0         14      80       0       3 swapper
- 2469     0 eth0         32       2      20       0 Xvnc
-22446     0 eth0          1       0       0       0 sshd
- 2052    38 eth0          1       0       0       0 ntpd
-
diff --git a/testsuite/systemtap.examples/network/nettop.meta b/testsuite/systemtap.examples/network/nettop.meta
new file mode 100644
index 00000000..61d1c153
--- /dev/null
+++ b/testsuite/systemtap.examples/network/nettop.meta
@@ -0,0 +1,13 @@
+title: Periodic Listing of Processes Using Network Interfaces
+name: nettop.stp
+version: 1.0
+author: anonymous
+keywords: network traffic per-process
+subsystem: network
+status: production
+exit: user-controlled
+output: timed
+scope: system-wide
+description: Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.
+test_check: stap -p4 nettop.stp
+test_installcheck: stap nettop.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/network/nettop.stp b/testsuite/systemtap.examples/network/nettop.stp
new file mode 100755
index 00000000..96db413a
--- /dev/null
+++ b/testsuite/systemtap.examples/network/nettop.stp
@@ -0,0 +1,42 @@
+#! /usr/bin/env stap
+
+global ifxmit, ifrecv
+
+probe netdev.transmit
+{
+        ifxmit[pid(), dev_name, execname(), uid()] <<< length
+}
+
+probe netdev.receive
+{
+        ifrecv[pid(), dev_name, execname(), uid()] <<< length
+}
+
+
+function print_activity()
+{
+        printf("%5s %5s %-7s %7s %7s %7s %7s %-15s\n",
+                "PID", "UID", "DEV", "XMIT_PK", "RECV_PK",
+                "XMIT_KB", "RECV_KB", "COMMAND")
+
+        foreach ([pid, dev, exec, uid] in ifrecv-) {
+                n_xmit = @count(ifxmit[pid, dev, exec, uid])
+                n_recv = @count(ifrecv[pid, dev, exec, uid])
+                printf("%5d %5d %-7s %7d %7d %7d %7d %-15s\n",
+                        pid, uid, dev, n_xmit, n_recv,
+                        n_xmit ? @sum(ifxmit[pid, dev, exec, uid])/1024 : 0,
+                        n_recv ? @sum(ifrecv[pid, dev, exec, uid])/1024 : 0,
+                        exec)
+        }
+
+        print("\n")
+
+        delete ifxmit
+        delete ifrecv
+}
+
+probe timer.ms(5000), end, error
+{
+        print_activity()
+}
+
diff --git a/testsuite/systemtap.examples/network/nettop.txt b/testsuite/systemtap.examples/network/nettop.txt
new file mode 100644
index 00000000..2bfd4967
--- /dev/null
+++ b/testsuite/systemtap.examples/network/nettop.txt
@@ -0,0 +1,20 @@
+From: http://sourceware.org/systemtap/wiki/WSNetTop
+
+# stap nettop.stp
+  PID   UID DEV     XMIT_PK RECV_PK XMIT_KB RECV_KB COMMAND
+    0     0 eth0         66     344      18      19 swapper
+ 2469     0 eth0        214      39     167       1 Xvnc
+23470     0 eth0         24      35       5       1 firefox-bin
+ 2281     0 eth0          1       1       0       0 wcstatusd
+22446     0 eth0          1       0       1       0 sshd
+ 2538     0 eth0          0       1       0       0 metacity
+23557     0 eth0          0       1       0       0 sh
+23559     0 eth0          0       1       0       0 lspci
+23566     0 eth0          0       1       0       0 sh
+
+  PID   UID DEV     XMIT_PK RECV_PK XMIT_KB RECV_KB COMMAND
+    0     0 eth0         14      80       0       3 swapper
+ 2469     0 eth0         32       2      20       0 Xvnc
+22446     0 eth0          1       0       0       0 sshd
+ 2052    38 eth0          1       0       0       0 ntpd
+
diff --git a/testsuite/systemtap.examples/network/socket-trace.meta b/testsuite/systemtap.examples/network/socket-trace.meta
new file mode 100644
index 00000000..0b26f2fe
--- /dev/null
+++ b/testsuite/systemtap.examples/network/socket-trace.meta
@@ -0,0 +1,13 @@
+title: Trace Functions called in Network Socket Code
+name: socket-trace.stp
+version: 1.0
+author: anonymous
+keywords: network socket
+subsystem: network
+status: production
+exit: user-controlled
+output: trace
+scope: system-wide
+description: The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.
+test_check: stap -p4 socket-trace.stp
+test_installcheck: stap socket-trace.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/network/socket-trace.stp b/testsuite/systemtap.examples/network/socket-trace.stp
new file mode 100755
index 00000000..13ab8e06
--- /dev/null
+++ b/testsuite/systemtap.examples/network/socket-trace.stp
@@ -0,0 +1,8 @@
+#! /usr/bin/env stap
+
+probe kernel.function("*@net/socket.c").call {
+  printf ("%s -> %s\n", thread_indent(1), probefunc())
+}
+probe kernel.function("*@net/socket.c").return {
+  printf ("%s <- %s\n", thread_indent(-1), probefunc())
+}
diff --git a/testsuite/systemtap.examples/network/socktop b/testsuite/systemtap.examples/network/socktop
new file mode 100755
index 00000000..123e37e9
--- /dev/null
+++ b/testsuite/systemtap.examples/network/socktop
@@ -0,0 +1,318 @@
+#!/bin/bash
+
+# Socktop systemtap script
+# Copyright (C) 2006 IBM Corp.
+#
+# This file is part of systemtap, and is free software.  You can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License (GPL); either version 2, or (at your option) any
+# later version.
+
+###
+### socktop - Combination shell/systemtap script to track reads and writes
+###           on sockets by process.  Can be filtered by process IDs and
+###           names, protocols, protocol families, users and socket type.
+###
+
+# Filter options
+F_PROTSTR=""; F_PROT=0  # Filter by protocol
+F_FAMSTR=""; F_FAM=0    # Filter by protocol family
+F_TYPESTR=""; F_TYPE=0  # Filter by socket type
+F_PIDSTR=""; F_PID=0    # Filter by process ID
+F_NAMESTR=""; F_NAME=0  # Filter by process name
+F_UIDSTR=""; F_UID=0    # Filter by user
+FILTER=0                # Any filters specified?
+
+# Print options
+P_INTERVAL=5 # default interval between output
+P_DEVICES=0  # default is don't display network device traffic
+P_NUMTOP=10  # default number of processes and network devices to print
+
+DELIM=","
+
+function usage {
+	echo "USAGE: socktop [-d] [-i interval] [-N num] [-P protocol]... [-f family]..."
+	echo "               [-t stype]... [-n pname]... [-p pid]... [-u username]... [-h]"
+	echo "    -d           # print network device traffic (default: off)"
+	echo "    -i interval  # interval in seconds between printing (default: $P_INTERVAL)"
+	echo "    -N num       # number of top processes and devices to print (default: $P_NUMTOP)"
+	echo "    -f family    # this protocol family only (default: all)"
+	echo "    -P protocol  # this protocol only (default: all)"
+	echo "    -t stype     # this socket type only (default: all)"
+	echo "    -n pname     # this process name only (default: all)"
+	echo "    -p pid       # this process ID only (default: all)"
+	echo "    -u username  # this user only (default: all)"
+	echo "    -h           # print this help text"
+	echo ""
+	echo "Protocol Families:"
+	echo "    LOCAL, INET, INET6, IPX, NETLINK, X25, AX25, ATMPVC, APPLETALK, PACKET"
+	echo ""
+	echo "Protocols:"
+	echo "    TCP, UDP, SCTP, IP, FC, ... (see /etc/protocols for complete list)"
+	echo ""
+	echo "Socket Types:"
+	echo "    STREAM, DGRAM, RAW, RDM, SEQPACKET, DCCP, PACKET"
+}
+
+# Process options
+while getopts df:i:n:N:P:p:t:u:h option; do
+	case $option in
+	d)      P_DEVICES=1 ;;
+	i)      P_INTERVAL=$OPTARG ;;
+	N)      P_NUMTOP=$OPTARG ;;
+	f)      let "F_FAM++"
+	        F_FAMSTR=$OPTARG$DELIM$F_FAMSTR ;;
+	n)      let "F_NAME++"
+	        F_NAMESTR=$OPTARG$DELIM$F_NAMESTR ;;
+	p)      let "F_PID++"
+	        F_PIDSTR=$OPTARG$DELIM$F_PIDSTR ;;
+	P)      let "F_PROT++"
+	        F_PROTSTR=$OPTARG$DELIM$F_PROTSTR ;;
+	t)      let "F_TYPE++"
+	        F_TYPESTR=$OPTARG$DELIM$F_TYPESTR ;;
+	u)      uid=`awk -F: '$1 == name {print $3}' name=$OPTARG /etc/passwd`
+	        if [[ $uid != "" ]]; then
+	            let "F_UID++"
+	            F_UIDSTR=$uid$DELIM$F_UIDSTR
+	        else
+	            echo "ERROR: Unknown user:" $OPTARG
+	            let "ERROR++"
+	        fi ;;
+	h|?|*)  usage
+	        exit 1 ;;
+	esac
+done
+
+if [[ $ERROR > 0 ]]; then
+	exit 1
+fi
+
+if [[ $F_FAM  > 0 || $F_NAME > 0 || $F_PID > 0 || 
+	  $F_PROT > 0 || $F_TYPE > 0 || $F_UID > 0 ]]; then
+	FILTER=1
+fi
+
+#
+# Pass a timezone adjustment value to the stap script
+#
+TZ=`date "+%z"`
+TZ_SIGN=`echo $TZ | cut -c1`
+TZ_HOURS=`echo $TZ | cut -c2-3`
+TZ_MINS=`echo $TZ | cut -c4-5`
+TZ_ADJUST=$TZ_SIGN$((10#$TZ_HOURS*60*60+10#$TZ_MINS*60))
+
+#
+# Start the systemtap script
+#
+stap -e '
+global execname, user, if_tx, if_rx, if_dev
+global sk_tx, sk_rx, sk_pid
+global f_name_str, f_pid_str, f_prot_str, f_fam_str, f_type_str, f_uid_str
+global f_name, f_pid, f_prot, f_fam, f_type, f_uid
+
+probe begin
+{
+	# If no filters specified, skip filter processing
+	if ('$FILTER' == 0) next
+
+	f_name_str   = "'$F_NAMESTR'"
+	f_pid_str    = "'$F_PIDSTR'"
+	f_prot_str   = "'$F_PROTSTR'"
+	f_fam_str    = "'$F_FAMSTR'"
+	f_type_str   = "'$F_TYPESTR'"
+	f_uid_str    = "'$F_UIDSTR'"
+
+	delim = "'$DELIM'"
+	error = 0
+
+	# Protocols
+	if ('$F_PROT') {
+		prot = tokenize(f_prot_str, delim)
+		while (prot != "") {
+			p = sock_prot_str2num(prot)
+			if (p < 0) {
+				printf("ERROR: Unknown protocol: %s\n", prot)
+				error++
+			} else
+				f_prot[p] = 1
+			prot = tokenize("", delim)
+		}
+	}
+
+	# Protocol families
+	if ('$F_FAM') {
+		fam = tokenize(f_fam_str, delim)
+		while (fam != "") {
+			f = sock_fam_str2num(fam)
+			if (f < 0) {
+				printf("ERROR: Unknown protocol family: %s\n", fam)
+				error++
+			} else
+				f_fam[f] = 1
+			fam = tokenize("", delim)
+		}
+	}
+
+	# Process names
+	if ('$F_NAME') {
+		pname = tokenize(f_name_str, delim)
+		while (pname != "") {
+			f_name[pname] = 1
+			pname = tokenize("", delim)
+		}
+	}
+
+	# Process IDs
+	if ('$F_PID') {
+		pid = tokenize(f_pid_str, delim)
+		while (pid != "") {
+			f_pid[strtol(pid, 10)] = 1
+			pid = tokenize("", delim)
+		}
+	}
+
+	# Socket types
+	if ('$F_TYPE') {
+		stype = tokenize(f_type_str, delim)
+		while (stype != "") {
+			t = sock_type_str2num(stype)
+			if (t < 0) {
+				printf("ERROR: Unknown socket type: %s\n", stype)
+				error++
+			} else
+				f_type[t] = 1
+			stype = tokenize("", delim)
+		}
+	}
+
+	# User IDs
+	if ('$F_UID') {
+		uid = tokenize(f_uid_str, delim)
+		while (uid != "") {
+			f_uid[strtol(uid, 10)] = 1
+			uid = tokenize("", delim)
+		}
+	}
+
+	if (error) exit()
+}
+
+probe netdev.transmit
+{
+	if ('$P_DEVICES') {
+		if_tx[dev_name] <<< length
+		if_dev[dev_name] ++
+	}
+}
+
+probe netdev.receive
+{
+	if ('$P_DEVICES') {
+		if_rx[dev_name] <<< length
+		if_dev[dev_name] ++
+	}
+}
+
+probe socket.send
+{
+	if (!success) next
+
+	pid = pid()
+	uid = uid()
+	ename = execname()
+
+	# Check filters
+	if ('$FILTER') {
+		if ('$F_PROT' && !(protocol in f_prot)) next
+		if ('$F_FAM'  && !(family   in f_fam))  next
+		if ('$F_PID'  && !(pid      in f_pid))  next
+		if ('$F_NAME' && !(ename    in f_name)) next
+		if ('$F_UID'  && !(uid      in f_uid))  next
+		if ('$F_TYPE' && !(type     in f_type)) next
+	}
+
+	execname[pid] = ename
+	user[pid] = uid
+	sk_tx[pid, protocol, family] <<< size
+	sk_pid[pid, protocol, family] += size
+}
+
+probe socket.receive
+{
+	if (!success) next
+
+	pid = pid()
+	uid = uid()
+	ename = execname()
+
+	# Check filters
+	if ('$FILTER') {
+		if ('$F_PROT' && !(protocol in f_prot)) next
+		if ('$F_FAM'  && !(family   in f_fam))  next
+		if ('$F_PID'  && !(pid      in f_pid))  next
+		if ('$F_NAME' && !(ename    in f_name)) next
+		if ('$F_UID'  && !(uid      in f_uid))  next
+		if ('$F_TYPE' && !(type     in f_type)) next
+	}
+
+	execname[pid] = ename
+	user[pid] = uid
+	sk_rx[pid, protocol, family] <<< size
+	sk_pid[pid, protocol, family] += size
+}
+
+function print_activity()
+{
+	# Print top processes
+	max = '$P_NUMTOP'
+	time = gettimeofday_s() + '$TZ_ADJUST'
+
+	printf("======================= %s ========================\n", ctime(time))
+	printf("------------------------------- PROCESSES -------------------------------\n")
+	printf("%-5s %-5s %7s %7s %7s %7s %-4s %-8s %-15s\n",
+	       "PID", "UID", "#SEND", "#RECV", "SEND_KB",
+	       "RECV_KB", "PROT", "FAMILY", "COMMAND")
+	foreach ([pid, prot, fam] in sk_pid- limit max) {
+		n_sk_tx = @count(sk_tx[pid, prot, fam])
+		n_sk_rx = @count(sk_rx[pid, prot, fam])
+		printf("%-5d %-5d %7d %7d %7d %7d %-4s %-8s %-15s\n",
+		       pid, user[pid], n_sk_tx, n_sk_rx,
+		       n_sk_tx ? @sum(sk_tx[pid, prot, fam])/1024 : 0,
+		       n_sk_rx ? @sum(sk_rx[pid, prot, fam])/1024 : 0,
+		       sock_prot_num2str(prot), sock_fam_num2str(fam),
+		       execname[pid])
+	}
+
+	# Print top network devices
+	if ('$P_DEVICES') {
+		max = '$P_NUMTOP'
+		printf("-------------------------------- DEVICES --------------------------------\n")
+		printf("%-7s %13s %13s %15s %15s\n",
+		       "DEV", "#XMIT", "#RECV", "XMIT_KB", "RECV_KB")
+		foreach ([dev] in if_dev- limit max) {
+			n_if_tx = @count(if_tx[dev])
+			n_if_rx = @count(if_rx[dev])
+			printf("%-7s %13d %13d %15d %15d\n", dev, n_if_tx, n_if_rx,
+			       n_if_tx ? @sum(if_tx[dev])/1024 : 0,
+			       n_if_rx ? @sum(if_rx[dev])/1024 : 0)
+		}
+	}
+	
+	printf("=========================================================================\n\n")
+
+	delete execname
+	delete user
+	delete sk_tx
+	delete sk_rx
+	delete sk_pid
+	delete if_tx
+	delete if_rx
+	delete if_dev
+}
+
+
+probe timer.s('$P_INTERVAL')
+{
+	print_activity()
+}
+'
diff --git a/testsuite/systemtap.examples/network/socktop.txt b/testsuite/systemtap.examples/network/socktop.txt
new file mode 100644
index 00000000..0ebce003
--- /dev/null
+++ b/testsuite/systemtap.examples/network/socktop.txt
@@ -0,0 +1,66 @@
+#./socktop -d
+
+======================= Mon Jan 29 12:27:24 2007 ========================
+------------------------------- PROCESSES -------------------------------
+PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
+3051  0           0    3159       0    4702 TCP  INET     firefox-bin    
+2578  0         121     101     164     181 IP   LOCAL    Xvnc           
+3051  0          74     180     176     164 IP   LOCAL    firefox-bin    
+2578  0           8      79      39       0 TCP  INET     Xvnc           
+2583  0           2       1       5       0 IP   LOCAL    xterm          
+-------------------------------- DEVICES --------------------------------
+DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
+eth0             2236          3448             182            4875
+=========================================================================
+
+======================= Mon Jan 29 12:27:29 2007 ========================
+------------------------------- PROCESSES -------------------------------
+PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
+2578  0         580     582    1300    1315 IP   LOCAL    Xvnc           
+3051  0         296     600     970     965 IP   LOCAL    firefox-bin    
+3051  0           0     664       0     987 TCP  INET     firefox-bin    
+2695  0          62     145     298     297 IP   LOCAL    wnck-applet    
+2578  0          23     131      88       0 TCP  INET     Xvnc           
+2685  0          85     211      42      34 IP   LOCAL    metacity       
+2583  0           2       3       4       0 IP   LOCAL    xterm          
+2620  0          40      78       0       2 IP   LOCAL    gnome-settings-
+2688  0           3       7       0       0 IP   LOCAL    gnome-panel    
+2690  0           1       7       0       0 IP   LOCAL    nautilus       
+-------------------------------- DEVICES --------------------------------
+DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
+eth0              580           881             124            1030
+=========================================================================
+
+
+# ./socktop -d -P TCP -P UDP
+
+======================= Mon Jan 29 12:29:15 2007 ========================
+------------------------------- PROCESSES -------------------------------
+PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
+2578  0          16     183      27       1 TCP  INET     Xvnc           
+-------------------------------- DEVICES --------------------------------
+DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
+eth0              135           204              35               9
+=========================================================================
+
+======================= Mon Jan 29 12:29:20 2007 ========================
+------------------------------- PROCESSES -------------------------------
+PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
+3051  0           1    1814       0    3236 TCP  INET     firefox-bin    
+2578  0          52     155     198       1 TCP  INET     Xvnc           
+3051  0           4       4       0       0 UDP  INET     firefox-bin    
+-------------------------------- DEVICES --------------------------------
+DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
+eth0             1574          2589             297            3366
+=========================================================================
+
+======================= Mon Jan 29 12:29:25 2007 ========================
+------------------------------- PROCESSES -------------------------------
+PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
+3051  0           0    2508       0    3721 TCP  INET     firefox-bin    
+2578  0           2      39      10       0 TCP  INET     Xvnc           
+-------------------------------- DEVICES --------------------------------
+DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
+eth0             1767          2698             123            3858
+=========================================================================
+
diff --git a/testsuite/systemtap.examples/para-callgraph.meta b/testsuite/systemtap.examples/para-callgraph.meta
deleted file mode 100644
index 3ce4b648..00000000
--- a/testsuite/systemtap.examples/para-callgraph.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Tracing Calls for Sections of Code
-name: para-callgraph.stp
-version: 1.0
-author: anonymous
-keywords: trace callgraph
-subsystem: kernel
-status: production
-exit: user-controlled
-output: trace
-scope: system-wide
-description: The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.
-test_check: stap -p4 para-callgraph.stp sys_read "*@fs/*.c"
-test_installcheck: stap  para-callgraph.stp sys_read "*@fs/*.c" -c "sleep 1"
diff --git a/testsuite/systemtap.examples/para-callgraph.stp b/testsuite/systemtap.examples/para-callgraph.stp
deleted file mode 100644
index 1afb8837..00000000
--- a/testsuite/systemtap.examples/para-callgraph.stp
+++ /dev/null
@@ -1,20 +0,0 @@
-function trace(entry_p) {
-   if(tid() in trace)
-       printf("%s%s%s\n",thread_indent(entry_p),
-		       	 (entry_p>0?"->":"<-"),
-		         probefunc())
-}
-
-global trace
-probe kernel.function(@1).call {
-   if (execname() == "stapio") next # skip our own helper process
-   trace[tid()] = 1
-   trace(1)
-}
-probe kernel.function(@1).return {
-   trace(-1)
-   delete trace[tid()]
-}
-
-probe kernel.function(@2).call { trace(1) }
-probe kernel.function(@2).return { trace(-1) }
diff --git a/testsuite/systemtap.examples/pf2.meta b/testsuite/systemtap.examples/pf2.meta
deleted file mode 100644
index d0a534bd..00000000
--- a/testsuite/systemtap.examples/pf2.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Profile kernel functions
-name: pf2.stp
-version: 1.0
-author: anonymous
-keywords: profiling
-subsystem: kernel
-status: production
-exit: user-controlled
-output: sorted-list
-scope: system-wide
-description: The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.
-test_check: stap -p4 pf2.stp
-test_installcheck: stap pf2.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/pf2.stp b/testsuite/systemtap.examples/pf2.stp
deleted file mode 100755
index a804c3ff..00000000
--- a/testsuite/systemtap.examples/pf2.stp
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/bin/env stap
-
-global profile, pcount
-probe timer.profile {
-  pcount <<< 1
-  fn = probefunc ()
-  if (fn != "") profile[fn] <<< 1
-}
-probe timer.ms(5000) {
-  printf ("\n--- %d samples recorded:\n", @count(pcount))
-  foreach (f in profile- limit 10) {
-    printf ("%-30s\t%6d\n", f, @count(profile[f]))
-  }
-  delete profile
-  delete pcount
-}
diff --git a/testsuite/systemtap.examples/pf2.txt b/testsuite/systemtap.examples/pf2.txt
deleted file mode 100644
index 0fafe17e..00000000
--- a/testsuite/systemtap.examples/pf2.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-From: http://sourceware.org/systemtap/wiki/WSKernelProfile
-
-# stap pf2.stp
-
---- 109 samples recorded:
-mwait_idle      71
-check_poison_obj        4
-_spin_unlock_irqrestore 2
-dbg_redzone1    1
-kfree   1
-kmem_cache_free 1
-_spin_unlock_irq        1
-end_buffer_write_sync   1
-lock_acquire    1
-
---- 108 samples recorded:
-mwait_idle      91
-check_poison_obj        3
-_spin_unlock_irq        2
-delay_tsc       1
-
diff --git a/testsuite/systemtap.examples/process/futexes.meta b/testsuite/systemtap.examples/process/futexes.meta
new file mode 100644
index 00000000..ff303122
--- /dev/null
+++ b/testsuite/systemtap.examples/process/futexes.meta
@@ -0,0 +1,13 @@
+title: System-Wide Futex Contention
+name: futexes.stp
+version: 1.0
+author: anonymous
+keywords: syscall locking futex
+subsystem: locking
+status: production
+exit: user-controlled
+output: sorted-list on-exit
+scope: system-wide
+description: The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.
+test_check: stap -p4 futexes.stp
+test_installcheck: stap futexes.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/futexes.stp b/testsuite/systemtap.examples/process/futexes.stp
new file mode 100755
index 00000000..16c62937
--- /dev/null
+++ b/testsuite/systemtap.examples/process/futexes.stp
@@ -0,0 +1,36 @@
+#! /usr/bin/env stap
+
+# This script tries to identify contended user-space locks by hooking
+# into the futex system call.
+
+global thread_thislock # short
+global thread_blocktime # 
+global FUTEX_WAIT = 0 /*, FUTEX_WAKE = 1 */
+
+global lock_waits # long-lived stats on (tid,lock) blockage elapsed time
+global process_names # long-lived pid-to-execname mapping
+
+probe syscall.futex {  
+   if (op != FUTEX_WAIT) next  # we don't care about originators of WAKE events
+   t = tid ()
+   process_names[pid()] = execname()
+   thread_thislock[t] = $uaddr
+   thread_blocktime[t] = gettimeofday_us()
+}
+
+probe syscall.futex.return {  
+   t = tid()
+   ts = thread_blocktime[t]
+   if (ts) {
+     elapsed = gettimeofday_us() - ts
+     lock_waits[pid(), thread_thislock[t]] <<< elapsed
+     delete thread_blocktime[t]
+     delete thread_thislock[t]
+   }
+}
+
+probe end {
+   foreach ([pid+, lock] in lock_waits) 
+     printf ("%s[%d] lock %p contended %d times, %d avg us\n",
+       process_names[pid], pid, lock, @count(lock_waits[pid,lock]), @avg(lock_waits[pid,lock]))
+}
diff --git a/testsuite/systemtap.examples/process/futexes.txt b/testsuite/systemtap.examples/process/futexes.txt
new file mode 100644
index 00000000..51de4352
--- /dev/null
+++ b/testsuite/systemtap.examples/process/futexes.txt
@@ -0,0 +1,18 @@
+From: http://sourceware.org/systemtap/wiki/WSFutexContention
+
+# stap futexes.stp
+^C
+liferea-bin[3613] lock 0x0a117340 contended 1 times, 71 avg us
+java_vm[8155] lock 0x09baa45c contended 9 times, 1004013 avg us
+java_vm[8155] lock 0x09d6f9ac contended 186 times, 55964 avg us
+xmms[16738] lock 0xbfe29eec contended 777 times, 69 avg us
+xmms[16738] lock 0xbfe29ecc contended 119 times, 64 avg us
+xmms[16738] lock 0xbfe29ebc contended 111 times, 68 avg us
+xmms[16738] lock 0xbfe29ef0 contended 742 times, 91 avg us
+xmms[16738] lock 0xbfe29ed0 contended 107 times, 101 avg us
+xmms[16738] lock 0xbfe29ec0 contended 107 times, 74 avg us
+firefox-bin[21801] lock 0x096d16f4 contended 24 times, 12 avg us
+firefox-bin[21801] lock 0x096d1198 contended 2 times, 4 avg us
+firefox-bin[21801] lock 0x096d16f8 contended 150 times, 64997 avg us
+named[23869] lock 0x41ab0b84 contended 1 times, 131 avg us
+named[23869] lock 0x41ab0b50 contended 1 times, 26 avg us
diff --git a/testsuite/systemtap.examples/process/pf2.meta b/testsuite/systemtap.examples/process/pf2.meta
new file mode 100644
index 00000000..d0a534bd
--- /dev/null
+++ b/testsuite/systemtap.examples/process/pf2.meta
@@ -0,0 +1,13 @@
+title: Profile kernel functions
+name: pf2.stp
+version: 1.0
+author: anonymous
+keywords: profiling
+subsystem: kernel
+status: production
+exit: user-controlled
+output: sorted-list
+scope: system-wide
+description: The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.
+test_check: stap -p4 pf2.stp
+test_installcheck: stap pf2.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/pf2.stp b/testsuite/systemtap.examples/process/pf2.stp
new file mode 100755
index 00000000..a804c3ff
--- /dev/null
+++ b/testsuite/systemtap.examples/process/pf2.stp
@@ -0,0 +1,16 @@
+#! /usr/bin/env stap
+
+global profile, pcount
+probe timer.profile {
+  pcount <<< 1
+  fn = probefunc ()
+  if (fn != "") profile[fn] <<< 1
+}
+probe timer.ms(5000) {
+  printf ("\n--- %d samples recorded:\n", @count(pcount))
+  foreach (f in profile- limit 10) {
+    printf ("%-30s\t%6d\n", f, @count(profile[f]))
+  }
+  delete profile
+  delete pcount
+}
diff --git a/testsuite/systemtap.examples/process/pf2.txt b/testsuite/systemtap.examples/process/pf2.txt
new file mode 100644
index 00000000..0fafe17e
--- /dev/null
+++ b/testsuite/systemtap.examples/process/pf2.txt
@@ -0,0 +1,21 @@
+From: http://sourceware.org/systemtap/wiki/WSKernelProfile
+
+# stap pf2.stp
+
+--- 109 samples recorded:
+mwait_idle      71
+check_poison_obj        4
+_spin_unlock_irqrestore 2
+dbg_redzone1    1
+kfree   1
+kmem_cache_free 1
+_spin_unlock_irq        1
+end_buffer_write_sync   1
+lock_acquire    1
+
+--- 108 samples recorded:
+mwait_idle      91
+check_poison_obj        3
+_spin_unlock_irq        2
+delay_tsc       1
+
diff --git a/testsuite/systemtap.examples/process/proc_snoop.stp b/testsuite/systemtap.examples/process/proc_snoop.stp
new file mode 100755
index 00000000..24499b4b
--- /dev/null
+++ b/testsuite/systemtap.examples/process/proc_snoop.stp
@@ -0,0 +1,55 @@
+#!/usr/bin/env stap
+
+global start_ts
+
+probe begin {
+    start_ts = gettimeofday_us()
+    printf("%12s  %5s  %5s  %-16s  ACTION\n",
+            "TIMESTAMP", "PID", "TID", "EXECNAME")
+}
+
+function report(action:string) {
+    printf("%12d  %5d  %5d  %-16s  %s\n", gettimeofday_us() - start_ts,
+            pid(), tid(), execname(), action)
+}
+
+function id:string(task:long) {
+    return sprintf("p:%d t:%d n:%s", task_pid(task), task_tid(task),
+            task_execname(task))
+}
+
+probe process.create {
+    report(sprintf("create %s", id(task)))
+}
+
+probe process.start {
+    report("start")
+}
+
+probe process.exec {
+    report(sprintf("exec %s", filename))
+}
+
+probe process.exec_complete {
+    if (success)
+        report("exec success")
+    else
+        report(sprintf("exec failed %d (%s)", errno, errno_str(errno)))
+}
+
+probe process.exit {
+    report(sprintf("exit %d", code))
+}
+
+probe process.release {
+    report(sprintf("remove %s", id(task)))
+}
+
+probe signal.send {
+    report(sprintf("sigsend %d (%s) to %s%s", sig, sig_name, id(task),
+                shared? " [SHARED]" : ""))
+}
+
+probe signal.handle {
+    report(sprintf("sighandle %d (%s)", sig, sig_name))
+}
diff --git a/testsuite/systemtap.examples/process/sig_by_pid.meta b/testsuite/systemtap.examples/process/sig_by_pid.meta
new file mode 100644
index 00000000..03b02fba
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sig_by_pid.meta
@@ -0,0 +1,13 @@
+title:  Signal Counts by Process ID
+name: sig_by_pid.stp
+version: 1.0
+author: IBM
+keywords: signals
+subsystem: signals
+status: experimental
+exit: user-controlled
+output: sorted-list on-exit
+scope: system-wide
+description: Print signal counts by process ID in descending order.
+test_check: stap -p4 sig_by_pid.stp
+test_installcheck: stap sig_by_pid.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/sig_by_pid.stp b/testsuite/systemtap.examples/process/sig_by_pid.stp
new file mode 100755
index 00000000..9c1493f5
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sig_by_pid.stp
@@ -0,0 +1,42 @@
+#! /usr/bin/env stap
+
+# Copyright (C) 2006 IBM Corp.
+#
+# This file is part of systemtap, and is free software.  You can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License (GPL); either version 2, or (at your option) any
+# later version.
+
+#
+# Print signal counts by process IDs in descending order.
+#
+
+global sigcnt, pid2name, sig2name
+
+probe begin {
+	print("Collecting data... Type Ctrl-C to exit and display results\n")
+}
+
+probe signal.send 
+{
+	snd_pid = pid()
+	rcv_pid = sig_pid
+
+	sigcnt[snd_pid, rcv_pid, sig]++
+
+	if (!(snd_pid in pid2name)) pid2name[snd_pid] = execname()
+	if (!(rcv_pid in pid2name)) pid2name[rcv_pid] = pid_name
+	if (!(sig in sig2name)) sig2name[sig] = sig_name 
+}
+
+probe end
+{
+	printf("%-8s %-16s %-5s %-16s %-16s %s\n",
+	       "SPID", "SENDER", "RPID", "RECEIVER", "SIGNAME", "COUNT")
+
+	foreach ([snd_pid, rcv_pid, sig_num] in sigcnt-) {
+		printf("%-8d %-16s %-5d %-16s %-16s %d\n", 
+		       snd_pid, pid2name[snd_pid], rcv_pid, pid2name[rcv_pid],
+		       sig2name[sig_num], sigcnt[snd_pid, rcv_pid, sig_num])
+	}
+}
diff --git a/testsuite/systemtap.examples/process/sig_by_pid.txt b/testsuite/systemtap.examples/process/sig_by_pid.txt
new file mode 100644
index 00000000..927b4607
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sig_by_pid.txt
@@ -0,0 +1,24 @@
+# stap sig_by_pid.stp 
+Collecting data... Type Ctrl-C to exit and display results
+^C
+Collecting data... Type Ctrl-C to exit and display results
+SPID     SENDER           RPID  RECEIVER         SIGNAME          COUNT
+0        swapper          25273 Xvnc             SIGALRM          1576
+25273    Xvnc             25273 Xvnc             SIGALRM          17
+29219    firefox-bin      25273 Xvnc             SIGALRM          12
+0        swapper          2442  automount        SIGALRM          12
+26754    xterm            26756 bash             SIGWINCH         9
+0        swapper          2199  syslogd          SIGALRM          6
+25345    metacity         25273 Xvnc             SIGALRM          3
+2791     wclientd         2791  wclientd         SIGUSR1          2
+30385    ifconfig         30384 sh               SIGCHLD          1
+30384    sh               2802  wcstatusd        SIGCHLD          1
+30387    mii-tool         30386 sh               SIGCHLD          1
+30386    sh               2802  wcstatusd        SIGCHLD          1
+30388    lspci            2802  wcstatusd        SIGCHLD          1
+30389    sh               2802  wcstatusd        SIGCHLD          1
+30391    ifconfig         25273 Xvnc             SIGALRM          1
+30391    ifconfig         30390 sh               SIGCHLD          1
+30390    sh               2802  wcstatusd        SIGCHLD          1
+30393    mii-tool         30392 sh               SIGCHLD          1
+30392    sh               2802  wcstatusd        SIGCHLD          1
diff --git a/testsuite/systemtap.examples/process/sig_by_proc.meta b/testsuite/systemtap.examples/process/sig_by_proc.meta
new file mode 100644
index 00000000..eea42be4
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sig_by_proc.meta
@@ -0,0 +1,13 @@
+title:  Signal Counts by Process Name
+name: sig_by_proc.stp
+version: 1.0
+author: IBM
+keywords: signals
+subsystem: signals
+status: experimental
+exit: user-controlled
+output: sorted-list on-exit
+scope: system-wide
+description: Print signal counts by process name in descending order.
+test_check: stap -p4 sig_by_proc.stp
+test_installcheck: stap sig_by_proc.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/sig_by_proc.stp b/testsuite/systemtap.examples/process/sig_by_proc.stp
new file mode 100755
index 00000000..ce845aed
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sig_by_proc.stp
@@ -0,0 +1,36 @@
+#! /usr/bin/env stap
+
+# Copyright (C) 2006 IBM Corp.
+#
+# This file is part of systemtap, and is free software.  You can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License (GPL); either version 2, or (at your option) any
+# later version.
+
+#
+# Print signal counts by process name in descending order.
+#
+
+global sigcnt, sig2name
+
+probe begin {
+	print("Collecting data... Type Ctrl-C to exit and display results\n")
+}
+
+probe signal.send 
+{
+	sigcnt[execname(), pid_name, sig]++
+
+	if (!(sig in sig2name)) sig2name[sig] = sig_name 
+}
+
+probe end
+{
+	printf("%-16s %-16s %-16s %s\n",
+	       "SENDER", "RECEIVER", "SIGNAL", "COUNT")
+
+	foreach ([snd_name, rcv_name, sig_num] in sigcnt-)
+		printf("%-16s %-16s %-16s %d\n", 
+		       snd_name, rcv_name, sig2name[sig_num],
+		       sigcnt[snd_name, rcv_name, sig_num])
+}
diff --git a/testsuite/systemtap.examples/process/sig_by_proc.txt b/testsuite/systemtap.examples/process/sig_by_proc.txt
new file mode 100644
index 00000000..d09da9fe
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sig_by_proc.txt
@@ -0,0 +1,20 @@
+# stap sig_by_proc.stp 
+Collecting data... Type Ctrl-C to exit and display results
+^C
+SENDER           RECEIVER         SIGNAL           COUNT
+swapper          Xvnc             SIGALRM          448
+sh               wcstatusd        SIGCHLD          318
+ifconfig         sh               SIGCHLD          106
+mii-tool         sh               SIGCHLD          106
+lspci            wcstatusd        SIGCHLD          106
+automount        automount        SIGCHLD          14
+swapper          automount        SIGALRM          13
+swapper          syslogd          SIGALRM          7
+swapper          sendmail         SIGALRM          2
+sendmail         sendmail         SIGCHLD          2
+lspci            Xvnc             SIGALRM          2
+ifconfig         automount        SIGALRM          1
+sh               Xvnc             SIGALRM          1
+xterm            staprun          SIGINT           1
+xterm            stap             SIGINT           1
+
diff --git a/testsuite/systemtap.examples/process/sigkill.meta b/testsuite/systemtap.examples/process/sigkill.meta
new file mode 100644
index 00000000..57032224
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sigkill.meta
@@ -0,0 +1,14 @@
+title: Track SIGKILL Signals
+name: sigkill.stp
+version: 1.0
+author: Red Hat
+keywords: signals
+subsystem: signals
+status: production
+exit: user-controlled
+output: trace
+scope: systemwide
+description: The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.
+arg_1: The name of the signal to look for on selected process.
+test_check: stap -p4 sigkill.stp
+test_installcheck: stap sigkill.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/sigkill.stp b/testsuite/systemtap.examples/process/sigkill.stp
new file mode 100644
index 00000000..8f754219
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sigkill.stp
@@ -0,0 +1,23 @@
+#!/usr/bin/env stap
+# sigkill.stp
+# Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# /usr/share/systemtap/tapset/signal.stp:
+# [...]
+# probe signal.send = _signal.send.*
+# {
+# 	sig=$sig
+# 	sig_name = _signal_name($sig)
+# 	sig_pid = task_pid(task)
+# 	pid_name = task_execname(task)
+# [...]
+
+probe signal.send {
+	if (sig_name == "SIGKILL")
+		printf("%s was sent to %s (pid:%d) by %s uid:%d\n",
+				sig_name, pid_name, sig_pid, execname(), uid())
+}
diff --git a/testsuite/systemtap.examples/process/sigmon.meta b/testsuite/systemtap.examples/process/sigmon.meta
new file mode 100644
index 00000000..18834997
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sigmon.meta
@@ -0,0 +1,14 @@
+title: System-Wide Count of Syscalls by PID
+name: syscalls_by_pid.stp
+version: 1.0
+author: IBM
+keywords: signals
+subsystem: signals
+status: experimental
+exit: user-controlled
+output: trace
+scope: pid
+description: The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.
+arg_1: The name of the signal to look for on selected process.
+test_check: stap -p4 sigmon.stp SIGKILL
+test_installcheck: stap sigmon.stp -c "sleep 1" SIGKILL
diff --git a/testsuite/systemtap.examples/process/sigmon.stp b/testsuite/systemtap.examples/process/sigmon.stp
new file mode 100755
index 00000000..31d7822e
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sigmon.stp
@@ -0,0 +1,35 @@
+#! /usr/bin/env stap
+
+# Copyright (C) 2006 IBM Corp.
+#
+# This file is part of systemtap, and is free software.  You can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License (GPL); either version 2, or (at your option) any
+# later version.
+
+#
+# Track when a specific process ID receives a specific signal.  For example,
+# when process ID 31994 receives a SIGKILL signal.
+#
+# Example command line: 
+#
+# 	stap -x 31994 sigmon.stp SIGKILL
+#
+# Example output: 
+#
+# 	SPID     SNAME            RPID  RNAME            SIGNUM SIGNAME
+# 	5609     bash             31994 find             9      SIGKILL 
+#
+
+probe begin
+{
+	printf("%-8s %-16s %-5s %-16s %6s %-16s\n",
+	       "SPID", "SNAME", "RPID", "RNAME", "SIGNUM", "SIGNAME")
+}
+
+probe signal.send 
+{
+	if (sig_name == @1 && sig_pid == target())
+		printf("%-8d %-16s %-5d %-16s %-6d %-16s\n", 
+			pid(), execname(), sig_pid, pid_name, sig, sig_name)
+}
diff --git a/testsuite/systemtap.examples/process/sleepingBeauties.meta b/testsuite/systemtap.examples/process/sleepingBeauties.meta
new file mode 100644
index 00000000..95e08361
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sleepingBeauties.meta
@@ -0,0 +1,13 @@
+title: Generating Backtraces of Threads Waiting for IO Operations
+name: sleepingBeauties.stp
+version: 1.0
+author: anonymous
+keywords: io scheduler
+subsystem: scheduler
+status: production
+exit: user-controlled
+output: trace
+scope: system-wide
+description: The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.
+test_check: stap -p4 sleepingBeauties.stp
+test_installcheck: stap sleepingBeauties.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/sleepingBeauties.stp b/testsuite/systemtap.examples/process/sleepingBeauties.stp
new file mode 100644
index 00000000..64c563a3
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sleepingBeauties.stp
@@ -0,0 +1,58 @@
+#! /usr/bin/stap
+
+function time () { return gettimeofday_ms() }
+global time_name = "ms"
+global boredom = 10 # in time units
+global name, back, backtime, bored
+
+/* Note: the order that the probes are listed should not matter.
+   However, the following order for
+   probe kernel.function("wait_for_completion").return and
+   probe kernel.function("wait_for_completion").call
+   avoids have the kretprobe stuff in the backtrace.
+   for more information see:
+   http://sources.redhat.com/bugzilla/show_bug.cgi?id=6436
+*/
+
+
+probe kernel.function("wait_for_completion").return
+{
+  t=tid()
+
+  if ([t] in bored) {
+    patience = time() - backtime[t]
+    printf ("thread %d (%s) bored for %d %s\n", 
+            t, name[t], patience, time_name)
+  }
+
+  delete bored[t]
+  delete back[t]
+  delete name[t]
+  delete backtime[t]
+}
+
+
+probe kernel.function("wait_for_completion").call
+{ 
+  t=tid()
+  back[t]=backtrace()
+  name[t]=execname()
+  backtime[t]=time()
+  delete bored[t]
+}
+
+
+probe timer.profile {
+  foreach (tid+ in back) {
+    if ([tid] in bored) continue
+
+    patience = time() - backtime[tid]
+    if (patience >= boredom) {
+      printf ("thread %d (%s) impatient after %d %s\n",
+              tid, name[tid], patience, time_name)
+      print_stack (back[tid])
+      printf ("\n")
+      bored[tid] = 1 # defer further reports to wakeup
+    }
+  }
+}
diff --git a/testsuite/systemtap.examples/process/sleeptime.meta b/testsuite/systemtap.examples/process/sleeptime.meta
new file mode 100644
index 00000000..d6c59345
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sleeptime.meta
@@ -0,0 +1,13 @@
+title: Trace Time Spent in nanosleep Syscalls
+name: sleeptime.stp
+version: 1.0
+author: Daniel Berrange and Will Cohen
+keywords: syscall sleep
+subsystem: syscall
+status: production
+exit: user-controlled
+output: trace
+scope: system-wide
+description: The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.
+test_check: stap -p4 sleeptime.stp
+test_installcheck: stap sleeptime.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/sleeptime.stp b/testsuite/systemtap.examples/process/sleeptime.stp
new file mode 100755
index 00000000..b5729ceb
--- /dev/null
+++ b/testsuite/systemtap.examples/process/sleeptime.stp
@@ -0,0 +1,62 @@
+#! /usr/bin/env stap
+
+/*
+ * Copyright (C) 2006-2007 Red Hat Inc.
+ * 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Print out the amount of time spent in the nanosleep and compat_nanosleep
+ * systemcalls. This can help find which processes are waking based on time
+ * rather than some real event than needs to be handled.
+ *
+ * Format is:
+ * 12799538 3389 (xchat) nanosleep: 9547
+ * 12846944 2805 (NetworkManager) nanosleep: 100964
+ * 12947924 2805 (NetworkManager) nanosleep: 100946
+ * 13002925 4757 (sleep) nanosleep: 13000717
+ */
+
+global start
+global entry_nanosleep
+
+function timestamp:long() {
+  return gettimeofday_us() - start
+}
+
+function proc:string() {
+  return sprintf("%d (%s)", pid(), execname())
+}
+
+probe begin {
+ start = gettimeofday_us()
+}
+
+probe syscall.nanosleep {
+  t = gettimeofday_us(); p = pid()
+  entry_nanosleep[p] = t
+}
+
+probe syscall.nanosleep.return {
+  t = gettimeofday_us(); p = pid()
+  elapsed_time = t - entry_nanosleep[p]
+  printf("%d %s nanosleep: %d\n",  timestamp(), proc(), elapsed_time)
+  delete entry_nanosleep[p]
+}
+
+probe syscall.compat_nanosleep ? {
+  t = gettimeofday_us(); p = pid()
+  entry_nanosleep[p] = t
+}
+
+probe syscall.compat_nanosleep.return ? {
+  t = gettimeofday_us(); p = pid()
+  elapsed_time = t - entry_nanosleep[p]
+  printf("%d %s compat_nanosleep: %d\n",  timestamp(), proc(), elapsed_time)
+  delete entry_nanosleep[p]
+}
diff --git a/testsuite/systemtap.examples/process/syscalls_by_pid.meta b/testsuite/systemtap.examples/process/syscalls_by_pid.meta
new file mode 100644
index 00000000..590652b3
--- /dev/null
+++ b/testsuite/systemtap.examples/process/syscalls_by_pid.meta
@@ -0,0 +1,13 @@
+title: System-Wide Count of Syscalls by PID
+name: syscalls_by_pid.stp
+version: 1.0
+author: anonymous
+keywords: syscall
+subsystem: syscall
+status: production
+exit: user-controlled
+output: sorted-list on-exit
+scope: system-wide
+description: The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.
+test_check: stap -p4 syscalls_by_pid.stp
+test_installcheck: stap syscalls_by_pid.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/syscalls_by_pid.stp b/testsuite/systemtap.examples/process/syscalls_by_pid.stp
new file mode 100755
index 00000000..47aa4955
--- /dev/null
+++ b/testsuite/systemtap.examples/process/syscalls_by_pid.stp
@@ -0,0 +1,28 @@
+#! /usr/bin/env stap
+
+# Copyright (C) 2006 IBM Corp.
+#
+# This file is part of systemtap, and is free software.  You can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License (GPL); either version 2, or (at your option) any
+# later version.
+
+#
+# Print the system call count by process ID in descending order.
+#
+
+global syscalls
+
+probe begin {
+	print ("Collecting data... Type Ctrl-C to exit and display results\n")
+}
+
+probe syscall.* {
+	syscalls[pid()]++
+}
+
+probe end {
+	printf ("%-10s %-s\n", "#SysCalls", "PID")
+	foreach (pid in syscalls-)
+		printf("%-10d %-d\n", syscalls[pid], pid)
+}
diff --git a/testsuite/systemtap.examples/process/syscalls_by_pid.txt b/testsuite/systemtap.examples/process/syscalls_by_pid.txt
new file mode 100644
index 00000000..4943a139
--- /dev/null
+++ b/testsuite/systemtap.examples/process/syscalls_by_pid.txt
@@ -0,0 +1,35 @@
+# stap syscalls_by_pid.stp
+Collecting data... Type Ctrl-C to exit and display results
+^C
+#SysCalls  PID
+2293       31866
+765        31081
+567        30983
+557        30965
+554        31008
+523        30985
+273        30991
+118        9585
+115        2130
+77         30928
+65         1988
+50         31006
+42         2492
+40         31077
+36         2487
+35         2490
+23         2257
+22         2366
+20         8682
+20         2048
+17         31197
+16         31067
+14         2313
+10         31011
+8          1
+5          31074
+3          1978
+3          1975
+3          2467
+3          30932
+
diff --git a/testsuite/systemtap.examples/process/syscalls_by_proc.meta b/testsuite/systemtap.examples/process/syscalls_by_proc.meta
new file mode 100644
index 00000000..79aa3e87
--- /dev/null
+++ b/testsuite/systemtap.examples/process/syscalls_by_proc.meta
@@ -0,0 +1,13 @@
+title: System-Wide Count of Syscalls by Executable
+name: syscalls_by_proc.stp
+version: 1.0
+author: anonymous
+keywords: syscall
+subsystem: syscall
+status: production
+exit: user-controlled
+output: sorted-list on-exit
+scope: system-wide
+description: The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.
+test_check: stap -p4 syscalls_by_proc.stp
+test_installcheck: stap syscalls_by_proc.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/syscalls_by_proc.stp b/testsuite/systemtap.examples/process/syscalls_by_proc.stp
new file mode 100755
index 00000000..af7d6932
--- /dev/null
+++ b/testsuite/systemtap.examples/process/syscalls_by_proc.stp
@@ -0,0 +1,28 @@
+#! /usr/bin/env stap
+
+# Copyright (C) 2006 IBM Corp.
+#
+# This file is part of systemtap, and is free software.  You can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License (GPL); either version 2, or (at your option) any
+# later version.
+
+#
+# Print the system call count by process name in descending order.
+#
+
+global syscalls
+
+probe begin {
+        print ("Collecting data... Type Ctrl-C to exit and display results\n")
+}
+
+probe syscall.* {
+	syscalls[execname()]++
+}
+
+probe end {
+	printf ("%-10s %-s\n", "#SysCalls", "Process Name")
+	foreach (proc in syscalls-)
+		printf("%-10d %-s\n", syscalls[proc], proc)
+}
diff --git a/testsuite/systemtap.examples/process/syscalls_by_proc.txt b/testsuite/systemtap.examples/process/syscalls_by_proc.txt
new file mode 100644
index 00000000..dd554083
--- /dev/null
+++ b/testsuite/systemtap.examples/process/syscalls_by_proc.txt
@@ -0,0 +1,58 @@
+# stap syscalls_by_proc.stp
+Collecting data... Type Ctrl-C to exit and display results
+^C
+#SysCalls  Process Name
+53832      make
+15275      sh
+6764       staprun
+2291       gcc
+2225       mixer_applet2
+1638       gnome-settings-
+1603       gnome-panel
+1577       rm
+1567       nautilus
+1557       trashapplet
+1443       cat
+1404       sshd
+1207       cc1
+779        ls
+764        gnome-vfs-daemo
+638        bash
+610        collect2
+356        mkdir
+354        artsd
+340        hald-addon-stor
+338        hidd
+280        ld
+260        irqbalance
+238        xterm
+212        automount
+182        sed
+176        as
+141        dnsdomainname
+130        date
+129        cmp
+124        clock-applet
+122        nm-applet
+104        grep
+88         hostname
+75         whoami
+70         rpc.idmapd
+68         httpd
+68         python
+61         gam_server
+56         pam_timestamp_c
+53         wc
+49         sendmail
+46         echo
+40         tail
+39         expr
+37         uname
+35         pam-panel-icon
+24         init
+17         mapping-daemon
+9          syslogd
+3          klogd
+3          hald
+3          gconfd-2
+1          cupsd
diff --git a/testsuite/systemtap.examples/process/syscalltimes b/testsuite/systemtap.examples/process/syscalltimes
new file mode 100755
index 00000000..84ca77a9
--- /dev/null
+++ b/testsuite/systemtap.examples/process/syscalltimes
@@ -0,0 +1,248 @@
+#!/bin/bash
+
+# Syscalltimes systemtap script
+# Copyright (C) 2007 IBM Corp.
+#
+# This file is part of systemtap, and is free software.  You can
+# redistribute it and/or modify it under the terms of the GNU General
+# Public License (GPL); either version 2, or (at your option) any
+# later version.
+
+###
+### syscalltime - Combination shell/systemtap script to measure system call
+###               counts and times.  Can be filtered by process IDs, process
+###               names and users.
+###
+
+# Filter options
+F_PIDSTR="";  F_PID=0   # Filter by process ID
+F_EXECSTR=""; F_EXEC=0  # Filter by process name
+F_UIDSTR="";  F_UID=0   # Filter by user
+FILTER=0                # Any filters specified?
+
+# Print options
+P_TOTALS=0              # Print totals
+P_VERBOSE_STR=""        # Print verbose build output
+
+DELIM=","
+
+function usage {
+	echo "USAGE: syscalltimes [-n pname]... [-p pid]... [-u username]..."
+	echo "                    [-v]... [-t] [-h]"
+	echo "    -n pname     # filter by this process name"
+	echo "    -p pid       # filter by this process ID"
+	echo "    -u username  # filter by this user"
+	echo "    -t           # print totals (default with filters: OFF"
+	echo "                                 default without filters: ON)"
+	echo "    -v           # print verbose output during SystemTap module creation"
+	echo "    -h           # print this help text"
+	echo ""
+	echo "NOTE: This script can take long time to build. Use -v[vv] to monitor"
+	echo "      the module creation and build process."
+}
+
+# Process options
+while getopts n:p:u:vth option; do
+	case $option in
+	n)	let "F_EXEC++"
+		F_EXECSTR=$OPTARG$DELIM$F_EXECSTR ;;
+
+	p)	let "F_PID++"
+		F_PIDSTR=$OPTARG$DELIM$F_PIDSTR ;;
+
+	u)	uid=`awk -F: '$1 == name {print $3}' name=$OPTARG /etc/passwd`
+		if [[ $uid != "" ]]; then
+			let "F_UID++"
+			F_UIDSTR=$uid$DELIM$F_UIDSTR
+		else
+			echo "ERROR: Unknown user:" $OPTARG
+			let "ERROR++"
+		fi ;;
+
+	v)	P_VERBOSE_STR="-v "$P_VERBOSE_STR ;;
+
+	t)	P_TOTALS=1 ;;
+
+	h|?|*)  usage
+		exit 1 ;;
+	esac
+done
+
+if [[ $ERROR > 0 ]]; then
+	exit 1
+fi
+
+if [[ $F_EXEC > 0 || $F_PID > 0 || $F_UID > 0 ]]; then
+	FILTER=1
+fi
+
+echo "Creating and building SystemTap module..."
+
+#
+# SystemTap script
+#
+stap $P_VERBOSE_STR -e '
+global start, timebycall, timebypid, timebyuid, timebyexec
+global f_exec_str, f_pid_str, f_uid_str
+global f_exec, f_pid, f_uid
+global prt_totals, filter_str
+
+probe begin {
+	printf("Collecting data - type Ctrl-C to print output and exit...\n")
+	
+	# If no filters specified, skip filter processing
+	if ('$FILTER' == 0) {
+		filter_str = " (unfiltered)"
+		prt_totals = 1  // On by default if no filtering
+		next
+	} else
+		filter_str = " (filtered)"
+
+	prt_totals   = '$P_TOTALS'
+	f_exec_str   = "'$F_EXECSTR'"
+	f_pid_str    = "'$F_PIDSTR'"
+	f_uid_str    = "'$F_UIDSTR'"
+
+	delim = "'$DELIM'"
+
+	# Process names
+	if ('$F_EXEC') {
+		pname = tokenize(f_exec_str, delim)
+		while (pname != "") {
+			f_exec[pname] = 1
+			pname = tokenize("", delim)
+		}
+	}
+
+	# Process IDs
+	if ('$F_PID') {
+		pid = tokenize(f_pid_str, delim)
+		while (pid != "") {
+			f_pid[strtol(pid, 10)] = 1
+			pid = tokenize("", delim)
+		}
+	}
+
+	# User IDs
+	if ('$F_UID') {
+		uid = tokenize(f_uid_str, delim)
+		while (uid != "") {
+			f_uid[strtol(uid, 10)] = 1
+			uid = tokenize("", delim)
+		}
+	}
+}
+
+probe syscall.* {
+	start[name, tid()] = gettimeofday_ns()
+}
+
+probe syscall.*.return {
+	# Skip if we have not seen this before
+	if (!([name, tid()] in start)) next
+
+	delta = gettimeofday_ns() - start[name, tid()]
+
+	# Check filters
+	if ('$FILTER') {
+		target = 0
+		if (pid() in f_pid) {
+			timebypid[name, pid()] <<< delta
+			target = 1
+		}
+		if (uid() in f_uid) {
+			timebyuid[name, uid()] <<< delta
+			target = 1
+		}
+		if (execname() in f_exec) {
+			timebyexec[name, execname()] <<< delta
+			target = 1
+		}
+	} else
+		target = 1
+
+	# Totals
+	if (target && prt_totals)
+		timebycall[name] <<< delta
+
+	delete start[name, tid()]
+}
+
+function print_header() {
+	printf("%22s %10s %12s %12s %12s %12s\n",
+	       "System Call", "Count", "Total ns",
+	       "Avg ns", "Min ns", "Max ns")
+}
+
+probe end {
+	if (prt_totals) {
+		printf("\nTimes for all processes%s:\n\n", filter_str)
+		print_header()
+		foreach (call in timebycall)
+			printf("%22s %10d %12d %12d %12d %12d\n", call,
+			       @count(timebycall[call]),
+			       @sum(timebycall[call]),
+			       @avg(timebycall[call]),
+		               @min(timebycall[call]),
+			       @max(timebycall[call]))
+	}
+
+	if ('$F_PID') {
+		curpid = -1
+		foreach ([call, pid-] in timebypid) {
+			if (curpid != pid) {
+				curpid = pid
+				printf("\nTimes for process ID %d:\n\n", curpid)
+				print_header()
+			}
+			printf("%22s %10d %12d %12d %12d %12d\n", call,
+			       @count(timebypid[call, pid]),
+			       @sum(timebypid[call, pid]),
+			       @avg(timebypid[call, pid]),
+			       @min(timebypid[call, pid]),
+			       @max(timebypid[call, pid]))
+		}
+		printf("\n")
+	}
+
+	if ('$F_EXEC') {
+		curexec = ""
+		foreach ([call, exec-] in timebyexec) {
+			if (curexec != exec) {
+				curexec = exec
+				printf("\nTimes for process name %s:\n\n", curexec)
+				print_header()
+			}
+			printf("%22s %10d %12d %12d %12d %12d\n", call,
+			       @count(timebyexec[call, exec]),
+			       @sum(timebyexec[call, exec]),
+			       @avg(timebyexec[call, exec]),
+			       @min(timebyexec[call, exec]),
+			       @max(timebyexec[call, exec]))
+		}
+		printf("\n")
+	}
+
+	if ('$F_UID') {
+		curuid = -1
+		foreach ([call, uid-] in timebyuid) {
+			if (curuid != uid) {
+				curuid = uid
+				printf("\nTimes for user ID %d:\n\n", curuid)
+				print_header()
+			}
+			printf("%22s %10d %12d %12d %12d %12d\n", call,
+			       @count(timebyuid[call, uid]),
+			       @sum(timebyuid[call, uid]),
+			       @avg(timebyuid[call, uid]),
+			       @min(timebyuid[call, uid]),
+			       @max(timebyuid[call, uid]))
+		}
+		printf("\n")
+	}
+
+	delete timebycall
+	delete timebypid
+	delete timebyuid
+	delete timebyexec
+}'
diff --git a/testsuite/systemtap.examples/process/syscalltimes.txt b/testsuite/systemtap.examples/process/syscalltimes.txt
new file mode 100644
index 00000000..d50f73ad
--- /dev/null
+++ b/testsuite/systemtap.examples/process/syscalltimes.txt
@@ -0,0 +1,155 @@
+# ./syscalltimes -h
+USAGE: syscalltimes [-n pname]... [-p pid]... [-u username]...
+                    [-v]... [-t] [-h]
+    -n pname     # filter by this process name
+    -p pid       # filter by this process ID
+    -u username  # filter by this user
+    -t           # print totals (default with filters: OFF
+                                 default without filters: ON)
+    -v           # print verbose output during SystemTap module creation
+    -h           # print this help text
+
+NOTE: This script can take long time to build. Use -v[vv] to monitor
+      the module creation and build process.
+
+
+# ./syscalltimes -n top -n vi
+Creating and building SystemTap module...
+Collecting data - type Ctrl-C to print output and exit...
+
+Times for process name vi:
+
+           System Call      Count     Total ns       Avg ns       Min ns       Max ns
+                access          4        59169        14792         7770        27556
+        rt_sigprocmask          6        32879         5479         5328         6132
+          rt_sigaction         22       119127         5414         5291         6293
+                select         15   1605144751    107009650         7386   1117677549
+               sysinfo          1        13178        13178        13178        13178
+                 lseek          2        12869         6434         6331         6538
+                getuid          3        16839         5613         5468         5757
+             getrlimit          1         5558         5558         5558         5558
+                munmap          8       103326        12915         9689        19190
+                getpid          1         5639         5639         5639         5639
+                unlink          3       143502        47834        20291        97191
+            arch_prctl          1         6296         6296         6296         6296
+                 chdir          6        58086         9681         7213        16062
+                getcwd          9        81327         9036         6820        17583
+                  read         28       341507        12196         6007        54806
+                 fcntl          4        23418         5854         5478         6459
+           sigaltstack          1         5845         5845         5845         5845
+              mprotect         13       130272        10020         8255        17130
+                statfs          1        10223        10223        10223        10223
+                 fstat         20       118660         5933         5446         7050
+              readlink          1        17884        17884        17884        17884
+            readlinkat          1         7889         7889         7889         7889
+                socket          2        24932        12466         8090        16842
+                  stat         13       120911         9300         7376        19549
+                 ioctl         19       135172         7114         5504        11711
+                execve          1       262658       262658       262658       262658
+                 write         15       382744        25516         8391       136359
+                 uname          1         6772         6772         6772         6772
+                 close         30       210468         7015         5478        12543
+                fchdir          6        34269         5711         5496         6185
+                  open         31       474649        15311         7807        54475
+                 chmod          1        12865        12865        12865        12865
+                   brk          6        48116         8019         5782        10240
+                 lstat          2        15369         7684         7334         8035
+               connect          2        29287        14643        10616        18671
+
+Times for process name top:
+
+           System Call      Count     Total ns       Avg ns       Min ns       Max ns
+            arch_prctl          1         6424         6424         6424         6424
+                 fcntl         97       607311         6260         5170        10873
+                  read        970     12341710        12723         5574       446707
+                 lseek         11        66250         6022         5481         7165
+          rt_sigaction         71       380049         5352         5255         6374
+                access          5        66406        13281         8942        24323
+                select          3   6385526578   2128508859    499261647   2999551597
+              getdents         21       889837        42373         6386        73490
+                getuid          1         5494         5494         5494         5494
+                munmap         15       174255        11617         8872        17670
+                 write         10      2309851       230985        16248      2006254
+                 uname          1        10474        10474        10474        10474
+                 close        932      5749946         6169         5348        21248
+                 ioctl         14       122233         8730         5824        14243
+                execve          1       261447       261447       261447       261447
+                   brk          4        26527         6631         5493         8285
+               connect          2        28533        14266        10756        17777
+                  open        934      9289314         9945         8473        30315
+              mprotect         10        97990         9799         8295        14636
+                  stat        455      3834994         8428         7920        26084
+                socket          2        21980        10990         8990        12990
+                 fstat         26       150418         5785         5426         7127
+                 alarm         90       536017         5955         5543        11487
+
+
+# ./syscalltimes -v
+Creating and building SystemTap module...
+Pass 1: parsed user script and 42 library script(s) in 200usr/10sys/218real ms.
+Pass 2: analyzed script: 768 probe(s), 15 function(s), 15 embed(s), 13 global(s) in 35870usr/140sys/36036real ms.
+Pass 3: using cached /root/.systemtap/cache/d5/stap_d5fcd430388d4f4a30f63d03aaa3eb80_392196.c
+Pass 4: using cached /root/.systemtap/cache/d5/stap_d5fcd430388d4f4a30f63d03aaa3eb80_392196.ko
+Pass 5: starting run.
+Collecting data - type Ctrl-C to print output and exit...
+
+Times for all processes (unfiltered):
+
+           System Call      Count     Total ns       Avg ns       Min ns       Max ns
+                writev        681      6526983         9584         6807        18709
+                 write        421      4367057        10373         6424        52077
+                 uname         15        98071         6538         6336         6787
+                 close        459      9528659        20759         5265      1346856
+     inotify_add_watch         17       164258         9662         8000        17280
+                 ioctl       1205     28994711        24062         5211      2928218
+                execve         12      2148953       179079        10195       280392
+                   brk        309      2400150         7767         5383        23454
+                 lstat          5        43864         8772         7938        10426
+               connect         24       352784        14699        10679        25868
+               getppid         12        71219         5934         5812         6123
+                 wait4         24     20952033       873001         5664      3387688
+                  open        377     22181286        58836         8819      3011655
+                  dup2         18       109197         6066         5865         6403
+                  bind          3        25322         8440         8263         8759
+                  poll       1034  36509105361     35308612         5499   1999784046
+                getgid         12        65851         5487         5335         5667
+         compat_execve         12      3012173       251014       182782       472356
+              mprotect        150      1434021         9560         7854        13812
+          gettimeofday         10        60416         6041         5238         7429
+               recvmsg          9       116065        12896         6889        37388
+              readlink         12       638216        53184        46337        64203
+            readlinkat         12       530499        44208        37794        55136
+                  stat        140      1244798         8891         6702        17331
+                socket         39       435318        11162         7642        16694
+           getsockname          3        18899         6299         6198         6443
+                statfs          6        62737        10456        10311        10671
+                 fstat        238      1400126         5882         5502        12739
+               geteuid         12        73475         6122         5248        14048
+                 readv         27       349998        12962         7150        21210
+            arch_prctl         21       135320         6443         6231         6832
+             nanosleep         28   8927802107    318850075    150954837   2001911237
+                 futex        595   8755563465     14715232         5431   1000945645
+                  read       2586   5154654212      1993292         5622   4985306501
+               getpgrp         12        67137         5594         5469         5740
+                 fcntl         51       289553         5677         5353         6835
+                  pipe         12       122220        10185         8771        13959
+             setitimer        159      1004756         6319         5551         8776
+                 lseek          4        24304         6076         5900         6253
+                 mmap2         19       182403         9600         7496        13574
+                access        105      1220874        11627         8077        33600
+          rt_sigreturn         93       665180         7152         5541         8265
+          rt_sigaction        171       967575         5658         5278        18684
+        rt_sigprocmask        132       760337         5760         5273        14170
+         clock_gettime        151       997395         6605         5275         9090
+                 pread        192      2387721        12436         5679        43553
+                select        925  24357064459     26331961         6669   2861600879
+               getegid         12        63624         5302         5200         5466
+                getpid         12        66761         5563         5348         5701
+                getuid         12        67112         5592         5483         5790
+                sendto          3        54766        18255        17541        19501
+                munmap        116      1432698        12350         8634        48526
+              getdents          6        57855         9642         6248        13313
+                 times         10        59281         5928         5514         6617
+                 ppoll         24   4799366329    199973597    199872030    200070128
+Pass 5: run completed in 20usr/90sys/8215real ms.
+
diff --git a/testsuite/systemtap.examples/process/wait4time.meta b/testsuite/systemtap.examples/process/wait4time.meta
new file mode 100644
index 00000000..a939d466
--- /dev/null
+++ b/testsuite/systemtap.examples/process/wait4time.meta
@@ -0,0 +1,13 @@
+title: Trace Time Spent in wait4 Syscalls
+name: wait4time.stp
+version: 1.0
+author: Daniel Berrange and Will Cohen
+keywords: syscall wait4
+subsystem: syscall
+status: production
+exit: user-controlled
+output: trace
+scope: system-wide
+description: The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".
+test_check: stap -p4 wait4time.stp
+test_installcheck: stap wait4time.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/process/wait4time.stp b/testsuite/systemtap.examples/process/wait4time.stp
new file mode 100755
index 00000000..ba300ea7
--- /dev/null
+++ b/testsuite/systemtap.examples/process/wait4time.stp
@@ -0,0 +1,59 @@
+#! /usr/bin/env stap
+
+/*
+ * Copyright (C) 2006-2007 Red Hat Inc.
+ * 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.2.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Print out the amount of time spent in the read and write systemcall
+ * when a process closes each file is closed. Note that the script needs
+ * to be running before the open operations occur for the script
+ * to record data.
+ *
+ * Format is:
+ * timestamp pid (executabable) wait4: time_us pid
+ *
+ * 155789807 4196 (ssh) wait4: 12 4197
+ * 158270531 3215 (bash) wait4: 5410460 -1
+ * 158270659 3215 (bash) wait4: 9 -1
+ * 158557461 2614 (sendmail) wait4: 27 -1
+ * 158557487 2614 (sendmail) wait4: 5 -1
+ *
+ */
+
+global start
+global entry_wait4
+global wait4_pid
+
+function timestamp:long() {
+  return gettimeofday_us() - start
+}
+
+function proc:string() {
+  return sprintf("%d (%s)", pid(), execname())
+}
+
+probe begin {
+ start = gettimeofday_us()
+}
+
+probe syscall.wait4 {
+  t = gettimeofday_us(); p = pid()
+  entry_wait4[p] = t
+  wait4_pid[p]=pid
+}
+
+probe syscall.wait4.return {
+  t = gettimeofday_us(); p = pid()
+  elapsed_time = t - entry_wait4[p]
+  printf("%d %s wait4: %d %d\n",  timestamp(), proc(), elapsed_time,
+	wait4_pid[p])
+  delete entry_wait4[p]
+  delete wait4_pid[p]
+}
diff --git a/testsuite/systemtap.examples/profiling/functioncallcount.meta b/testsuite/systemtap.examples/profiling/functioncallcount.meta
new file mode 100644
index 00000000..4d419528
--- /dev/null
+++ b/testsuite/systemtap.examples/profiling/functioncallcount.meta
@@ -0,0 +1,13 @@
+title: Count Times Functions Called
+name: functioncallcount.stp
+version: 1.0
+author: anonymous
+keywords: profiling functions
+subsystem: kernel
+status: production
+exit: user-controlled
+output: sorted-list on-exit
+scope: system-wide
+description: The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.
+test_check: stap -p4 functioncallcount.stp "*@mm/*.c"
+test_installcheck: stap  functioncallcount.stp "*@mm/*.c" -c "sleep 1"
diff --git a/testsuite/systemtap.examples/profiling/functioncallcount.stp b/testsuite/systemtap.examples/profiling/functioncallcount.stp
new file mode 100644
index 00000000..e393b612
--- /dev/null
+++ b/testsuite/systemtap.examples/profiling/functioncallcount.stp
@@ -0,0 +1,17 @@
+# The following line command will probe all the functions
+# in kernel's memory management code:
+#
+# stap  functioncallcount.stp "*@mm/*.c"
+
+probe kernel.function(@1) {  # probe functions listed on commandline
+  called[probefunc()] <<< 1  # add a count efficiently
+}
+
+global called
+
+probe end {
+  foreach (fn in called-)  # Sort by call count (in decreasing order)
+  #       (fn+ in called)  # Sort by function name
+    printf("%s %d\n", fn, @count(called[fn]))
+  exit()
+}
diff --git a/testsuite/systemtap.examples/profiling/thread-times.meta b/testsuite/systemtap.examples/profiling/thread-times.meta
new file mode 100644
index 00000000..fcbf062e
--- /dev/null
+++ b/testsuite/systemtap.examples/profiling/thread-times.meta
@@ -0,0 +1,13 @@
+title: Profile kernel functions
+name: thread-times.stp
+version: 1.0
+author: anonymous
+keywords: profiling
+subsystem: kernel
+status: production
+exit: user-controlled
+output: sorted-list
+scope: system-wide
+description: The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.
+test_check: stap -p4 thread-times.stp
+test_installcheck: stap thread-times.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/profiling/thread-times.stp b/testsuite/systemtap.examples/profiling/thread-times.stp
new file mode 100644
index 00000000..1aeb2037
--- /dev/null
+++ b/testsuite/systemtap.examples/profiling/thread-times.stp
@@ -0,0 +1,32 @@
+#! /usr/bin/stap
+
+probe timer.profile {
+   tid=tid()
+   if (!user_mode())
+      kticks[tid] <<< 1
+   else
+      uticks[tid] <<< 1
+   ticks <<< 1
+   tids[tid] <<< 1
+}
+
+global uticks, kticks, ticks
+
+global tids
+
+probe timer.s(5), end {
+   allticks = @count(ticks)
+   printf ("%5s %7s %7s (of %d ticks)\n", "tid", "%user", "%kernel", allticks)
+   foreach (tid in tids- limit 20) {
+     uscaled = @count(uticks[tid])*10000/allticks
+     kscaled = @count(kticks[tid])*10000/allticks
+     printf ("%5d %3d.%02d%% %3d.%02d%%\n",
+       tid, uscaled/100, uscaled%100, kscaled/100, kscaled%100)
+   }
+   printf("\n")
+
+   delete uticks
+   delete kticks
+   delete ticks
+   delete tids
+}
diff --git a/testsuite/systemtap.examples/sig_by_pid.meta b/testsuite/systemtap.examples/sig_by_pid.meta
deleted file mode 100644
index 03b02fba..00000000
--- a/testsuite/systemtap.examples/sig_by_pid.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title:  Signal Counts by Process ID
-name: sig_by_pid.stp
-version: 1.0
-author: IBM
-keywords: signals
-subsystem: signals
-status: experimental
-exit: user-controlled
-output: sorted-list on-exit
-scope: system-wide
-description: Print signal counts by process ID in descending order.
-test_check: stap -p4 sig_by_pid.stp
-test_installcheck: stap sig_by_pid.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/sig_by_pid.stp b/testsuite/systemtap.examples/sig_by_pid.stp
deleted file mode 100755
index 9c1493f5..00000000
--- a/testsuite/systemtap.examples/sig_by_pid.stp
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env stap
-
-# Copyright (C) 2006 IBM Corp.
-#
-# This file is part of systemtap, and is free software.  You can
-# redistribute it and/or modify it under the terms of the GNU General
-# Public License (GPL); either version 2, or (at your option) any
-# later version.
-
-#
-# Print signal counts by process IDs in descending order.
-#
-
-global sigcnt, pid2name, sig2name
-
-probe begin {
-	print("Collecting data... Type Ctrl-C to exit and display results\n")
-}
-
-probe signal.send 
-{
-	snd_pid = pid()
-	rcv_pid = sig_pid
-
-	sigcnt[snd_pid, rcv_pid, sig]++
-
-	if (!(snd_pid in pid2name)) pid2name[snd_pid] = execname()
-	if (!(rcv_pid in pid2name)) pid2name[rcv_pid] = pid_name
-	if (!(sig in sig2name)) sig2name[sig] = sig_name 
-}
-
-probe end
-{
-	printf("%-8s %-16s %-5s %-16s %-16s %s\n",
-	       "SPID", "SENDER", "RPID", "RECEIVER", "SIGNAME", "COUNT")
-
-	foreach ([snd_pid, rcv_pid, sig_num] in sigcnt-) {
-		printf("%-8d %-16s %-5d %-16s %-16s %d\n", 
-		       snd_pid, pid2name[snd_pid], rcv_pid, pid2name[rcv_pid],
-		       sig2name[sig_num], sigcnt[snd_pid, rcv_pid, sig_num])
-	}
-}
diff --git a/testsuite/systemtap.examples/sig_by_pid.txt b/testsuite/systemtap.examples/sig_by_pid.txt
deleted file mode 100644
index 927b4607..00000000
--- a/testsuite/systemtap.examples/sig_by_pid.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# stap sig_by_pid.stp 
-Collecting data... Type Ctrl-C to exit and display results
-^C
-Collecting data... Type Ctrl-C to exit and display results
-SPID     SENDER           RPID  RECEIVER         SIGNAME          COUNT
-0        swapper          25273 Xvnc             SIGALRM          1576
-25273    Xvnc             25273 Xvnc             SIGALRM          17
-29219    firefox-bin      25273 Xvnc             SIGALRM          12
-0        swapper          2442  automount        SIGALRM          12
-26754    xterm            26756 bash             SIGWINCH         9
-0        swapper          2199  syslogd          SIGALRM          6
-25345    metacity         25273 Xvnc             SIGALRM          3
-2791     wclientd         2791  wclientd         SIGUSR1          2
-30385    ifconfig         30384 sh               SIGCHLD          1
-30384    sh               2802  wcstatusd        SIGCHLD          1
-30387    mii-tool         30386 sh               SIGCHLD          1
-30386    sh               2802  wcstatusd        SIGCHLD          1
-30388    lspci            2802  wcstatusd        SIGCHLD          1
-30389    sh               2802  wcstatusd        SIGCHLD          1
-30391    ifconfig         25273 Xvnc             SIGALRM          1
-30391    ifconfig         30390 sh               SIGCHLD          1
-30390    sh               2802  wcstatusd        SIGCHLD          1
-30393    mii-tool         30392 sh               SIGCHLD          1
-30392    sh               2802  wcstatusd        SIGCHLD          1
diff --git a/testsuite/systemtap.examples/sig_by_proc.meta b/testsuite/systemtap.examples/sig_by_proc.meta
deleted file mode 100644
index eea42be4..00000000
--- a/testsuite/systemtap.examples/sig_by_proc.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title:  Signal Counts by Process Name
-name: sig_by_proc.stp
-version: 1.0
-author: IBM
-keywords: signals
-subsystem: signals
-status: experimental
-exit: user-controlled
-output: sorted-list on-exit
-scope: system-wide
-description: Print signal counts by process name in descending order.
-test_check: stap -p4 sig_by_proc.stp
-test_installcheck: stap sig_by_proc.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/sig_by_proc.stp b/testsuite/systemtap.examples/sig_by_proc.stp
deleted file mode 100755
index ce845aed..00000000
--- a/testsuite/systemtap.examples/sig_by_proc.stp
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env stap
-
-# Copyright (C) 2006 IBM Corp.
-#
-# This file is part of systemtap, and is free software.  You can
-# redistribute it and/or modify it under the terms of the GNU General
-# Public License (GPL); either version 2, or (at your option) any
-# later version.
-
-#
-# Print signal counts by process name in descending order.
-#
-
-global sigcnt, sig2name
-
-probe begin {
-	print("Collecting data... Type Ctrl-C to exit and display results\n")
-}
-
-probe signal.send 
-{
-	sigcnt[execname(), pid_name, sig]++
-
-	if (!(sig in sig2name)) sig2name[sig] = sig_name 
-}
-
-probe end
-{
-	printf("%-16s %-16s %-16s %s\n",
-	       "SENDER", "RECEIVER", "SIGNAL", "COUNT")
-
-	foreach ([snd_name, rcv_name, sig_num] in sigcnt-)
-		printf("%-16s %-16s %-16s %d\n", 
-		       snd_name, rcv_name, sig2name[sig_num],
-		       sigcnt[snd_name, rcv_name, sig_num])
-}
diff --git a/testsuite/systemtap.examples/sig_by_proc.txt b/testsuite/systemtap.examples/sig_by_proc.txt
deleted file mode 100644
index d09da9fe..00000000
--- a/testsuite/systemtap.examples/sig_by_proc.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# stap sig_by_proc.stp 
-Collecting data... Type Ctrl-C to exit and display results
-^C
-SENDER           RECEIVER         SIGNAL           COUNT
-swapper          Xvnc             SIGALRM          448
-sh               wcstatusd        SIGCHLD          318
-ifconfig         sh               SIGCHLD          106
-mii-tool         sh               SIGCHLD          106
-lspci            wcstatusd        SIGCHLD          106
-automount        automount        SIGCHLD          14
-swapper          automount        SIGALRM          13
-swapper          syslogd          SIGALRM          7
-swapper          sendmail         SIGALRM          2
-sendmail         sendmail         SIGCHLD          2
-lspci            Xvnc             SIGALRM          2
-ifconfig         automount        SIGALRM          1
-sh               Xvnc             SIGALRM          1
-xterm            staprun          SIGINT           1
-xterm            stap             SIGINT           1
-
diff --git a/testsuite/systemtap.examples/sigkill.meta b/testsuite/systemtap.examples/sigkill.meta
deleted file mode 100644
index 57032224..00000000
--- a/testsuite/systemtap.examples/sigkill.meta
+++ /dev/null
@@ -1,14 +0,0 @@
-title: Track SIGKILL Signals
-name: sigkill.stp
-version: 1.0
-author: Red Hat
-keywords: signals
-subsystem: signals
-status: production
-exit: user-controlled
-output: trace
-scope: systemwide
-description: The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.
-arg_1: The name of the signal to look for on selected process.
-test_check: stap -p4 sigkill.stp
-test_installcheck: stap sigkill.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/sigkill.stp b/testsuite/systemtap.examples/sigkill.stp
deleted file mode 100644
index 8f754219..00000000
--- a/testsuite/systemtap.examples/sigkill.stp
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env stap
-# sigkill.stp
-# Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@redhat.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# /usr/share/systemtap/tapset/signal.stp:
-# [...]
-# probe signal.send = _signal.send.*
-# {
-# 	sig=$sig
-# 	sig_name = _signal_name($sig)
-# 	sig_pid = task_pid(task)
-# 	pid_name = task_execname(task)
-# [...]
-
-probe signal.send {
-	if (sig_name == "SIGKILL")
-		printf("%s was sent to %s (pid:%d) by %s uid:%d\n",
-				sig_name, pid_name, sig_pid, execname(), uid())
-}
diff --git a/testsuite/systemtap.examples/sigmon.meta b/testsuite/systemtap.examples/sigmon.meta
deleted file mode 100644
index 18834997..00000000
--- a/testsuite/systemtap.examples/sigmon.meta
+++ /dev/null
@@ -1,14 +0,0 @@
-title: System-Wide Count of Syscalls by PID
-name: syscalls_by_pid.stp
-version: 1.0
-author: IBM
-keywords: signals
-subsystem: signals
-status: experimental
-exit: user-controlled
-output: trace
-scope: pid
-description: The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.
-arg_1: The name of the signal to look for on selected process.
-test_check: stap -p4 sigmon.stp SIGKILL
-test_installcheck: stap sigmon.stp -c "sleep 1" SIGKILL
diff --git a/testsuite/systemtap.examples/sigmon.stp b/testsuite/systemtap.examples/sigmon.stp
deleted file mode 100755
index 31d7822e..00000000
--- a/testsuite/systemtap.examples/sigmon.stp
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/env stap
-
-# Copyright (C) 2006 IBM Corp.
-#
-# This file is part of systemtap, and is free software.  You can
-# redistribute it and/or modify it under the terms of the GNU General
-# Public License (GPL); either version 2, or (at your option) any
-# later version.
-
-#
-# Track when a specific process ID receives a specific signal.  For example,
-# when process ID 31994 receives a SIGKILL signal.
-#
-# Example command line: 
-#
-# 	stap -x 31994 sigmon.stp SIGKILL
-#
-# Example output: 
-#
-# 	SPID     SNAME            RPID  RNAME            SIGNUM SIGNAME
-# 	5609     bash             31994 find             9      SIGKILL 
-#
-
-probe begin
-{
-	printf("%-8s %-16s %-5s %-16s %6s %-16s\n",
-	       "SPID", "SNAME", "RPID", "RNAME", "SIGNUM", "SIGNAME")
-}
-
-probe signal.send 
-{
-	if (sig_name == @1 && sig_pid == target())
-		printf("%-8d %-16s %-5d %-16s %-6d %-16s\n", 
-			pid(), execname(), sig_pid, pid_name, sig, sig_name)
-}
diff --git a/testsuite/systemtap.examples/sleepingBeauties.meta b/testsuite/systemtap.examples/sleepingBeauties.meta
deleted file mode 100644
index 95e08361..00000000
--- a/testsuite/systemtap.examples/sleepingBeauties.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Generating Backtraces of Threads Waiting for IO Operations
-name: sleepingBeauties.stp
-version: 1.0
-author: anonymous
-keywords: io scheduler
-subsystem: scheduler
-status: production
-exit: user-controlled
-output: trace
-scope: system-wide
-description: The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.
-test_check: stap -p4 sleepingBeauties.stp
-test_installcheck: stap sleepingBeauties.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/sleepingBeauties.stp b/testsuite/systemtap.examples/sleepingBeauties.stp
deleted file mode 100644
index 64c563a3..00000000
--- a/testsuite/systemtap.examples/sleepingBeauties.stp
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/stap
-
-function time () { return gettimeofday_ms() }
-global time_name = "ms"
-global boredom = 10 # in time units
-global name, back, backtime, bored
-
-/* Note: the order that the probes are listed should not matter.
-   However, the following order for
-   probe kernel.function("wait_for_completion").return and
-   probe kernel.function("wait_for_completion").call
-   avoids have the kretprobe stuff in the backtrace.
-   for more information see:
-   http://sources.redhat.com/bugzilla/show_bug.cgi?id=6436
-*/
-
-
-probe kernel.function("wait_for_completion").return
-{
-  t=tid()
-
-  if ([t] in bored) {
-    patience = time() - backtime[t]
-    printf ("thread %d (%s) bored for %d %s\n", 
-            t, name[t], patience, time_name)
-  }
-
-  delete bored[t]
-  delete back[t]
-  delete name[t]
-  delete backtime[t]
-}
-
-
-probe kernel.function("wait_for_completion").call
-{ 
-  t=tid()
-  back[t]=backtrace()
-  name[t]=execname()
-  backtime[t]=time()
-  delete bored[t]
-}
-
-
-probe timer.profile {
-  foreach (tid+ in back) {
-    if ([tid] in bored) continue
-
-    patience = time() - backtime[tid]
-    if (patience >= boredom) {
-      printf ("thread %d (%s) impatient after %d %s\n",
-              tid, name[tid], patience, time_name)
-      print_stack (back[tid])
-      printf ("\n")
-      bored[tid] = 1 # defer further reports to wakeup
-    }
-  }
-}
diff --git a/testsuite/systemtap.examples/sleeptime.meta b/testsuite/systemtap.examples/sleeptime.meta
deleted file mode 100644
index d6c59345..00000000
--- a/testsuite/systemtap.examples/sleeptime.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Trace Time Spent in nanosleep Syscalls
-name: sleeptime.stp
-version: 1.0
-author: Daniel Berrange and Will Cohen
-keywords: syscall sleep
-subsystem: syscall
-status: production
-exit: user-controlled
-output: trace
-scope: system-wide
-description: The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.
-test_check: stap -p4 sleeptime.stp
-test_installcheck: stap sleeptime.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/sleeptime.stp b/testsuite/systemtap.examples/sleeptime.stp
deleted file mode 100755
index b5729ceb..00000000
--- a/testsuite/systemtap.examples/sleeptime.stp
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /usr/bin/env stap
-
-/*
- * Copyright (C) 2006-2007 Red Hat Inc.
- * 
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Print out the amount of time spent in the nanosleep and compat_nanosleep
- * systemcalls. This can help find which processes are waking based on time
- * rather than some real event than needs to be handled.
- *
- * Format is:
- * 12799538 3389 (xchat) nanosleep: 9547
- * 12846944 2805 (NetworkManager) nanosleep: 100964
- * 12947924 2805 (NetworkManager) nanosleep: 100946
- * 13002925 4757 (sleep) nanosleep: 13000717
- */
-
-global start
-global entry_nanosleep
-
-function timestamp:long() {
-  return gettimeofday_us() - start
-}
-
-function proc:string() {
-  return sprintf("%d (%s)", pid(), execname())
-}
-
-probe begin {
- start = gettimeofday_us()
-}
-
-probe syscall.nanosleep {
-  t = gettimeofday_us(); p = pid()
-  entry_nanosleep[p] = t
-}
-
-probe syscall.nanosleep.return {
-  t = gettimeofday_us(); p = pid()
-  elapsed_time = t - entry_nanosleep[p]
-  printf("%d %s nanosleep: %d\n",  timestamp(), proc(), elapsed_time)
-  delete entry_nanosleep[p]
-}
-
-probe syscall.compat_nanosleep ? {
-  t = gettimeofday_us(); p = pid()
-  entry_nanosleep[p] = t
-}
-
-probe syscall.compat_nanosleep.return ? {
-  t = gettimeofday_us(); p = pid()
-  elapsed_time = t - entry_nanosleep[p]
-  printf("%d %s compat_nanosleep: %d\n",  timestamp(), proc(), elapsed_time)
-  delete entry_nanosleep[p]
-}
diff --git a/testsuite/systemtap.examples/small_demos/ansi_colors.stp b/testsuite/systemtap.examples/small_demos/ansi_colors.stp
deleted file mode 100755
index 0d9d7c47..00000000
--- a/testsuite/systemtap.examples/small_demos/ansi_colors.stp
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/env stap
-
-probe begin {
-        printf("a \\ b |");
-	for (c = 40; c < 48; c++)
-		printf("   %d   ", c);
-	printf("\12");
-	for (l = 0; l < 71; l++)
-		printf("-");
-	printf("\12");
-
-	for (r = 30; r < 38; r++)
-		for (t = 0; t < 2; t++) {
-			printf("%d    |", r);
-			for (c = 40; c < 48; c++)
-				printf("\033[%d;%d%s %s \033[0;0m",
-					r, c, !t ? "m" : ";1m", !t ? "Normal" : "Bold  ");
-			printf("\12");
-		}
-	exit();
-}
diff --git a/testsuite/systemtap.examples/small_demos/click.wav b/testsuite/systemtap.examples/small_demos/click.wav
deleted file mode 100644
index 8214b229..00000000
Binary files a/testsuite/systemtap.examples/small_demos/click.wav and /dev/null differ
diff --git a/testsuite/systemtap.examples/small_demos/close.stp b/testsuite/systemtap.examples/small_demos/close.stp
deleted file mode 100755
index 7ba2a036..00000000
--- a/testsuite/systemtap.examples/small_demos/close.stp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env stap
-
-probe syscall.close {
-	printf("%s: %s(%s) = ", execname(), name, argstr)
-}
-
-probe syscall.close.return {
-	printf("%s\n", returnstr(returnp))
-}
-
-probe end {
-	printf("DONE\n")
-}
-
diff --git a/testsuite/systemtap.examples/small_demos/demo_script.txt b/testsuite/systemtap.examples/small_demos/demo_script.txt
deleted file mode 100644
index f3166a49..00000000
--- a/testsuite/systemtap.examples/small_demos/demo_script.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-> cd /root/systemtap
-
-A systemtap script can be as simple as a single line. For example,
-the following script places a probepoint on the kernel sys_read()
-function and prints all callers with the function's arguments.
-
->stap -e 'probe syscall.open {printf("%s: %s\n", execname(), argstr)}'
-
-Most scripts are a bit longer. (show top.stp)
-This script sets a probepoint on all kernel functions beginning with "sys_".
-When the probepoint is hit, it increments an entry in the map 
-(or associative array) "syscalls" with the key "probefunc()" which returns
-the name of the function that was triggered. For example, "sys_read".
-
-There is a timer that is triggered every 5000ms or 5 seconds. That timer
-calls the function print_top(). print_top() sorts the syscalls map
-and prints the top 20 entries. Then it clears the map.
-
-> ./top.stp
-
-(after stopping "top" go ahead and enter "./sys.stp". It takes a minute
-to load this script. Diplay the source in another window and talk 
-while it is loading.)
-
-The "top" script looked only at the functions called. If we want more 
-detail about the functions, we can use systemtap to examine their local 
-arguments and variables. However that would be difficult because each 
-system call has different parameters. The Syscall Tapset solves
-this problem. To use it, we set probe points using the syntax "syscall.name"
-instead of kernel.function("sys_name"). The Syscall Tapset provides three
-defined variables we can use:
-name - the name of the function
-argstr - on function entry, a formatted string containing the arguments
-retstr - on function exit, the return value and possibly error code
-
-In this example, we filter out programs named "staprun" because this is 
-part of the systemtap infrastructure. (It may be filtered out
-automatically in the future.)
-
-The next example shows how you can use systemtap to focus on
-specific programs or pids. (show prof.stp)
-
-Like the "top" example, this script places probes on all kernel
-functions starting with "sys_". Only the probepoint also checks to see
-if the tid/pid matches the one returned by "target()". We'll show how
-the target pid is set later.
-
-Unlike the previous examples, this script sets a probe point on all the 
-system call returns. When triggered, this probepoint computes the elapsed
-time since the function entry. 
-
-To run this script, we must give it a pid to use for the target, or a
-program to run, in which case target will be its pid.
-
->  ./prof.stp -c "top -n5"
-
---------------------------------
-
-Systemtap can also run in an unsafe mode where you can give
-it arbitrary C code to run at probepoints, or modify kernel variables
-and structures. This is very dangerous so only experts with root access will
-ever be permitted to do this.
-
-(show keyhack.stp)
-
-The next example will modify the local variable "keycode" in the "kdb_keycode"
-function in the kernel driver. We indicate it is a local variable by putting
-a dollar sign before the name.
-
-./keyhack.stp
-
-(prints error message)
-
-To tell systemtap we really want to run this script, we must use the "-g" flag.
-
-./keyhack.stp -g
-
-(type some keys. "m" should display as "b" in every window) 
-
-This example is not something you would normally want to do. There are 
-far better ways to remap a keyboard. What it demonstartes is that Systemtap 
-can modify variables in a running kernel.
-
-(show kmalloc.stp)
-This next script shows the kind of statistics systemtap can collect.
-It collects information about kernel allocations.
-
-> ./kmalloc.stp
-
-Now we can refine this further
-(show kmalloc2.stp)
-
-Remember in some previous examples, we used maps or associative arrays. Maps can contain
-statistics too.  So we have enhanced the previous script to collect statistics per
-program name.  The output might be large so we'll redirect it to a file.
-
-> ./kmalloc2.stp > out
-
-(runs for 10 seconds)
-
-> more out
-
diff --git a/testsuite/systemtap.examples/small_demos/fileopen.stp b/testsuite/systemtap.examples/small_demos/fileopen.stp
deleted file mode 100755
index c1298f9c..00000000
--- a/testsuite/systemtap.examples/small_demos/fileopen.stp
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env stap
-
-#
-# fileopen.stp
-#
-# This is based on dtrace script from 
-# http://www.gnome.org/~gman/blog/2006/Jan
-#
-# stap  fileopen.stp  -c "zenity --about"
-# or
-# ./fileopen.stp -c "program or script"
-
-global opens
-
-probe syscall.open {
-  if (target() == pid()) opens[filename] ++
-}
-
-probe end {
-  foreach([name] in opens+) {
-    printf("%-70s%5d\n", name, opens[name])
-  }
-}
-
diff --git a/testsuite/systemtap.examples/small_demos/key.stp b/testsuite/systemtap.examples/small_demos/key.stp
deleted file mode 100755
index 6d2d6c3f..00000000
--- a/testsuite/systemtap.examples/small_demos/key.stp
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env stap
-
-# Useless, but amusing. Based on an idea I saw on a
-# dtrace site. (wav files are from emacs).
-
-// KEY_ENTER = 28
-probe kernel.function("kbd_event") {
-	if ($event_type == 1 && $value) {
-		if ($event_code == 28)
-			system("play return.wav &> /dev/null")
-		else
-			system("play click.wav &> /dev/null")
-	}
-}
-
-probe begin {
-	printf("TYPEWRITER ON\n")
-}
-
-probe end {
-	printf("DONE\n")
-}
diff --git a/testsuite/systemtap.examples/small_demos/keyhack.stp b/testsuite/systemtap.examples/small_demos/keyhack.stp
deleted file mode 100755
index 3137baad..00000000
--- a/testsuite/systemtap.examples/small_demos/keyhack.stp
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env stap
-
-# This is not useful, but it demonstrates that
-# Systemtap can modify variables in a running kernel.
-
-# Usage: ./keyhack.stp -g
-
-probe kernel.function("kbd_event") {
-	# Changes 'm' to 'b' .
-	if ($event_code == 50) $event_code = 48
-}
-
-probe end {
-	printf("\nDONE\n")
-}
diff --git a/testsuite/systemtap.examples/small_demos/kmalloc.stp b/testsuite/systemtap.examples/small_demos/kmalloc.stp
deleted file mode 100755
index 9157928d..00000000
--- a/testsuite/systemtap.examples/small_demos/kmalloc.stp
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env stap
-
-# Using statistics to examine kernel memory allocations
-
-global kmalloc
-
-probe kernel.function("__kmalloc") { 
-	kmalloc <<< $size
-}
-
-# Exit after 10 seconds
-probe timer.ms(10000) { exit () }
-
-probe end {
-	printf("Count:   %d allocations\n", @count(kmalloc))
-	printf("Sum:     %d Kbytes\n", @sum(kmalloc)/1000)
-	printf("Average: %d bytes\n", @avg(kmalloc))
-	printf("Min:     %d bytes\n", @min(kmalloc))
-	printf("Max:     %d bytes\n", @max(kmalloc))	
-	print("\nAllocations by size in bytes\n")
-	print(@hist_log(kmalloc))
-}
diff --git a/testsuite/systemtap.examples/small_demos/kmalloc2.stp b/testsuite/systemtap.examples/small_demos/kmalloc2.stp
deleted file mode 100755
index 2622dd2f..00000000
--- a/testsuite/systemtap.examples/small_demos/kmalloc2.stp
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env stap
-
-# Using statistics and maps to examine kernel memory allocations
-
-global kmalloc
-
-probe kernel.function("__kmalloc") { 
-	kmalloc[execname()] <<< $size
-}
-
-# Exit after 10 seconds
-probe timer.ms(10000) { exit () }
-
-probe end {
-	foreach ([name] in kmalloc) {
-		printf("Allocations for %s\n", name)
-		printf("Count:   %d allocations\n", @count(kmalloc[name]))
-		printf("Sum:     %d Kbytes\n", @sum(kmalloc[name])/1000)
-		printf("Average: %d bytes\n", @avg(kmalloc[name]))
-		printf("Min:     %d bytes\n", @min(kmalloc[name]))
-		printf("Max:     %d bytes\n", @max(kmalloc[name]))	
-		print("\nAllocations by size in bytes\n")
-		print(@hist_log(kmalloc[name]))
-		printf("-------------------------------------------------------\n\n");
-	}
-}
diff --git a/testsuite/systemtap.examples/small_demos/proc_snoop.stp b/testsuite/systemtap.examples/small_demos/proc_snoop.stp
deleted file mode 100755
index 24499b4b..00000000
--- a/testsuite/systemtap.examples/small_demos/proc_snoop.stp
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env stap
-
-global start_ts
-
-probe begin {
-    start_ts = gettimeofday_us()
-    printf("%12s  %5s  %5s  %-16s  ACTION\n",
-            "TIMESTAMP", "PID", "TID", "EXECNAME")
-}
-
-function report(action:string) {
-    printf("%12d  %5d  %5d  %-16s  %s\n", gettimeofday_us() - start_ts,
-            pid(), tid(), execname(), action)
-}
-
-function id:string(task:long) {
-    return sprintf("p:%d t:%d n:%s", task_pid(task), task_tid(task),
-            task_execname(task))
-}
-
-probe process.create {
-    report(sprintf("create %s", id(task)))
-}
-
-probe process.start {
-    report("start")
-}
-
-probe process.exec {
-    report(sprintf("exec %s", filename))
-}
-
-probe process.exec_complete {
-    if (success)
-        report("exec success")
-    else
-        report(sprintf("exec failed %d (%s)", errno, errno_str(errno)))
-}
-
-probe process.exit {
-    report(sprintf("exit %d", code))
-}
-
-probe process.release {
-    report(sprintf("remove %s", id(task)))
-}
-
-probe signal.send {
-    report(sprintf("sigsend %d (%s) to %s%s", sig, sig_name, id(task),
-                shared? " [SHARED]" : ""))
-}
-
-probe signal.handle {
-    report(sprintf("sighandle %d (%s)", sig, sig_name))
-}
diff --git a/testsuite/systemtap.examples/small_demos/prof.stp b/testsuite/systemtap.examples/small_demos/prof.stp
deleted file mode 100755
index 389f743a..00000000
--- a/testsuite/systemtap.examples/small_demos/prof.stp
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env stap
-
-# This is an example of profiling a specific command or pid.
-# It works by recording the time when a system call is entered
-# exited. 
-
-# Usage: prof.stp -c "top -n5"
-# Will start up "top" and after 5 iterations, will exit.
-#
-# Usage: prof.stp -x 3323
-# Will profile pid 3323 until it ^c is hit.
-#
-
-probe kernel.function("sys_*").call {
-	if (target() == tid())
-		calltime[tid()] = gettimeofday_us()
-}
-
-probe kernel.function("sys_*").return {
-	if (target() != tid())  next
-	now = gettimeofday_us()
-	c = calltime[tid()]
-	if (!c) next
-	ttime[probefunc()] <<< now - c
-	delete calltime[tid()]
-}
-
-probe end {
-	printf("\n")
-	foreach (x in ttime)
-		printf("%-20s\tcalls:%6d\tavg time (us):%5d\ttotal(us):%7d\n", 
-			x, @count(ttime[x]), @avg(ttime[x]), @sum(ttime[x]))
-}
-
-global calltime, ttime
diff --git a/testsuite/systemtap.examples/small_demos/return.wav b/testsuite/systemtap.examples/small_demos/return.wav
deleted file mode 100644
index 20f978cc..00000000
Binary files a/testsuite/systemtap.examples/small_demos/return.wav and /dev/null differ
diff --git a/testsuite/systemtap.examples/small_demos/rwtiming.stp b/testsuite/systemtap.examples/small_demos/rwtiming.stp
deleted file mode 100755
index d570c581..00000000
--- a/testsuite/systemtap.examples/small_demos/rwtiming.stp
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /usr/bin/env stap
-# rwtiming.stp
-#
-# This is a simple example to track the amount of time
-# spent doing reads and writes for the various programs running on the
-# system.
-
-probe begin { log("starting probe") }
-
-global names, opens, reads, writes
-global entry_opens, entry_reads, entry_writes
-global time_opens, time_reads, time_writes
-
-probe kernel.function("sys_open") {
-  t=gettimeofday_us(); p=pid(); e=execname();
-  names[e]=1
-  opens[e] ++ # plain integer
-  entry_opens[p] = t;
-}
-
-probe kernel.function("sys_open").return {
-  t=gettimeofday_us(); p=pid(); e=execname();
-  time_opens[e] <<< t - entry_opens[p];
-}
-
-probe kernel.function("sys_read") {
-  t= gettimeofday_us(); p =pid(); e=execname();
-  names[e]=1
-  reads[e] <<< $count # statistics
-  entry_reads[p] = t;
-}
-
-probe kernel.function("sys_read").return {
-  t=gettimeofday_us(); p=pid(); e=execname();
-  time_reads[e] <<< t - entry_reads[p];
-}
-
-probe kernel.function("sys_write") {
-  t=gettimeofday_us(); p=pid(); e=execname();
-  names[e]=1
-  writes[e] <<< $count # statistics
-  entry_writes[p] = t;
-}
-
-probe kernel.function("sys_write").return {
-  t = gettimeofday_us(); p = pid(); e=execname();
-  time_writes[e] <<< t - entry_writes[p];
-}
-
-probe end {
-  foreach(name+ in names) { # sort by names
-    printf ("process: %s\n", name)
-    if (opens[name]) {
-      printf ("opens n=%d\n", opens[name])
-      print (@hist_log(time_opens[name]))
-    }
-    if (@count(reads[name])) {
-      printf ("reads n=%d, sum=%d, avg=%d\n",
-         @count(reads[name]), # extracting stat results
-         @sum(reads[name]),
-         @avg(reads[name]))
-      print ("read timing distribution\n")
-      print (@hist_log(time_reads[name]))
-    }
-    if (@count(writes[name])) {
-      printf ("writes n=%d, sum=%d, avg=%d\n",
-         @count(writes[name]), # extracting stat results
-         @sum(writes[name]),
-         @avg(writes[name]))
-      print ("write timing distribution\n")
-      print (@hist_log(time_writes[name]))
-    }
-  }
-}
diff --git a/testsuite/systemtap.examples/small_demos/sched_snoop.stp b/testsuite/systemtap.examples/small_demos/sched_snoop.stp
deleted file mode 100755
index 623643dd..00000000
--- a/testsuite/systemtap.examples/small_demos/sched_snoop.stp
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env stap
-
-global start_ts
-
-probe begin {
-    start_ts = gettimeofday_us()
-    printf("%12s  %3s  %5s  %5s  %-16s  ACTION\n",
-            "TIMESTAMP", "CPU", "PID", "TID", "EXECNAME")
-}
-
-function report(action:string) {
-    printf("%3d  %12d  %5d  %5d  %-16s  %s\n",
-            gettimeofday_us() - start_ts, cpu(),
-            pid(), tid(), execname(), action)
-}
-
-probe scheduler.cpu_off {
-    report(sprintf("cpu_off%s", idle? " [idle]" : ""))
-}
-
-probe scheduler.cpu_on {
-    report(sprintf("cpu_on%s", idle? " [idle]" : ""))
-}
-
-probe scheduler.tick {
-    report(sprintf("tick%s", idle? " [idle]" : ""))
-}
-
-probe scheduler.migrate ? {
-    report("migrate")
-}
-
-probe scheduler.balance ? {
-    report("balance")
-}
diff --git a/testsuite/systemtap.examples/small_demos/sys.stp b/testsuite/systemtap.examples/small_demos/sys.stp
deleted file mode 100755
index 2df20bc3..00000000
--- a/testsuite/systemtap.examples/small_demos/sys.stp
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env stap
-
-# print all system calls on the system
-
-probe syscall.* {
-  if (execname() != "staprun")
-	printf("%s: %s (%s) = ", execname(), name, argstr)
-}
-
-probe syscall.*.return {
-  if (execname() != "staprun")
-	printf("%s\n", retstr)
-}
-
-probe end {
-	printf("\n")
-}
diff --git a/testsuite/systemtap.examples/small_demos/top.stp b/testsuite/systemtap.examples/small_demos/top.stp
deleted file mode 100755
index b46b9940..00000000
--- a/testsuite/systemtap.examples/small_demos/top.stp
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env stap 
-#
-# This script continuously lists the top 20 systemcalls on the system
-#
-
-global syscalls
-
-function print_top () {
-	printf ("SYSCALL\t\t\t\tCOUNT\n")
-	foreach ([name] in syscalls- limit 20)
-		printf("%-20s\t\t%5d\n",name, syscalls[name])
-	printf("--------------------------------------\n")
-	delete syscalls
-}
-
-probe syscall.* {
-	syscalls[probefunc()]++
-}
-
-# print top syscalls every 5 seconds
-probe timer.ms(5000) {
-	print_top ()
-}
-
diff --git a/testsuite/systemtap.examples/socket-trace.meta b/testsuite/systemtap.examples/socket-trace.meta
deleted file mode 100644
index 0b26f2fe..00000000
--- a/testsuite/systemtap.examples/socket-trace.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Trace Functions called in Network Socket Code
-name: socket-trace.stp
-version: 1.0
-author: anonymous
-keywords: network socket
-subsystem: network
-status: production
-exit: user-controlled
-output: trace
-scope: system-wide
-description: The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.
-test_check: stap -p4 socket-trace.stp
-test_installcheck: stap socket-trace.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/socket-trace.stp b/testsuite/systemtap.examples/socket-trace.stp
deleted file mode 100755
index 13ab8e06..00000000
--- a/testsuite/systemtap.examples/socket-trace.stp
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /usr/bin/env stap
-
-probe kernel.function("*@net/socket.c").call {
-  printf ("%s -> %s\n", thread_indent(1), probefunc())
-}
-probe kernel.function("*@net/socket.c").return {
-  printf ("%s <- %s\n", thread_indent(-1), probefunc())
-}
diff --git a/testsuite/systemtap.examples/socktop b/testsuite/systemtap.examples/socktop
deleted file mode 100755
index 123e37e9..00000000
--- a/testsuite/systemtap.examples/socktop
+++ /dev/null
@@ -1,318 +0,0 @@
-#!/bin/bash
-
-# Socktop systemtap script
-# Copyright (C) 2006 IBM Corp.
-#
-# This file is part of systemtap, and is free software.  You can
-# redistribute it and/or modify it under the terms of the GNU General
-# Public License (GPL); either version 2, or (at your option) any
-# later version.
-
-###
-### socktop - Combination shell/systemtap script to track reads and writes
-###           on sockets by process.  Can be filtered by process IDs and
-###           names, protocols, protocol families, users and socket type.
-###
-
-# Filter options
-F_PROTSTR=""; F_PROT=0  # Filter by protocol
-F_FAMSTR=""; F_FAM=0    # Filter by protocol family
-F_TYPESTR=""; F_TYPE=0  # Filter by socket type
-F_PIDSTR=""; F_PID=0    # Filter by process ID
-F_NAMESTR=""; F_NAME=0  # Filter by process name
-F_UIDSTR=""; F_UID=0    # Filter by user
-FILTER=0                # Any filters specified?
-
-# Print options
-P_INTERVAL=5 # default interval between output
-P_DEVICES=0  # default is don't display network device traffic
-P_NUMTOP=10  # default number of processes and network devices to print
-
-DELIM=","
-
-function usage {
-	echo "USAGE: socktop [-d] [-i interval] [-N num] [-P protocol]... [-f family]..."
-	echo "               [-t stype]... [-n pname]... [-p pid]... [-u username]... [-h]"
-	echo "    -d           # print network device traffic (default: off)"
-	echo "    -i interval  # interval in seconds between printing (default: $P_INTERVAL)"
-	echo "    -N num       # number of top processes and devices to print (default: $P_NUMTOP)"
-	echo "    -f family    # this protocol family only (default: all)"
-	echo "    -P protocol  # this protocol only (default: all)"
-	echo "    -t stype     # this socket type only (default: all)"
-	echo "    -n pname     # this process name only (default: all)"
-	echo "    -p pid       # this process ID only (default: all)"
-	echo "    -u username  # this user only (default: all)"
-	echo "    -h           # print this help text"
-	echo ""
-	echo "Protocol Families:"
-	echo "    LOCAL, INET, INET6, IPX, NETLINK, X25, AX25, ATMPVC, APPLETALK, PACKET"
-	echo ""
-	echo "Protocols:"
-	echo "    TCP, UDP, SCTP, IP, FC, ... (see /etc/protocols for complete list)"
-	echo ""
-	echo "Socket Types:"
-	echo "    STREAM, DGRAM, RAW, RDM, SEQPACKET, DCCP, PACKET"
-}
-
-# Process options
-while getopts df:i:n:N:P:p:t:u:h option; do
-	case $option in
-	d)      P_DEVICES=1 ;;
-	i)      P_INTERVAL=$OPTARG ;;
-	N)      P_NUMTOP=$OPTARG ;;
-	f)      let "F_FAM++"
-	        F_FAMSTR=$OPTARG$DELIM$F_FAMSTR ;;
-	n)      let "F_NAME++"
-	        F_NAMESTR=$OPTARG$DELIM$F_NAMESTR ;;
-	p)      let "F_PID++"
-	        F_PIDSTR=$OPTARG$DELIM$F_PIDSTR ;;
-	P)      let "F_PROT++"
-	        F_PROTSTR=$OPTARG$DELIM$F_PROTSTR ;;
-	t)      let "F_TYPE++"
-	        F_TYPESTR=$OPTARG$DELIM$F_TYPESTR ;;
-	u)      uid=`awk -F: '$1 == name {print $3}' name=$OPTARG /etc/passwd`
-	        if [[ $uid != "" ]]; then
-	            let "F_UID++"
-	            F_UIDSTR=$uid$DELIM$F_UIDSTR
-	        else
-	            echo "ERROR: Unknown user:" $OPTARG
-	            let "ERROR++"
-	        fi ;;
-	h|?|*)  usage
-	        exit 1 ;;
-	esac
-done
-
-if [[ $ERROR > 0 ]]; then
-	exit 1
-fi
-
-if [[ $F_FAM  > 0 || $F_NAME > 0 || $F_PID > 0 || 
-	  $F_PROT > 0 || $F_TYPE > 0 || $F_UID > 0 ]]; then
-	FILTER=1
-fi
-
-#
-# Pass a timezone adjustment value to the stap script
-#
-TZ=`date "+%z"`
-TZ_SIGN=`echo $TZ | cut -c1`
-TZ_HOURS=`echo $TZ | cut -c2-3`
-TZ_MINS=`echo $TZ | cut -c4-5`
-TZ_ADJUST=$TZ_SIGN$((10#$TZ_HOURS*60*60+10#$TZ_MINS*60))
-
-#
-# Start the systemtap script
-#
-stap -e '
-global execname, user, if_tx, if_rx, if_dev
-global sk_tx, sk_rx, sk_pid
-global f_name_str, f_pid_str, f_prot_str, f_fam_str, f_type_str, f_uid_str
-global f_name, f_pid, f_prot, f_fam, f_type, f_uid
-
-probe begin
-{
-	# If no filters specified, skip filter processing
-	if ('$FILTER' == 0) next
-
-	f_name_str   = "'$F_NAMESTR'"
-	f_pid_str    = "'$F_PIDSTR'"
-	f_prot_str   = "'$F_PROTSTR'"
-	f_fam_str    = "'$F_FAMSTR'"
-	f_type_str   = "'$F_TYPESTR'"
-	f_uid_str    = "'$F_UIDSTR'"
-
-	delim = "'$DELIM'"
-	error = 0
-
-	# Protocols
-	if ('$F_PROT') {
-		prot = tokenize(f_prot_str, delim)
-		while (prot != "") {
-			p = sock_prot_str2num(prot)
-			if (p < 0) {
-				printf("ERROR: Unknown protocol: %s\n", prot)
-				error++
-			} else
-				f_prot[p] = 1
-			prot = tokenize("", delim)
-		}
-	}
-
-	# Protocol families
-	if ('$F_FAM') {
-		fam = tokenize(f_fam_str, delim)
-		while (fam != "") {
-			f = sock_fam_str2num(fam)
-			if (f < 0) {
-				printf("ERROR: Unknown protocol family: %s\n", fam)
-				error++
-			} else
-				f_fam[f] = 1
-			fam = tokenize("", delim)
-		}
-	}
-
-	# Process names
-	if ('$F_NAME') {
-		pname = tokenize(f_name_str, delim)
-		while (pname != "") {
-			f_name[pname] = 1
-			pname = tokenize("", delim)
-		}
-	}
-
-	# Process IDs
-	if ('$F_PID') {
-		pid = tokenize(f_pid_str, delim)
-		while (pid != "") {
-			f_pid[strtol(pid, 10)] = 1
-			pid = tokenize("", delim)
-		}
-	}
-
-	# Socket types
-	if ('$F_TYPE') {
-		stype = tokenize(f_type_str, delim)
-		while (stype != "") {
-			t = sock_type_str2num(stype)
-			if (t < 0) {
-				printf("ERROR: Unknown socket type: %s\n", stype)
-				error++
-			} else
-				f_type[t] = 1
-			stype = tokenize("", delim)
-		}
-	}
-
-	# User IDs
-	if ('$F_UID') {
-		uid = tokenize(f_uid_str, delim)
-		while (uid != "") {
-			f_uid[strtol(uid, 10)] = 1
-			uid = tokenize("", delim)
-		}
-	}
-
-	if (error) exit()
-}
-
-probe netdev.transmit
-{
-	if ('$P_DEVICES') {
-		if_tx[dev_name] <<< length
-		if_dev[dev_name] ++
-	}
-}
-
-probe netdev.receive
-{
-	if ('$P_DEVICES') {
-		if_rx[dev_name] <<< length
-		if_dev[dev_name] ++
-	}
-}
-
-probe socket.send
-{
-	if (!success) next
-
-	pid = pid()
-	uid = uid()
-	ename = execname()
-
-	# Check filters
-	if ('$FILTER') {
-		if ('$F_PROT' && !(protocol in f_prot)) next
-		if ('$F_FAM'  && !(family   in f_fam))  next
-		if ('$F_PID'  && !(pid      in f_pid))  next
-		if ('$F_NAME' && !(ename    in f_name)) next
-		if ('$F_UID'  && !(uid      in f_uid))  next
-		if ('$F_TYPE' && !(type     in f_type)) next
-	}
-
-	execname[pid] = ename
-	user[pid] = uid
-	sk_tx[pid, protocol, family] <<< size
-	sk_pid[pid, protocol, family] += size
-}
-
-probe socket.receive
-{
-	if (!success) next
-
-	pid = pid()
-	uid = uid()
-	ename = execname()
-
-	# Check filters
-	if ('$FILTER') {
-		if ('$F_PROT' && !(protocol in f_prot)) next
-		if ('$F_FAM'  && !(family   in f_fam))  next
-		if ('$F_PID'  && !(pid      in f_pid))  next
-		if ('$F_NAME' && !(ename    in f_name)) next
-		if ('$F_UID'  && !(uid      in f_uid))  next
-		if ('$F_TYPE' && !(type     in f_type)) next
-	}
-
-	execname[pid] = ename
-	user[pid] = uid
-	sk_rx[pid, protocol, family] <<< size
-	sk_pid[pid, protocol, family] += size
-}
-
-function print_activity()
-{
-	# Print top processes
-	max = '$P_NUMTOP'
-	time = gettimeofday_s() + '$TZ_ADJUST'
-
-	printf("======================= %s ========================\n", ctime(time))
-	printf("------------------------------- PROCESSES -------------------------------\n")
-	printf("%-5s %-5s %7s %7s %7s %7s %-4s %-8s %-15s\n",
-	       "PID", "UID", "#SEND", "#RECV", "SEND_KB",
-	       "RECV_KB", "PROT", "FAMILY", "COMMAND")
-	foreach ([pid, prot, fam] in sk_pid- limit max) {
-		n_sk_tx = @count(sk_tx[pid, prot, fam])
-		n_sk_rx = @count(sk_rx[pid, prot, fam])
-		printf("%-5d %-5d %7d %7d %7d %7d %-4s %-8s %-15s\n",
-		       pid, user[pid], n_sk_tx, n_sk_rx,
-		       n_sk_tx ? @sum(sk_tx[pid, prot, fam])/1024 : 0,
-		       n_sk_rx ? @sum(sk_rx[pid, prot, fam])/1024 : 0,
-		       sock_prot_num2str(prot), sock_fam_num2str(fam),
-		       execname[pid])
-	}
-
-	# Print top network devices
-	if ('$P_DEVICES') {
-		max = '$P_NUMTOP'
-		printf("-------------------------------- DEVICES --------------------------------\n")
-		printf("%-7s %13s %13s %15s %15s\n",
-		       "DEV", "#XMIT", "#RECV", "XMIT_KB", "RECV_KB")
-		foreach ([dev] in if_dev- limit max) {
-			n_if_tx = @count(if_tx[dev])
-			n_if_rx = @count(if_rx[dev])
-			printf("%-7s %13d %13d %15d %15d\n", dev, n_if_tx, n_if_rx,
-			       n_if_tx ? @sum(if_tx[dev])/1024 : 0,
-			       n_if_rx ? @sum(if_rx[dev])/1024 : 0)
-		}
-	}
-	
-	printf("=========================================================================\n\n")
-
-	delete execname
-	delete user
-	delete sk_tx
-	delete sk_rx
-	delete sk_pid
-	delete if_tx
-	delete if_rx
-	delete if_dev
-}
-
-
-probe timer.s('$P_INTERVAL')
-{
-	print_activity()
-}
-'
diff --git a/testsuite/systemtap.examples/socktop.txt b/testsuite/systemtap.examples/socktop.txt
deleted file mode 100644
index 0ebce003..00000000
--- a/testsuite/systemtap.examples/socktop.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-#./socktop -d
-
-======================= Mon Jan 29 12:27:24 2007 ========================
-------------------------------- PROCESSES -------------------------------
-PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
-3051  0           0    3159       0    4702 TCP  INET     firefox-bin    
-2578  0         121     101     164     181 IP   LOCAL    Xvnc           
-3051  0          74     180     176     164 IP   LOCAL    firefox-bin    
-2578  0           8      79      39       0 TCP  INET     Xvnc           
-2583  0           2       1       5       0 IP   LOCAL    xterm          
--------------------------------- DEVICES --------------------------------
-DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
-eth0             2236          3448             182            4875
-=========================================================================
-
-======================= Mon Jan 29 12:27:29 2007 ========================
-------------------------------- PROCESSES -------------------------------
-PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
-2578  0         580     582    1300    1315 IP   LOCAL    Xvnc           
-3051  0         296     600     970     965 IP   LOCAL    firefox-bin    
-3051  0           0     664       0     987 TCP  INET     firefox-bin    
-2695  0          62     145     298     297 IP   LOCAL    wnck-applet    
-2578  0          23     131      88       0 TCP  INET     Xvnc           
-2685  0          85     211      42      34 IP   LOCAL    metacity       
-2583  0           2       3       4       0 IP   LOCAL    xterm          
-2620  0          40      78       0       2 IP   LOCAL    gnome-settings-
-2688  0           3       7       0       0 IP   LOCAL    gnome-panel    
-2690  0           1       7       0       0 IP   LOCAL    nautilus       
--------------------------------- DEVICES --------------------------------
-DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
-eth0              580           881             124            1030
-=========================================================================
-
-
-# ./socktop -d -P TCP -P UDP
-
-======================= Mon Jan 29 12:29:15 2007 ========================
-------------------------------- PROCESSES -------------------------------
-PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
-2578  0          16     183      27       1 TCP  INET     Xvnc           
--------------------------------- DEVICES --------------------------------
-DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
-eth0              135           204              35               9
-=========================================================================
-
-======================= Mon Jan 29 12:29:20 2007 ========================
-------------------------------- PROCESSES -------------------------------
-PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
-3051  0           1    1814       0    3236 TCP  INET     firefox-bin    
-2578  0          52     155     198       1 TCP  INET     Xvnc           
-3051  0           4       4       0       0 UDP  INET     firefox-bin    
--------------------------------- DEVICES --------------------------------
-DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
-eth0             1574          2589             297            3366
-=========================================================================
-
-======================= Mon Jan 29 12:29:25 2007 ========================
-------------------------------- PROCESSES -------------------------------
-PID   UID     #SEND   #RECV SEND_KB RECV_KB PROT FAMILY   COMMAND        
-3051  0           0    2508       0    3721 TCP  INET     firefox-bin    
-2578  0           2      39      10       0 TCP  INET     Xvnc           
--------------------------------- DEVICES --------------------------------
-DEV             #XMIT         #RECV         XMIT_KB         RECV_KB
-eth0             1767          2698             123            3858
-=========================================================================
-
diff --git a/testsuite/systemtap.examples/syscalls_by_pid.meta b/testsuite/systemtap.examples/syscalls_by_pid.meta
deleted file mode 100644
index 590652b3..00000000
--- a/testsuite/systemtap.examples/syscalls_by_pid.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: System-Wide Count of Syscalls by PID
-name: syscalls_by_pid.stp
-version: 1.0
-author: anonymous
-keywords: syscall
-subsystem: syscall
-status: production
-exit: user-controlled
-output: sorted-list on-exit
-scope: system-wide
-description: The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.
-test_check: stap -p4 syscalls_by_pid.stp
-test_installcheck: stap syscalls_by_pid.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/syscalls_by_pid.stp b/testsuite/systemtap.examples/syscalls_by_pid.stp
deleted file mode 100755
index 47aa4955..00000000
--- a/testsuite/systemtap.examples/syscalls_by_pid.stp
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /usr/bin/env stap
-
-# Copyright (C) 2006 IBM Corp.
-#
-# This file is part of systemtap, and is free software.  You can
-# redistribute it and/or modify it under the terms of the GNU General
-# Public License (GPL); either version 2, or (at your option) any
-# later version.
-
-#
-# Print the system call count by process ID in descending order.
-#
-
-global syscalls
-
-probe begin {
-	print ("Collecting data... Type Ctrl-C to exit and display results\n")
-}
-
-probe syscall.* {
-	syscalls[pid()]++
-}
-
-probe end {
-	printf ("%-10s %-s\n", "#SysCalls", "PID")
-	foreach (pid in syscalls-)
-		printf("%-10d %-d\n", syscalls[pid], pid)
-}
diff --git a/testsuite/systemtap.examples/syscalls_by_pid.txt b/testsuite/systemtap.examples/syscalls_by_pid.txt
deleted file mode 100644
index 4943a139..00000000
--- a/testsuite/systemtap.examples/syscalls_by_pid.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# stap syscalls_by_pid.stp
-Collecting data... Type Ctrl-C to exit and display results
-^C
-#SysCalls  PID
-2293       31866
-765        31081
-567        30983
-557        30965
-554        31008
-523        30985
-273        30991
-118        9585
-115        2130
-77         30928
-65         1988
-50         31006
-42         2492
-40         31077
-36         2487
-35         2490
-23         2257
-22         2366
-20         8682
-20         2048
-17         31197
-16         31067
-14         2313
-10         31011
-8          1
-5          31074
-3          1978
-3          1975
-3          2467
-3          30932
-
diff --git a/testsuite/systemtap.examples/syscalls_by_proc.meta b/testsuite/systemtap.examples/syscalls_by_proc.meta
deleted file mode 100644
index 79aa3e87..00000000
--- a/testsuite/systemtap.examples/syscalls_by_proc.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: System-Wide Count of Syscalls by Executable
-name: syscalls_by_proc.stp
-version: 1.0
-author: anonymous
-keywords: syscall
-subsystem: syscall
-status: production
-exit: user-controlled
-output: sorted-list on-exit
-scope: system-wide
-description: The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.
-test_check: stap -p4 syscalls_by_proc.stp
-test_installcheck: stap syscalls_by_proc.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/syscalls_by_proc.stp b/testsuite/systemtap.examples/syscalls_by_proc.stp
deleted file mode 100755
index af7d6932..00000000
--- a/testsuite/systemtap.examples/syscalls_by_proc.stp
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /usr/bin/env stap
-
-# Copyright (C) 2006 IBM Corp.
-#
-# This file is part of systemtap, and is free software.  You can
-# redistribute it and/or modify it under the terms of the GNU General
-# Public License (GPL); either version 2, or (at your option) any
-# later version.
-
-#
-# Print the system call count by process name in descending order.
-#
-
-global syscalls
-
-probe begin {
-        print ("Collecting data... Type Ctrl-C to exit and display results\n")
-}
-
-probe syscall.* {
-	syscalls[execname()]++
-}
-
-probe end {
-	printf ("%-10s %-s\n", "#SysCalls", "Process Name")
-	foreach (proc in syscalls-)
-		printf("%-10d %-s\n", syscalls[proc], proc)
-}
diff --git a/testsuite/systemtap.examples/syscalls_by_proc.txt b/testsuite/systemtap.examples/syscalls_by_proc.txt
deleted file mode 100644
index dd554083..00000000
--- a/testsuite/systemtap.examples/syscalls_by_proc.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-# stap syscalls_by_proc.stp
-Collecting data... Type Ctrl-C to exit and display results
-^C
-#SysCalls  Process Name
-53832      make
-15275      sh
-6764       staprun
-2291       gcc
-2225       mixer_applet2
-1638       gnome-settings-
-1603       gnome-panel
-1577       rm
-1567       nautilus
-1557       trashapplet
-1443       cat
-1404       sshd
-1207       cc1
-779        ls
-764        gnome-vfs-daemo
-638        bash
-610        collect2
-356        mkdir
-354        artsd
-340        hald-addon-stor
-338        hidd
-280        ld
-260        irqbalance
-238        xterm
-212        automount
-182        sed
-176        as
-141        dnsdomainname
-130        date
-129        cmp
-124        clock-applet
-122        nm-applet
-104        grep
-88         hostname
-75         whoami
-70         rpc.idmapd
-68         httpd
-68         python
-61         gam_server
-56         pam_timestamp_c
-53         wc
-49         sendmail
-46         echo
-40         tail
-39         expr
-37         uname
-35         pam-panel-icon
-24         init
-17         mapping-daemon
-9          syslogd
-3          klogd
-3          hald
-3          gconfd-2
-1          cupsd
diff --git a/testsuite/systemtap.examples/syscalltimes b/testsuite/systemtap.examples/syscalltimes
deleted file mode 100755
index 84ca77a9..00000000
--- a/testsuite/systemtap.examples/syscalltimes
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/bin/bash
-
-# Syscalltimes systemtap script
-# Copyright (C) 2007 IBM Corp.
-#
-# This file is part of systemtap, and is free software.  You can
-# redistribute it and/or modify it under the terms of the GNU General
-# Public License (GPL); either version 2, or (at your option) any
-# later version.
-
-###
-### syscalltime - Combination shell/systemtap script to measure system call
-###               counts and times.  Can be filtered by process IDs, process
-###               names and users.
-###
-
-# Filter options
-F_PIDSTR="";  F_PID=0   # Filter by process ID
-F_EXECSTR=""; F_EXEC=0  # Filter by process name
-F_UIDSTR="";  F_UID=0   # Filter by user
-FILTER=0                # Any filters specified?
-
-# Print options
-P_TOTALS=0              # Print totals
-P_VERBOSE_STR=""        # Print verbose build output
-
-DELIM=","
-
-function usage {
-	echo "USAGE: syscalltimes [-n pname]... [-p pid]... [-u username]..."
-	echo "                    [-v]... [-t] [-h]"
-	echo "    -n pname     # filter by this process name"
-	echo "    -p pid       # filter by this process ID"
-	echo "    -u username  # filter by this user"
-	echo "    -t           # print totals (default with filters: OFF"
-	echo "                                 default without filters: ON)"
-	echo "    -v           # print verbose output during SystemTap module creation"
-	echo "    -h           # print this help text"
-	echo ""
-	echo "NOTE: This script can take long time to build. Use -v[vv] to monitor"
-	echo "      the module creation and build process."
-}
-
-# Process options
-while getopts n:p:u:vth option; do
-	case $option in
-	n)	let "F_EXEC++"
-		F_EXECSTR=$OPTARG$DELIM$F_EXECSTR ;;
-
-	p)	let "F_PID++"
-		F_PIDSTR=$OPTARG$DELIM$F_PIDSTR ;;
-
-	u)	uid=`awk -F: '$1 == name {print $3}' name=$OPTARG /etc/passwd`
-		if [[ $uid != "" ]]; then
-			let "F_UID++"
-			F_UIDSTR=$uid$DELIM$F_UIDSTR
-		else
-			echo "ERROR: Unknown user:" $OPTARG
-			let "ERROR++"
-		fi ;;
-
-	v)	P_VERBOSE_STR="-v "$P_VERBOSE_STR ;;
-
-	t)	P_TOTALS=1 ;;
-
-	h|?|*)  usage
-		exit 1 ;;
-	esac
-done
-
-if [[ $ERROR > 0 ]]; then
-	exit 1
-fi
-
-if [[ $F_EXEC > 0 || $F_PID > 0 || $F_UID > 0 ]]; then
-	FILTER=1
-fi
-
-echo "Creating and building SystemTap module..."
-
-#
-# SystemTap script
-#
-stap $P_VERBOSE_STR -e '
-global start, timebycall, timebypid, timebyuid, timebyexec
-global f_exec_str, f_pid_str, f_uid_str
-global f_exec, f_pid, f_uid
-global prt_totals, filter_str
-
-probe begin {
-	printf("Collecting data - type Ctrl-C to print output and exit...\n")
-	
-	# If no filters specified, skip filter processing
-	if ('$FILTER' == 0) {
-		filter_str = " (unfiltered)"
-		prt_totals = 1  // On by default if no filtering
-		next
-	} else
-		filter_str = " (filtered)"
-
-	prt_totals   = '$P_TOTALS'
-	f_exec_str   = "'$F_EXECSTR'"
-	f_pid_str    = "'$F_PIDSTR'"
-	f_uid_str    = "'$F_UIDSTR'"
-
-	delim = "'$DELIM'"
-
-	# Process names
-	if ('$F_EXEC') {
-		pname = tokenize(f_exec_str, delim)
-		while (pname != "") {
-			f_exec[pname] = 1
-			pname = tokenize("", delim)
-		}
-	}
-
-	# Process IDs
-	if ('$F_PID') {
-		pid = tokenize(f_pid_str, delim)
-		while (pid != "") {
-			f_pid[strtol(pid, 10)] = 1
-			pid = tokenize("", delim)
-		}
-	}
-
-	# User IDs
-	if ('$F_UID') {
-		uid = tokenize(f_uid_str, delim)
-		while (uid != "") {
-			f_uid[strtol(uid, 10)] = 1
-			uid = tokenize("", delim)
-		}
-	}
-}
-
-probe syscall.* {
-	start[name, tid()] = gettimeofday_ns()
-}
-
-probe syscall.*.return {
-	# Skip if we have not seen this before
-	if (!([name, tid()] in start)) next
-
-	delta = gettimeofday_ns() - start[name, tid()]
-
-	# Check filters
-	if ('$FILTER') {
-		target = 0
-		if (pid() in f_pid) {
-			timebypid[name, pid()] <<< delta
-			target = 1
-		}
-		if (uid() in f_uid) {
-			timebyuid[name, uid()] <<< delta
-			target = 1
-		}
-		if (execname() in f_exec) {
-			timebyexec[name, execname()] <<< delta
-			target = 1
-		}
-	} else
-		target = 1
-
-	# Totals
-	if (target && prt_totals)
-		timebycall[name] <<< delta
-
-	delete start[name, tid()]
-}
-
-function print_header() {
-	printf("%22s %10s %12s %12s %12s %12s\n",
-	       "System Call", "Count", "Total ns",
-	       "Avg ns", "Min ns", "Max ns")
-}
-
-probe end {
-	if (prt_totals) {
-		printf("\nTimes for all processes%s:\n\n", filter_str)
-		print_header()
-		foreach (call in timebycall)
-			printf("%22s %10d %12d %12d %12d %12d\n", call,
-			       @count(timebycall[call]),
-			       @sum(timebycall[call]),
-			       @avg(timebycall[call]),
-		               @min(timebycall[call]),
-			       @max(timebycall[call]))
-	}
-
-	if ('$F_PID') {
-		curpid = -1
-		foreach ([call, pid-] in timebypid) {
-			if (curpid != pid) {
-				curpid = pid
-				printf("\nTimes for process ID %d:\n\n", curpid)
-				print_header()
-			}
-			printf("%22s %10d %12d %12d %12d %12d\n", call,
-			       @count(timebypid[call, pid]),
-			       @sum(timebypid[call, pid]),
-			       @avg(timebypid[call, pid]),
-			       @min(timebypid[call, pid]),
-			       @max(timebypid[call, pid]))
-		}
-		printf("\n")
-	}
-
-	if ('$F_EXEC') {
-		curexec = ""
-		foreach ([call, exec-] in timebyexec) {
-			if (curexec != exec) {
-				curexec = exec
-				printf("\nTimes for process name %s:\n\n", curexec)
-				print_header()
-			}
-			printf("%22s %10d %12d %12d %12d %12d\n", call,
-			       @count(timebyexec[call, exec]),
-			       @sum(timebyexec[call, exec]),
-			       @avg(timebyexec[call, exec]),
-			       @min(timebyexec[call, exec]),
-			       @max(timebyexec[call, exec]))
-		}
-		printf("\n")
-	}
-
-	if ('$F_UID') {
-		curuid = -1
-		foreach ([call, uid-] in timebyuid) {
-			if (curuid != uid) {
-				curuid = uid
-				printf("\nTimes for user ID %d:\n\n", curuid)
-				print_header()
-			}
-			printf("%22s %10d %12d %12d %12d %12d\n", call,
-			       @count(timebyuid[call, uid]),
-			       @sum(timebyuid[call, uid]),
-			       @avg(timebyuid[call, uid]),
-			       @min(timebyuid[call, uid]),
-			       @max(timebyuid[call, uid]))
-		}
-		printf("\n")
-	}
-
-	delete timebycall
-	delete timebypid
-	delete timebyuid
-	delete timebyexec
-}'
diff --git a/testsuite/systemtap.examples/syscalltimes.txt b/testsuite/systemtap.examples/syscalltimes.txt
deleted file mode 100644
index d50f73ad..00000000
--- a/testsuite/systemtap.examples/syscalltimes.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-# ./syscalltimes -h
-USAGE: syscalltimes [-n pname]... [-p pid]... [-u username]...
-                    [-v]... [-t] [-h]
-    -n pname     # filter by this process name
-    -p pid       # filter by this process ID
-    -u username  # filter by this user
-    -t           # print totals (default with filters: OFF
-                                 default without filters: ON)
-    -v           # print verbose output during SystemTap module creation
-    -h           # print this help text
-
-NOTE: This script can take long time to build. Use -v[vv] to monitor
-      the module creation and build process.
-
-
-# ./syscalltimes -n top -n vi
-Creating and building SystemTap module...
-Collecting data - type Ctrl-C to print output and exit...
-
-Times for process name vi:
-
-           System Call      Count     Total ns       Avg ns       Min ns       Max ns
-                access          4        59169        14792         7770        27556
-        rt_sigprocmask          6        32879         5479         5328         6132
-          rt_sigaction         22       119127         5414         5291         6293
-                select         15   1605144751    107009650         7386   1117677549
-               sysinfo          1        13178        13178        13178        13178
-                 lseek          2        12869         6434         6331         6538
-                getuid          3        16839         5613         5468         5757
-             getrlimit          1         5558         5558         5558         5558
-                munmap          8       103326        12915         9689        19190
-                getpid          1         5639         5639         5639         5639
-                unlink          3       143502        47834        20291        97191
-            arch_prctl          1         6296         6296         6296         6296
-                 chdir          6        58086         9681         7213        16062
-                getcwd          9        81327         9036         6820        17583
-                  read         28       341507        12196         6007        54806
-                 fcntl          4        23418         5854         5478         6459
-           sigaltstack          1         5845         5845         5845         5845
-              mprotect         13       130272        10020         8255        17130
-                statfs          1        10223        10223        10223        10223
-                 fstat         20       118660         5933         5446         7050
-              readlink          1        17884        17884        17884        17884
-            readlinkat          1         7889         7889         7889         7889
-                socket          2        24932        12466         8090        16842
-                  stat         13       120911         9300         7376        19549
-                 ioctl         19       135172         7114         5504        11711
-                execve          1       262658       262658       262658       262658
-                 write         15       382744        25516         8391       136359
-                 uname          1         6772         6772         6772         6772
-                 close         30       210468         7015         5478        12543
-                fchdir          6        34269         5711         5496         6185
-                  open         31       474649        15311         7807        54475
-                 chmod          1        12865        12865        12865        12865
-                   brk          6        48116         8019         5782        10240
-                 lstat          2        15369         7684         7334         8035
-               connect          2        29287        14643        10616        18671
-
-Times for process name top:
-
-           System Call      Count     Total ns       Avg ns       Min ns       Max ns
-            arch_prctl          1         6424         6424         6424         6424
-                 fcntl         97       607311         6260         5170        10873
-                  read        970     12341710        12723         5574       446707
-                 lseek         11        66250         6022         5481         7165
-          rt_sigaction         71       380049         5352         5255         6374
-                access          5        66406        13281         8942        24323
-                select          3   6385526578   2128508859    499261647   2999551597
-              getdents         21       889837        42373         6386        73490
-                getuid          1         5494         5494         5494         5494
-                munmap         15       174255        11617         8872        17670
-                 write         10      2309851       230985        16248      2006254
-                 uname          1        10474        10474        10474        10474
-                 close        932      5749946         6169         5348        21248
-                 ioctl         14       122233         8730         5824        14243
-                execve          1       261447       261447       261447       261447
-                   brk          4        26527         6631         5493         8285
-               connect          2        28533        14266        10756        17777
-                  open        934      9289314         9945         8473        30315
-              mprotect         10        97990         9799         8295        14636
-                  stat        455      3834994         8428         7920        26084
-                socket          2        21980        10990         8990        12990
-                 fstat         26       150418         5785         5426         7127
-                 alarm         90       536017         5955         5543        11487
-
-
-# ./syscalltimes -v
-Creating and building SystemTap module...
-Pass 1: parsed user script and 42 library script(s) in 200usr/10sys/218real ms.
-Pass 2: analyzed script: 768 probe(s), 15 function(s), 15 embed(s), 13 global(s) in 35870usr/140sys/36036real ms.
-Pass 3: using cached /root/.systemtap/cache/d5/stap_d5fcd430388d4f4a30f63d03aaa3eb80_392196.c
-Pass 4: using cached /root/.systemtap/cache/d5/stap_d5fcd430388d4f4a30f63d03aaa3eb80_392196.ko
-Pass 5: starting run.
-Collecting data - type Ctrl-C to print output and exit...
-
-Times for all processes (unfiltered):
-
-           System Call      Count     Total ns       Avg ns       Min ns       Max ns
-                writev        681      6526983         9584         6807        18709
-                 write        421      4367057        10373         6424        52077
-                 uname         15        98071         6538         6336         6787
-                 close        459      9528659        20759         5265      1346856
-     inotify_add_watch         17       164258         9662         8000        17280
-                 ioctl       1205     28994711        24062         5211      2928218
-                execve         12      2148953       179079        10195       280392
-                   brk        309      2400150         7767         5383        23454
-                 lstat          5        43864         8772         7938        10426
-               connect         24       352784        14699        10679        25868
-               getppid         12        71219         5934         5812         6123
-                 wait4         24     20952033       873001         5664      3387688
-                  open        377     22181286        58836         8819      3011655
-                  dup2         18       109197         6066         5865         6403
-                  bind          3        25322         8440         8263         8759
-                  poll       1034  36509105361     35308612         5499   1999784046
-                getgid         12        65851         5487         5335         5667
-         compat_execve         12      3012173       251014       182782       472356
-              mprotect        150      1434021         9560         7854        13812
-          gettimeofday         10        60416         6041         5238         7429
-               recvmsg          9       116065        12896         6889        37388
-              readlink         12       638216        53184        46337        64203
-            readlinkat         12       530499        44208        37794        55136
-                  stat        140      1244798         8891         6702        17331
-                socket         39       435318        11162         7642        16694
-           getsockname          3        18899         6299         6198         6443
-                statfs          6        62737        10456        10311        10671
-                 fstat        238      1400126         5882         5502        12739
-               geteuid         12        73475         6122         5248        14048
-                 readv         27       349998        12962         7150        21210
-            arch_prctl         21       135320         6443         6231         6832
-             nanosleep         28   8927802107    318850075    150954837   2001911237
-                 futex        595   8755563465     14715232         5431   1000945645
-                  read       2586   5154654212      1993292         5622   4985306501
-               getpgrp         12        67137         5594         5469         5740
-                 fcntl         51       289553         5677         5353         6835
-                  pipe         12       122220        10185         8771        13959
-             setitimer        159      1004756         6319         5551         8776
-                 lseek          4        24304         6076         5900         6253
-                 mmap2         19       182403         9600         7496        13574
-                access        105      1220874        11627         8077        33600
-          rt_sigreturn         93       665180         7152         5541         8265
-          rt_sigaction        171       967575         5658         5278        18684
-        rt_sigprocmask        132       760337         5760         5273        14170
-         clock_gettime        151       997395         6605         5275         9090
-                 pread        192      2387721        12436         5679        43553
-                select        925  24357064459     26331961         6669   2861600879
-               getegid         12        63624         5302         5200         5466
-                getpid         12        66761         5563         5348         5701
-                getuid         12        67112         5592         5483         5790
-                sendto          3        54766        18255        17541        19501
-                munmap        116      1432698        12350         8634        48526
-              getdents          6        57855         9642         6248        13313
-                 times         10        59281         5928         5514         6617
-                 ppoll         24   4799366329    199973597    199872030    200070128
-Pass 5: run completed in 20usr/90sys/8215real ms.
-
diff --git a/testsuite/systemtap.examples/systemtap.css b/testsuite/systemtap.examples/systemtap.css
deleted file mode 100644
index 445d95f4..00000000
--- a/testsuite/systemtap.examples/systemtap.css
+++ /dev/null
@@ -1,164 +0,0 @@
-body {
-	background-color: #cccccc;
-}
-
-.topnavright {
-	color: #787878;
-	text-align: right;
-	font-family: verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	margin-right: 10px;
-}
-
-.topnavright a:link {
-	text-decoration: none;
-	color: #944E0F;
-}
-
-.topnavright a:visited {
-	text-decoration: none;
-	color: #944E0F;
-}
-
-div.mainbackground {
-	background-color: #ffffff;
-	padding: 17 17 17 17;
-}
-
-div.maintextregion {
-	background-color: #5b5b5b;
-	color: #ffffff;
-}
-
-div.maintextregion h1 {
-	color: #F38019;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 28px
-}
-
-div.maintextregion h2 {
-	color: #F38019;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	margin-bottom: 2px;
-	font-size: 18px;
-	margin-top: 28px;
-}
-
-div.maintextregion h4 {
-	color: #ffffff;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-}
-
-div.maintextregion p {
-	color: #ffffff;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 150%;
-	text-align: justify;
-}
-
-div.maintextregion ul {
-	color: #ffffff;
-	list-style-type: square;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 150%;
-	text-align: justify;
-}
-
-div.maintextregion td ul ul {
-	color: #ffffff;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-}
-
-div.maintextregion dt {
-	color: #ffffff;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	margin-top: 10px;
-}
-
-div.maintextregion pre {
-	color: #ffffff;
-	font-size: 14px;
-}
-
-div.maintextregion td pre {
-	color: #ffffff;
-	font-size: 14px;
-}
-
-div.maintextregion dd {
-	color: #ffffff;
-    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 150%;
-	text-align: justify;
-	margin-left: 10px;
-}
-
-div.maintextregion table {
-	margin-top: 20;
-}
-
-div.maintextregion th {
-	color: #ffffff;
-	background-color: #494949;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	text-align: left;
-}
-
-div.maintextregion tr.odd {
-	color: #ffffff;
-	background-color: #393939;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-}
-
-div.maintextregion tr.even {
-	color: #ffffff;
-	background-color: #4d4d4d;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-}
-
-div.maintextregion form {
-	color: #ffffff;
-	background-color: #4d4d4d;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	border: thin solid #424242;
-	padding: 6;
-}
-
-div.maintextregion dd.left {
-	color: #ffffff;
-	margin-left: 0;
-}
-
-a:link  {
-	color: #ff9600;
-	text-decoration: none;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-}
-
-a:visited {
-	color: #ff9600;
-	text-decoration: none;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-}
-
-.imgholder {
-	text-align: center;
-	padding: 8;
-}
-.footer a:link {
-	text-decoration: none;
-	color: #944E0F;
-	font-size: 12px;
-	font-weight: bold;
-}
-.footer a:visited {
-	text-decoration: none;
-	color: #944E0F;
-	font-size: 12px;
-	font-weight: bold;
-}
-
diff --git a/testsuite/systemtap.examples/systemtapcorner.gif b/testsuite/systemtap.examples/systemtapcorner.gif
deleted file mode 100644
index c44f2c75..00000000
Binary files a/testsuite/systemtap.examples/systemtapcorner.gif and /dev/null differ
diff --git a/testsuite/systemtap.examples/systemtaplogo.png b/testsuite/systemtap.examples/systemtaplogo.png
deleted file mode 100644
index c223babd..00000000
Binary files a/testsuite/systemtap.examples/systemtaplogo.png and /dev/null differ
diff --git a/testsuite/systemtap.examples/thread-times.meta b/testsuite/systemtap.examples/thread-times.meta
deleted file mode 100644
index fcbf062e..00000000
--- a/testsuite/systemtap.examples/thread-times.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Profile kernel functions
-name: thread-times.stp
-version: 1.0
-author: anonymous
-keywords: profiling
-subsystem: kernel
-status: production
-exit: user-controlled
-output: sorted-list
-scope: system-wide
-description: The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.
-test_check: stap -p4 thread-times.stp
-test_installcheck: stap thread-times.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/thread-times.stp b/testsuite/systemtap.examples/thread-times.stp
deleted file mode 100644
index 1aeb2037..00000000
--- a/testsuite/systemtap.examples/thread-times.stp
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/stap
-
-probe timer.profile {
-   tid=tid()
-   if (!user_mode())
-      kticks[tid] <<< 1
-   else
-      uticks[tid] <<< 1
-   ticks <<< 1
-   tids[tid] <<< 1
-}
-
-global uticks, kticks, ticks
-
-global tids
-
-probe timer.s(5), end {
-   allticks = @count(ticks)
-   printf ("%5s %7s %7s (of %d ticks)\n", "tid", "%user", "%kernel", allticks)
-   foreach (tid in tids- limit 20) {
-     uscaled = @count(uticks[tid])*10000/allticks
-     kscaled = @count(kticks[tid])*10000/allticks
-     printf ("%5d %3d.%02d%% %3d.%02d%%\n",
-       tid, uscaled/100, uscaled%100, kscaled/100, kscaled%100)
-   }
-   printf("\n")
-
-   delete uticks
-   delete kticks
-   delete ticks
-   delete tids
-}
diff --git a/testsuite/systemtap.examples/traceio.meta b/testsuite/systemtap.examples/traceio.meta
deleted file mode 100644
index da0b99f3..00000000
--- a/testsuite/systemtap.examples/traceio.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Track Cumulative I/O Activity by Process Name
-name: traceio.stp
-version: 1.0
-author: Red Hat
-keywords: io
-subsystem: io
-status: production
-exit: user-controlled
-output: timed
-scope: system-wide
-description: Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.
-test_check: stap -p4 traceio.stp
-test_installcheck: stap traceio.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/traceio.stp b/testsuite/systemtap.examples/traceio.stp
deleted file mode 100644
index d3757c23..00000000
--- a/testsuite/systemtap.examples/traceio.stp
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env stap
-# traceio.stp
-# Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@redhat.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-
-global reads, writes, total_io
-
-probe kernel.function("vfs_read").return {
-	reads[execname()] += $return
-}
-
-probe kernel.function("vfs_write").return {
-	writes[execname()] += $return
-}
-
-probe timer.s(1) {
-	foreach (p in reads)
-		total_io[p] += reads[p]
-	foreach (p in writes)
-		total_io[p] += writes[p]
-	foreach(p in total_io- limit 10)
-		printf("%15s r: %8d KiB w: %8d KiB\n",
-			p, reads[p]/1024,
-			writes[p]/1024)
-		printf("\n")
-	# Note we don't zero out reads, writes and total_io,
-	# so the values are cumulative since the script started.
-}
diff --git a/testsuite/systemtap.examples/traceio2.meta b/testsuite/systemtap.examples/traceio2.meta
deleted file mode 100644
index 4b63108c..00000000
--- a/testsuite/systemtap.examples/traceio2.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Watch I/O Activity on a Particular Device
-name: traceio2.stp
-version: 1.0
-author: Red Hat
-keywords: io
-subsystem: io
-status: production
-exit: user-controlled
-output: trace
-scope: system-wide
-description: Print out the executable name and process number as reads and writes to the specified device occur.
-test_check: stap -p4 traceio2.stp 0x0801
-test_installcheck: stap traceio2.stp 0x0801 -c "sleep 1"
diff --git a/testsuite/systemtap.examples/traceio2.stp b/testsuite/systemtap.examples/traceio2.stp
deleted file mode 100644
index 656c38b3..00000000
--- a/testsuite/systemtap.examples/traceio2.stp
+++ /dev/null
@@ -1,20 +0,0 @@
-global device_of_interest
-
-probe begin {
-  /* The following is not the most efficient way to do this.
-      One could directly put the result of usrdev2kerndev()
-      into device_of_interest.  However, want to test out
-      the other device functions */
-  dev = usrdev2kerndev($1)
-  device_of_interest = MKDEV(MAJOR(dev), MINOR(dev))
-}
-
-probe kernel.function ("vfs_write"),
-      kernel.function ("vfs_read")
-{
-        dev_nr = $file->f_path->dentry->d_inode->i_sb->s_dev
-
-        if (dev_nr == device_of_interest)
-                printf ("%s(%d) %s 0x%x\n",
-		        execname(), pid(), probefunc(), dev_nr)
-}
diff --git a/testsuite/systemtap.examples/wait4time.meta b/testsuite/systemtap.examples/wait4time.meta
deleted file mode 100644
index a939d466..00000000
--- a/testsuite/systemtap.examples/wait4time.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Trace Time Spent in wait4 Syscalls
-name: wait4time.stp
-version: 1.0
-author: Daniel Berrange and Will Cohen
-keywords: syscall wait4
-subsystem: syscall
-status: production
-exit: user-controlled
-output: trace
-scope: system-wide
-description: The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".
-test_check: stap -p4 wait4time.stp
-test_installcheck: stap wait4time.stp -c "sleep 1"
diff --git a/testsuite/systemtap.examples/wait4time.stp b/testsuite/systemtap.examples/wait4time.stp
deleted file mode 100755
index ba300ea7..00000000
--- a/testsuite/systemtap.examples/wait4time.stp
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /usr/bin/env stap
-
-/*
- * Copyright (C) 2006-2007 Red Hat Inc.
- * 
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Print out the amount of time spent in the read and write systemcall
- * when a process closes each file is closed. Note that the script needs
- * to be running before the open operations occur for the script
- * to record data.
- *
- * Format is:
- * timestamp pid (executabable) wait4: time_us pid
- *
- * 155789807 4196 (ssh) wait4: 12 4197
- * 158270531 3215 (bash) wait4: 5410460 -1
- * 158270659 3215 (bash) wait4: 9 -1
- * 158557461 2614 (sendmail) wait4: 27 -1
- * 158557487 2614 (sendmail) wait4: 5 -1
- *
- */
-
-global start
-global entry_wait4
-global wait4_pid
-
-function timestamp:long() {
-  return gettimeofday_us() - start
-}
-
-function proc:string() {
-  return sprintf("%d (%s)", pid(), execname())
-}
-
-probe begin {
- start = gettimeofday_us()
-}
-
-probe syscall.wait4 {
-  t = gettimeofday_us(); p = pid()
-  entry_wait4[p] = t
-  wait4_pid[p]=pid
-}
-
-probe syscall.wait4.return {
-  t = gettimeofday_us(); p = pid()
-  elapsed_time = t - entry_wait4[p]
-  printf("%d %s wait4: %d %d\n",  timestamp(), proc(), elapsed_time,
-	wait4_pid[p])
-  delete entry_wait4[p]
-  delete wait4_pid[p]
-}
-- 
cgit 


From 174bcf4d659835bbd567875e9e7a574922df25af Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Thu, 7 Aug 2008 15:49:34 -0500
Subject: Added testsuite/systemtap.examples/.gitignore file. 2008-08-07  David
 Smith  <dsmith@redhat.com>

	* .gitignore: New file.
---
 testsuite/systemtap.examples/.gitignore | 3 +++
 testsuite/systemtap.examples/ChangeLog  | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 testsuite/systemtap.examples/.gitignore

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/.gitignore b/testsuite/systemtap.examples/.gitignore
new file mode 100644
index 00000000..748cbe2d
--- /dev/null
+++ b/testsuite/systemtap.examples/.gitignore
@@ -0,0 +1,3 @@
+index.*
+keyword-index.*
+subsystem-index.*
diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index fa6a3aa3..db334b3f 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-07  David Smith  <dsmith@redhat.com>
+
+	* .gitignore: New file.
+
 2008-08-07  Mark Wielaard  <mwielaard@redhat.com>
 
 	* examples-index-gen.pl: New file.
-- 
cgit 


From 210ff7bf228943abcc0399e6239d67462875d0db Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Thu, 7 Aug 2008 16:58:42 -0400
Subject: PR6823: store generated sample index files

---
 testsuite/systemtap.examples/ChangeLog             |   5 +
 testsuite/systemtap.examples/examples-index-gen.pl |   5 +-
 testsuite/systemtap.examples/html/html_header.tmpl |   6 +-
 testsuite/systemtap.examples/index.html            | 154 +++++++
 testsuite/systemtap.examples/index.txt             | 238 ++++++++++
 testsuite/systemtap.examples/keyword-index.html    | 299 ++++++++++++
 testsuite/systemtap.examples/keyword-index.txt     | 500 +++++++++++++++++++++
 testsuite/systemtap.examples/subsystem-index.html  | 186 ++++++++
 testsuite/systemtap.examples/subsystem-index.txt   | 267 +++++++++++
 9 files changed, 1655 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 testsuite/systemtap.examples/examples-index-gen.pl
 create mode 100644 testsuite/systemtap.examples/index.html
 create mode 100644 testsuite/systemtap.examples/index.txt
 create mode 100644 testsuite/systemtap.examples/keyword-index.html
 create mode 100644 testsuite/systemtap.examples/keyword-index.txt
 create mode 100644 testsuite/systemtap.examples/subsystem-index.html
 create mode 100644 testsuite/systemtap.examples/subsystem-index.txt

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index 89503a64..512ef9fe 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
+
+	* *index.txt, *index.html: New generated files.
+	* html/*, examples-index-gen.pl: Adapt to html/ boilerplate subdir.
+
 2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
 
 	* small_demos: Unique parts kept, others dropped.
diff --git a/testsuite/systemtap.examples/examples-index-gen.pl b/testsuite/systemtap.examples/examples-index-gen.pl
old mode 100644
new mode 100755
index bc12577e..8e968159
--- a/testsuite/systemtap.examples/examples-index-gen.pl
+++ b/testsuite/systemtap.examples/examples-index-gen.pl
@@ -1,3 +1,4 @@
+#! /usr/bin/perl
 # Generates index files from examples .meta file info.
 # Copyright (C) 2008 Red Hat Inc.
 #
@@ -78,12 +79,12 @@ sub add_meta_html(*;$) {
 my $HEADER = "SYSTEMTAP EXAMPLES INDEX\n"
     . "(see also subsystem-index.txt, keyword-index.txt)\n\n";
 
-my $header_tmpl = "$inputdir/html_header.tmpl";
+my $header_tmpl = "$inputdir/html/html_header.tmpl";
 open(TEMPLATE, "<$header_tmpl")
     || die "couldn't open $header_tmpl, $!";
 my $HTMLHEADER = do { local $/;  <TEMPLATE> };
 close(TEMPLATE);
-my $footer_tmpl = "$inputdir/html_footer.tmpl";
+my $footer_tmpl = "$inputdir/html/html_footer.tmpl";
 open(TEMPLATE, "<$footer_tmpl")
     || die "couldn't open $footer_tmpl, $!";
 my $HTMLFOOTER = do { local $/;  <TEMPLATE> };
diff --git a/testsuite/systemtap.examples/html/html_header.tmpl b/testsuite/systemtap.examples/html/html_header.tmpl
index 33ce558f..25c7e5a0 100644
--- a/testsuite/systemtap.examples/html/html_header.tmpl
+++ b/testsuite/systemtap.examples/html/html_header.tmpl
@@ -3,7 +3,7 @@
 <html>
 <head>
   <title>SystemTap Examples</title>
-  <link rel="stylesheet" href="systemtap.css" type="text/css">
+  <link rel="stylesheet" href="html/systemtap.css" type="text/css">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
 </head>
@@ -11,7 +11,7 @@
 <body>
   <table cellspacing="2" cellpadding="2" border="0" width="100%">
     <tr>
-      <td valign="bottom" height="80"><img src="systemtaplogo.png"
+      <td valign="bottom" height="80"><img src="html/systemtaplogo.png"
       alt="SystemTap logo" width="165" height="25"></td>
       <td valign="bottom" class="topnavright" align="right">
       <a href="http://sourceware.org/systemtap/">SystemTap</a>&nbsp;|&nbsp;
@@ -21,7 +21,7 @@
 
   <div class="mainbackground">
     <div class="maintextregion">
-      <img src="systemtapcorner.gif">
+      <img src="html/systemtapcorner.gif">
       <table cellspacing="2" cellpadding="4" border="0" width="99%"
              style="margin-top:17;">
       <tr>
diff --git a/testsuite/systemtap.examples/index.html b/testsuite/systemtap.examples/index.html
new file mode 100644
index 00000000..7557fffe
--- /dev/null
+++ b/testsuite/systemtap.examples/index.html
@@ -0,0 +1,154 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+  <title>SystemTap Examples</title>
+  <link rel="stylesheet" href="html/systemtap.css" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+</head>
+
+<body>
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td valign="bottom" height="80"><img src="html/systemtaplogo.png"
+      alt="SystemTap logo" width="165" height="25"></td>
+      <td valign="bottom" class="topnavright" align="right">
+      <a href="http://sourceware.org/systemtap/">SystemTap</a>&nbsp;|&nbsp;
+      </td>
+    </tr>
+  </table>
+
+  <div class="mainbackground">
+    <div class="maintextregion">
+      <img src="html/systemtapcorner.gif">
+      <table cellspacing="2" cellpadding="4" border="0" width="99%"
+             style="margin-top:17;">
+      <tr>
+      	<td width="200">&nbsp;</td>
+      	<td valign="bottom"><h1>Examples</h1></td>
+      </tr>
+      <tr>
+    		<td>&nbsp;</td>
+    		<td valign="top">
+
+	      	<h2>Example Indexes</h2>
+		   	<ul>
+           		<li><a href="index.html">All Examples</a></li>
+           		<li><a href="subsystem-index.html">By Subsystem</a></li>
+           		<li><a href="keyword-index.html">By Keyword</a></li>
+         	</ul>
+
+<h2>All Examples</h2>
+<ul>
+<li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
+output: plot data, exits: user-controlled, status: production<br>
+subsystem: disk cpu, keywords: disk cpu use graph<br>
+<p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
+<li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
+output: text, exits: fixed, status: production<br>
+subsystem: none, keywords: simple<br>
+<p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
+<li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: trace callgraph<br>
+<p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
+<li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: disk, keywords: disk<br>
+<p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
+<li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
+output: sorted on-exit, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io backtrace<br>
+<p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
+<li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall read write time io<br>
+<p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
+<li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
+<li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
+<li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
+<li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network traffic per-process<br>
+<p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
+<li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network socket<br>
+<p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
+<li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: locking, keywords: syscall locking futex<br>
+<p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
+<li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
+output: sorted-list, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling<br>
+<p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
+<li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
+output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>Print signal counts by process ID in descending order.</p></li>
+<li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
+output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>Print signal counts by process name in descending order.</p></li>
+<li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: signals, keywords: signals<br>
+<p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
+<li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
+output: trace, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
+<li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: scheduler, keywords: io scheduler<br>
+<p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
+<li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall sleep<br>
+<p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
+<li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall<br>
+<p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
+<li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall<br>
+<p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
+<li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall wait4<br>
+<p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
+<li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling functions<br>
+<p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
+<li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
+output: sorted-list, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling<br>
+<p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
+</ul>
+       	</td>
+       </tr>
+     </table>
+    </div>
+  </div>
+
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td align="center" class="footer"><a href=
+	  "http://sourceware.org/systemtap">SystemTap</a></td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/testsuite/systemtap.examples/index.txt b/testsuite/systemtap.examples/index.txt
new file mode 100644
index 00000000..e90cf2c6
--- /dev/null
+++ b/testsuite/systemtap.examples/index.txt
@@ -0,0 +1,238 @@
+SYSTEMTAP EXAMPLES INDEX
+(see also subsystem-index.txt, keyword-index.txt)
+
+general/graphs.stp - Graphing Disk and CPU Utilization
+output: plot data, exits: user-controlled, status: production
+subsystem: disk cpu, keywords: disk cpu use graph
+
+  The script tracks the disk and CPU utilization. The resulting output
+  of the script can be piped into gnuplot to generate a graph of disk
+  and CPU USE.
+
+
+general/helloworld.stp - SystemTap "Hello World" Program
+output: text, exits: fixed, status: production
+subsystem: none, keywords: simple
+
+  A basic "Hello World" program implemented in SystemTap script. It
+  prints out "hello world" message and then immediately exits.
+
+
+general/para-callgraph.stp - Tracing Calls for Sections of Code
+output: trace, exits: user-controlled, status: production
+subsystem: kernel, keywords: trace callgraph
+
+  The script takes two arguments: the first argument is the function to
+  starts/stops the per thread call graph traces and the second argument
+  is the list of functions to generate trace information on. The script
+  prints out a timestap for the thread, the function name and pid,
+  followed by entry or exit symboly and function name.
+
+
+io/disktop.stp - Summarize Disk Read/Write Traffic
+output: timed, exits: user-controlled, status: production
+subsystem: disk, keywords: disk
+
+  Get the status of reading/writing disk every 5 seconds, output top
+  ten entries during that period.
+
+
+io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
+output: sorted on-exit, exits: user-controlled, status: production
+subsystem: io, keywords: io backtrace
+
+  When a reschedule occurs during an AIO io_submit call, accumulate the
+  traceback in a histogram. When the script exits prints out a sorted
+  list from most common to least common backtrace.
+
+
+io/iotime.stp - Trace Time Spent in Read and Write for Files 
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall read write time io
+
+  The script watches each open, close, read, and write syscalls on the
+  system. For each file the scripts observes opened it accumulates the
+  amount of wall clock time spend in read and write operations and the
+  number of bytes read and written. When a file is closed the script
+  prints out a pair of lines for the file. Both lines begin with a
+  timestamp in microseconds, the PID number, and the executable name in
+  parenthesese. The first line with the "access" keyword lists the file
+  name, the attempted number of bytes for the read and write
+  operations. The second line with the "iotime" keyword list the file
+  name and the number of microseconds accumulated in the read and write
+  syscalls.
+
+
+io/iotop.stp - Periodically Print I/O Activity by Process Name
+output: timed, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Every five seconds print out the top ten executables generating I/O
+  traffic during that interval sorted in descending order.
+
+
+io/traceio.stp - Track Cumulative I/O Activity by Process Name
+output: timed, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Every second print out the top ten executables sorted in descending
+  order based on cumulative I/O traffic observed.
+
+
+io/traceio2.stp - Watch I/O Activity on a Particular Device
+output: trace, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Print out the executable name and process number as reads and writes
+  to the specified device occur.
+
+
+network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
+output: timed, exits: user-controlled, status: production
+subsystem: network, keywords: network traffic per-process
+
+  Every five seconds the nettop.stp script prints out a list of
+  processed (PID and command) with the number of packets sent/received
+  and the amount of data sent/received by the process during that
+  interval.
+
+
+network/socket-trace.stp - Trace Functions called in Network Socket Code
+output: trace, exits: user-controlled, status: production
+subsystem: network, keywords: network socket
+
+  The script instrument each of the functions inn the Linux kernel's
+  net/socket.c file. The script prints out trace. The first element of
+  a line is  time delta in microseconds from the previous entry. This
+  is followed by the command name and the PID. The "->" and "<-"
+  indicates function entry and	function exit, respectively. The last
+  element of the line is the function name.
+
+
+process/futexes.stp - System-Wide Futex Contention
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: locking, keywords: syscall locking futex
+
+  The script watches the futex syscall on the system. On exit the
+  futexes address, the number of contentions, and the average time for
+  each contention on the futex are printed from lowest pid number to
+  highest.
+
+
+process/pf2.stp - Profile kernel functions
+output: sorted-list, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling
+
+  The pf2.stp script sets up time-based sampling. Every five seconds it
+  prints out a sorted list with the top ten kernel functions with
+  samples.
+
+
+process/sig_by_pid.stp -  Signal Counts by Process ID
+output: sorted-list on-exit, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  Print signal counts by process ID in descending order.
+
+
+process/sig_by_proc.stp -  Signal Counts by Process Name
+output: sorted-list on-exit, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  Print signal counts by process name in descending order.
+
+
+process/sigkill.stp - Track SIGKILL Signals
+output: trace, exits: user-controlled, status: production
+subsystem: signals, keywords: signals
+
+  The script traces any SIGKILL signals. When that SIGKILL signal is
+  sent to a process, the script prints out the signal name, the
+  desination executable and process ID, the executable name user ID
+  that sent the signal.
+
+
+process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
+output: trace, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  The script watches for a particular signal sent to a specific
+  process. When that signal is sent to the specified process, the
+  script prints out the PID and executable of the process sending the
+  signal, the PID and executable name of the process receiving the
+  signal, and the signal number and name.
+
+
+process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
+output: trace, exits: user-controlled, status: production
+subsystem: scheduler, keywords: io scheduler
+
+  The script monitor time threads spend waiting for IO operations (in
+  "D" state) in the wait_for_completion function. If a thread spends
+  over 10ms wall-clock time waiting, information is printed out
+  describing the thread number and executable name. When slow the
+  wait_for_completion function complete, backtraces for the long
+  duration calls are printed out.
+
+
+process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall sleep
+
+  The script watches each nanosleep syscall on the system. At the end
+  of each nanosleep syscall the script prints out a line with a
+  timestamp in microseconds, the pid, the executable name in
+  paretheses, the "nanosleep:" key, and the duration of the sleep in
+  microseconds.
+
+
+process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall
+
+  The script watches all syscall on the system. On exit the script
+  prints a list showing the number of systemcalls executed by each PID
+  ordered from greatest to least number of syscalls.
+
+
+process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall
+
+  The script watches all syscall on the system. On exit the script
+  prints a list showing the number of systemcalls executed by each
+  executable ordered from greates to least number of syscalls.
+
+
+process/wait4time.stp - Trace Time Spent in wait4 Syscalls
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall wait4
+
+  The script watches each wait4 syscall on the system. At the end of
+  each wait4 syscall the script prints out a line with a timestamp in
+  microseconds, the pid, the executable name in paretheses, the
+  "wait4:" key, the duration of the wait and the PID that the wait4 was
+  waiting for. If the waited for PID is not specified , it is "-1".
+
+
+profiling/functioncallcount.stp - Count Times Functions Called
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling functions
+
+  The functioncallcount.stp script takes one argument, a list of
+  functions to probe. The script will run and count the number of times
+  that each of the functions on the list is called. On exit the script
+  will print a sorted list from most frequently to least frequently
+  called function.
+
+
+profiling/thread-times.stp - Profile kernel functions
+output: sorted-list, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling
+
+  The thread-times.stp script sets up time-based sampling. Every five
+  seconds it prints out a sorted list with the top twenty processes
+  with samples broken down into percentage total time spent in
+  user-space and kernel-space.
+
+
diff --git a/testsuite/systemtap.examples/keyword-index.html b/testsuite/systemtap.examples/keyword-index.html
new file mode 100644
index 00000000..07cca25b
--- /dev/null
+++ b/testsuite/systemtap.examples/keyword-index.html
@@ -0,0 +1,299 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+  <title>SystemTap Examples</title>
+  <link rel="stylesheet" href="html/systemtap.css" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+</head>
+
+<body>
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td valign="bottom" height="80"><img src="html/systemtaplogo.png"
+      alt="SystemTap logo" width="165" height="25"></td>
+      <td valign="bottom" class="topnavright" align="right">
+      <a href="http://sourceware.org/systemtap/">SystemTap</a>&nbsp;|&nbsp;
+      </td>
+    </tr>
+  </table>
+
+  <div class="mainbackground">
+    <div class="maintextregion">
+      <img src="html/systemtapcorner.gif">
+      <table cellspacing="2" cellpadding="4" border="0" width="99%"
+             style="margin-top:17;">
+      <tr>
+      	<td width="200">&nbsp;</td>
+      	<td valign="bottom"><h1>Examples</h1></td>
+      </tr>
+      <tr>
+    		<td>&nbsp;</td>
+    		<td valign="top">
+
+	      	<h2>Example Indexes</h2>
+		   	<ul>
+           		<li><a href="index.html">All Examples</a></li>
+           		<li><a href="subsystem-index.html">By Subsystem</a></li>
+           		<li><a href="keyword-index.html">By Keyword</a></li>
+         	</ul>
+
+<h2>Examples by Keyword</h2>
+<h3>BACKTRACE</h3>
+<ul>
+<li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
+output: sorted on-exit, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io backtrace<br>
+<p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
+</ul>
+<h3>CALLGRAPH</h3>
+<ul>
+<li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: trace callgraph<br>
+<p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
+</ul>
+<h3>CPU</h3>
+<ul>
+<li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
+output: plot data, exits: user-controlled, status: production<br>
+subsystem: disk cpu, keywords: disk cpu use graph<br>
+<p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
+</ul>
+<h3>DISK</h3>
+<ul>
+<li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
+output: plot data, exits: user-controlled, status: production<br>
+subsystem: disk cpu, keywords: disk cpu use graph<br>
+<p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
+<li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: disk, keywords: disk<br>
+<p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
+</ul>
+<h3>FUNCTIONS</h3>
+<ul>
+<li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling functions<br>
+<p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
+</ul>
+<h3>FUTEX</h3>
+<ul>
+<li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: locking, keywords: syscall locking futex<br>
+<p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
+</ul>
+<h3>GRAPH</h3>
+<ul>
+<li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
+output: plot data, exits: user-controlled, status: production<br>
+subsystem: disk cpu, keywords: disk cpu use graph<br>
+<p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
+</ul>
+<h3>IO</h3>
+<ul>
+<li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
+output: sorted on-exit, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io backtrace<br>
+<p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
+<li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall read write time io<br>
+<p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
+<li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
+<li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
+<li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
+<li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: scheduler, keywords: io scheduler<br>
+<p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
+</ul>
+<h3>LOCKING</h3>
+<ul>
+<li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: locking, keywords: syscall locking futex<br>
+<p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
+</ul>
+<h3>NETWORK</h3>
+<ul>
+<li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network traffic per-process<br>
+<p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
+<li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network socket<br>
+<p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
+</ul>
+<h3>PER-PROCESS</h3>
+<ul>
+<li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network traffic per-process<br>
+<p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
+</ul>
+<h3>PROFILING</h3>
+<ul>
+<li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
+output: sorted-list, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling<br>
+<p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
+<li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling functions<br>
+<p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
+<li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
+output: sorted-list, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling<br>
+<p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
+</ul>
+<h3>READ</h3>
+<ul>
+<li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall read write time io<br>
+<p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
+</ul>
+<h3>SCHEDULER</h3>
+<ul>
+<li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: scheduler, keywords: io scheduler<br>
+<p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
+</ul>
+<h3>SIGNALS</h3>
+<ul>
+<li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
+output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>Print signal counts by process ID in descending order.</p></li>
+<li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
+output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>Print signal counts by process name in descending order.</p></li>
+<li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: signals, keywords: signals<br>
+<p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
+<li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
+output: trace, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
+</ul>
+<h3>SIMPLE</h3>
+<ul>
+<li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
+output: text, exits: fixed, status: production<br>
+subsystem: none, keywords: simple<br>
+<p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
+</ul>
+<h3>SLEEP</h3>
+<ul>
+<li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall sleep<br>
+<p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
+</ul>
+<h3>SOCKET</h3>
+<ul>
+<li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network socket<br>
+<p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
+</ul>
+<h3>SYSCALL</h3>
+<ul>
+<li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall read write time io<br>
+<p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
+<li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: locking, keywords: syscall locking futex<br>
+<p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
+<li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall sleep<br>
+<p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
+<li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall<br>
+<p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
+<li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall<br>
+<p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
+<li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall wait4<br>
+<p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
+</ul>
+<h3>TIME</h3>
+<ul>
+<li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall read write time io<br>
+<p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
+</ul>
+<h3>TRACE</h3>
+<ul>
+<li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: trace callgraph<br>
+<p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
+</ul>
+<h3>TRAFFIC</h3>
+<ul>
+<li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network traffic per-process<br>
+<p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
+</ul>
+<h3>USE</h3>
+<ul>
+<li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
+output: plot data, exits: user-controlled, status: production<br>
+subsystem: disk cpu, keywords: disk cpu use graph<br>
+<p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
+</ul>
+<h3>WAIT4</h3>
+<ul>
+<li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall wait4<br>
+<p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
+</ul>
+<h3>WRITE</h3>
+<ul>
+<li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall read write time io<br>
+<p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
+</ul>
+       	</td>
+       </tr>
+     </table>
+    </div>
+  </div>
+
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td align="center" class="footer"><a href=
+	  "http://sourceware.org/systemtap">SystemTap</a></td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/testsuite/systemtap.examples/keyword-index.txt b/testsuite/systemtap.examples/keyword-index.txt
new file mode 100644
index 00000000..606430f2
--- /dev/null
+++ b/testsuite/systemtap.examples/keyword-index.txt
@@ -0,0 +1,500 @@
+SYSTEMTAP EXAMPLES INDEX BY KEYWORD
+(see also index.txt, subsystem-index.txt)
+
+= BACKTRACE =
+
+io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
+output: sorted on-exit, exits: user-controlled, status: production
+subsystem: io, keywords: io backtrace
+
+  When a reschedule occurs during an AIO io_submit call, accumulate the
+  traceback in a histogram. When the script exits prints out a sorted
+  list from most common to least common backtrace.
+
+
+= CALLGRAPH =
+
+general/para-callgraph.stp - Tracing Calls for Sections of Code
+output: trace, exits: user-controlled, status: production
+subsystem: kernel, keywords: trace callgraph
+
+  The script takes two arguments: the first argument is the function to
+  starts/stops the per thread call graph traces and the second argument
+  is the list of functions to generate trace information on. The script
+  prints out a timestap for the thread, the function name and pid,
+  followed by entry or exit symboly and function name.
+
+
+= CPU =
+
+general/graphs.stp - Graphing Disk and CPU Utilization
+output: plot data, exits: user-controlled, status: production
+subsystem: disk cpu, keywords: disk cpu use graph
+
+  The script tracks the disk and CPU utilization. The resulting output
+  of the script can be piped into gnuplot to generate a graph of disk
+  and CPU USE.
+
+
+= DISK =
+
+general/graphs.stp - Graphing Disk and CPU Utilization
+output: plot data, exits: user-controlled, status: production
+subsystem: disk cpu, keywords: disk cpu use graph
+
+  The script tracks the disk and CPU utilization. The resulting output
+  of the script can be piped into gnuplot to generate a graph of disk
+  and CPU USE.
+
+
+io/disktop.stp - Summarize Disk Read/Write Traffic
+output: timed, exits: user-controlled, status: production
+subsystem: disk, keywords: disk
+
+  Get the status of reading/writing disk every 5 seconds, output top
+  ten entries during that period.
+
+
+= FUNCTIONS =
+
+profiling/functioncallcount.stp - Count Times Functions Called
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling functions
+
+  The functioncallcount.stp script takes one argument, a list of
+  functions to probe. The script will run and count the number of times
+  that each of the functions on the list is called. On exit the script
+  will print a sorted list from most frequently to least frequently
+  called function.
+
+
+= FUTEX =
+
+process/futexes.stp - System-Wide Futex Contention
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: locking, keywords: syscall locking futex
+
+  The script watches the futex syscall on the system. On exit the
+  futexes address, the number of contentions, and the average time for
+  each contention on the futex are printed from lowest pid number to
+  highest.
+
+
+= GRAPH =
+
+general/graphs.stp - Graphing Disk and CPU Utilization
+output: plot data, exits: user-controlled, status: production
+subsystem: disk cpu, keywords: disk cpu use graph
+
+  The script tracks the disk and CPU utilization. The resulting output
+  of the script can be piped into gnuplot to generate a graph of disk
+  and CPU USE.
+
+
+= IO =
+
+io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
+output: sorted on-exit, exits: user-controlled, status: production
+subsystem: io, keywords: io backtrace
+
+  When a reschedule occurs during an AIO io_submit call, accumulate the
+  traceback in a histogram. When the script exits prints out a sorted
+  list from most common to least common backtrace.
+
+
+io/iotime.stp - Trace Time Spent in Read and Write for Files 
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall read write time io
+
+  The script watches each open, close, read, and write syscalls on the
+  system. For each file the scripts observes opened it accumulates the
+  amount of wall clock time spend in read and write operations and the
+  number of bytes read and written. When a file is closed the script
+  prints out a pair of lines for the file. Both lines begin with a
+  timestamp in microseconds, the PID number, and the executable name in
+  parenthesese. The first line with the "access" keyword lists the file
+  name, the attempted number of bytes for the read and write
+  operations. The second line with the "iotime" keyword list the file
+  name and the number of microseconds accumulated in the read and write
+  syscalls.
+
+
+io/iotop.stp - Periodically Print I/O Activity by Process Name
+output: timed, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Every five seconds print out the top ten executables generating I/O
+  traffic during that interval sorted in descending order.
+
+
+io/traceio.stp - Track Cumulative I/O Activity by Process Name
+output: timed, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Every second print out the top ten executables sorted in descending
+  order based on cumulative I/O traffic observed.
+
+
+io/traceio2.stp - Watch I/O Activity on a Particular Device
+output: trace, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Print out the executable name and process number as reads and writes
+  to the specified device occur.
+
+
+process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
+output: trace, exits: user-controlled, status: production
+subsystem: scheduler, keywords: io scheduler
+
+  The script monitor time threads spend waiting for IO operations (in
+  "D" state) in the wait_for_completion function. If a thread spends
+  over 10ms wall-clock time waiting, information is printed out
+  describing the thread number and executable name. When slow the
+  wait_for_completion function complete, backtraces for the long
+  duration calls are printed out.
+
+
+= LOCKING =
+
+process/futexes.stp - System-Wide Futex Contention
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: locking, keywords: syscall locking futex
+
+  The script watches the futex syscall on the system. On exit the
+  futexes address, the number of contentions, and the average time for
+  each contention on the futex are printed from lowest pid number to
+  highest.
+
+
+= NETWORK =
+
+network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
+output: timed, exits: user-controlled, status: production
+subsystem: network, keywords: network traffic per-process
+
+  Every five seconds the nettop.stp script prints out a list of
+  processed (PID and command) with the number of packets sent/received
+  and the amount of data sent/received by the process during that
+  interval.
+
+
+network/socket-trace.stp - Trace Functions called in Network Socket Code
+output: trace, exits: user-controlled, status: production
+subsystem: network, keywords: network socket
+
+  The script instrument each of the functions inn the Linux kernel's
+  net/socket.c file. The script prints out trace. The first element of
+  a line is  time delta in microseconds from the previous entry. This
+  is followed by the command name and the PID. The "->" and "<-"
+  indicates function entry and	function exit, respectively. The last
+  element of the line is the function name.
+
+
+= PER-PROCESS =
+
+network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
+output: timed, exits: user-controlled, status: production
+subsystem: network, keywords: network traffic per-process
+
+  Every five seconds the nettop.stp script prints out a list of
+  processed (PID and command) with the number of packets sent/received
+  and the amount of data sent/received by the process during that
+  interval.
+
+
+= PROFILING =
+
+process/pf2.stp - Profile kernel functions
+output: sorted-list, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling
+
+  The pf2.stp script sets up time-based sampling. Every five seconds it
+  prints out a sorted list with the top ten kernel functions with
+  samples.
+
+
+profiling/functioncallcount.stp - Count Times Functions Called
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling functions
+
+  The functioncallcount.stp script takes one argument, a list of
+  functions to probe. The script will run and count the number of times
+  that each of the functions on the list is called. On exit the script
+  will print a sorted list from most frequently to least frequently
+  called function.
+
+
+profiling/thread-times.stp - Profile kernel functions
+output: sorted-list, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling
+
+  The thread-times.stp script sets up time-based sampling. Every five
+  seconds it prints out a sorted list with the top twenty processes
+  with samples broken down into percentage total time spent in
+  user-space and kernel-space.
+
+
+= READ =
+
+io/iotime.stp - Trace Time Spent in Read and Write for Files 
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall read write time io
+
+  The script watches each open, close, read, and write syscalls on the
+  system. For each file the scripts observes opened it accumulates the
+  amount of wall clock time spend in read and write operations and the
+  number of bytes read and written. When a file is closed the script
+  prints out a pair of lines for the file. Both lines begin with a
+  timestamp in microseconds, the PID number, and the executable name in
+  parenthesese. The first line with the "access" keyword lists the file
+  name, the attempted number of bytes for the read and write
+  operations. The second line with the "iotime" keyword list the file
+  name and the number of microseconds accumulated in the read and write
+  syscalls.
+
+
+= SCHEDULER =
+
+process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
+output: trace, exits: user-controlled, status: production
+subsystem: scheduler, keywords: io scheduler
+
+  The script monitor time threads spend waiting for IO operations (in
+  "D" state) in the wait_for_completion function. If a thread spends
+  over 10ms wall-clock time waiting, information is printed out
+  describing the thread number and executable name. When slow the
+  wait_for_completion function complete, backtraces for the long
+  duration calls are printed out.
+
+
+= SIGNALS =
+
+process/sig_by_pid.stp -  Signal Counts by Process ID
+output: sorted-list on-exit, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  Print signal counts by process ID in descending order.
+
+
+process/sig_by_proc.stp -  Signal Counts by Process Name
+output: sorted-list on-exit, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  Print signal counts by process name in descending order.
+
+
+process/sigkill.stp - Track SIGKILL Signals
+output: trace, exits: user-controlled, status: production
+subsystem: signals, keywords: signals
+
+  The script traces any SIGKILL signals. When that SIGKILL signal is
+  sent to a process, the script prints out the signal name, the
+  desination executable and process ID, the executable name user ID
+  that sent the signal.
+
+
+process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
+output: trace, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  The script watches for a particular signal sent to a specific
+  process. When that signal is sent to the specified process, the
+  script prints out the PID and executable of the process sending the
+  signal, the PID and executable name of the process receiving the
+  signal, and the signal number and name.
+
+
+= SIMPLE =
+
+general/helloworld.stp - SystemTap "Hello World" Program
+output: text, exits: fixed, status: production
+subsystem: none, keywords: simple
+
+  A basic "Hello World" program implemented in SystemTap script. It
+  prints out "hello world" message and then immediately exits.
+
+
+= SLEEP =
+
+process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall sleep
+
+  The script watches each nanosleep syscall on the system. At the end
+  of each nanosleep syscall the script prints out a line with a
+  timestamp in microseconds, the pid, the executable name in
+  paretheses, the "nanosleep:" key, and the duration of the sleep in
+  microseconds.
+
+
+= SOCKET =
+
+network/socket-trace.stp - Trace Functions called in Network Socket Code
+output: trace, exits: user-controlled, status: production
+subsystem: network, keywords: network socket
+
+  The script instrument each of the functions inn the Linux kernel's
+  net/socket.c file. The script prints out trace. The first element of
+  a line is  time delta in microseconds from the previous entry. This
+  is followed by the command name and the PID. The "->" and "<-"
+  indicates function entry and	function exit, respectively. The last
+  element of the line is the function name.
+
+
+= SYSCALL =
+
+io/iotime.stp - Trace Time Spent in Read and Write for Files 
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall read write time io
+
+  The script watches each open, close, read, and write syscalls on the
+  system. For each file the scripts observes opened it accumulates the
+  amount of wall clock time spend in read and write operations and the
+  number of bytes read and written. When a file is closed the script
+  prints out a pair of lines for the file. Both lines begin with a
+  timestamp in microseconds, the PID number, and the executable name in
+  parenthesese. The first line with the "access" keyword lists the file
+  name, the attempted number of bytes for the read and write
+  operations. The second line with the "iotime" keyword list the file
+  name and the number of microseconds accumulated in the read and write
+  syscalls.
+
+
+process/futexes.stp - System-Wide Futex Contention
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: locking, keywords: syscall locking futex
+
+  The script watches the futex syscall on the system. On exit the
+  futexes address, the number of contentions, and the average time for
+  each contention on the futex are printed from lowest pid number to
+  highest.
+
+
+process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall sleep
+
+  The script watches each nanosleep syscall on the system. At the end
+  of each nanosleep syscall the script prints out a line with a
+  timestamp in microseconds, the pid, the executable name in
+  paretheses, the "nanosleep:" key, and the duration of the sleep in
+  microseconds.
+
+
+process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall
+
+  The script watches all syscall on the system. On exit the script
+  prints a list showing the number of systemcalls executed by each PID
+  ordered from greatest to least number of syscalls.
+
+
+process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall
+
+  The script watches all syscall on the system. On exit the script
+  prints a list showing the number of systemcalls executed by each
+  executable ordered from greates to least number of syscalls.
+
+
+process/wait4time.stp - Trace Time Spent in wait4 Syscalls
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall wait4
+
+  The script watches each wait4 syscall on the system. At the end of
+  each wait4 syscall the script prints out a line with a timestamp in
+  microseconds, the pid, the executable name in paretheses, the
+  "wait4:" key, the duration of the wait and the PID that the wait4 was
+  waiting for. If the waited for PID is not specified , it is "-1".
+
+
+= TIME =
+
+io/iotime.stp - Trace Time Spent in Read and Write for Files 
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall read write time io
+
+  The script watches each open, close, read, and write syscalls on the
+  system. For each file the scripts observes opened it accumulates the
+  amount of wall clock time spend in read and write operations and the
+  number of bytes read and written. When a file is closed the script
+  prints out a pair of lines for the file. Both lines begin with a
+  timestamp in microseconds, the PID number, and the executable name in
+  parenthesese. The first line with the "access" keyword lists the file
+  name, the attempted number of bytes for the read and write
+  operations. The second line with the "iotime" keyword list the file
+  name and the number of microseconds accumulated in the read and write
+  syscalls.
+
+
+= TRACE =
+
+general/para-callgraph.stp - Tracing Calls for Sections of Code
+output: trace, exits: user-controlled, status: production
+subsystem: kernel, keywords: trace callgraph
+
+  The script takes two arguments: the first argument is the function to
+  starts/stops the per thread call graph traces and the second argument
+  is the list of functions to generate trace information on. The script
+  prints out a timestap for the thread, the function name and pid,
+  followed by entry or exit symboly and function name.
+
+
+= TRAFFIC =
+
+network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
+output: timed, exits: user-controlled, status: production
+subsystem: network, keywords: network traffic per-process
+
+  Every five seconds the nettop.stp script prints out a list of
+  processed (PID and command) with the number of packets sent/received
+  and the amount of data sent/received by the process during that
+  interval.
+
+
+= USE =
+
+general/graphs.stp - Graphing Disk and CPU Utilization
+output: plot data, exits: user-controlled, status: production
+subsystem: disk cpu, keywords: disk cpu use graph
+
+  The script tracks the disk and CPU utilization. The resulting output
+  of the script can be piped into gnuplot to generate a graph of disk
+  and CPU USE.
+
+
+= WAIT4 =
+
+process/wait4time.stp - Trace Time Spent in wait4 Syscalls
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall wait4
+
+  The script watches each wait4 syscall on the system. At the end of
+  each wait4 syscall the script prints out a line with a timestamp in
+  microseconds, the pid, the executable name in paretheses, the
+  "wait4:" key, the duration of the wait and the PID that the wait4 was
+  waiting for. If the waited for PID is not specified , it is "-1".
+
+
+= WRITE =
+
+io/iotime.stp - Trace Time Spent in Read and Write for Files 
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall read write time io
+
+  The script watches each open, close, read, and write syscalls on the
+  system. For each file the scripts observes opened it accumulates the
+  amount of wall clock time spend in read and write operations and the
+  number of bytes read and written. When a file is closed the script
+  prints out a pair of lines for the file. Both lines begin with a
+  timestamp in microseconds, the PID number, and the executable name in
+  parenthesese. The first line with the "access" keyword lists the file
+  name, the attempted number of bytes for the read and write
+  operations. The second line with the "iotime" keyword list the file
+  name and the number of microseconds accumulated in the read and write
+  syscalls.
+
+
diff --git a/testsuite/systemtap.examples/subsystem-index.html b/testsuite/systemtap.examples/subsystem-index.html
new file mode 100644
index 00000000..c868d340
--- /dev/null
+++ b/testsuite/systemtap.examples/subsystem-index.html
@@ -0,0 +1,186 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+  <title>SystemTap Examples</title>
+  <link rel="stylesheet" href="html/systemtap.css" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+</head>
+
+<body>
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td valign="bottom" height="80"><img src="html/systemtaplogo.png"
+      alt="SystemTap logo" width="165" height="25"></td>
+      <td valign="bottom" class="topnavright" align="right">
+      <a href="http://sourceware.org/systemtap/">SystemTap</a>&nbsp;|&nbsp;
+      </td>
+    </tr>
+  </table>
+
+  <div class="mainbackground">
+    <div class="maintextregion">
+      <img src="html/systemtapcorner.gif">
+      <table cellspacing="2" cellpadding="4" border="0" width="99%"
+             style="margin-top:17;">
+      <tr>
+      	<td width="200">&nbsp;</td>
+      	<td valign="bottom"><h1>Examples</h1></td>
+      </tr>
+      <tr>
+    		<td>&nbsp;</td>
+    		<td valign="top">
+
+	      	<h2>Example Indexes</h2>
+		   	<ul>
+           		<li><a href="index.html">All Examples</a></li>
+           		<li><a href="subsystem-index.html">By Subsystem</a></li>
+           		<li><a href="keyword-index.html">By Keyword</a></li>
+         	</ul>
+
+<h2>Examples by Subsystem</h2>
+<h3>CPU</h3>
+<ul>
+<li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
+output: plot data, exits: user-controlled, status: production<br>
+subsystem: disk cpu, keywords: disk cpu use graph<br>
+<p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
+</ul>
+<h3>DISK</h3>
+<ul>
+<li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
+output: plot data, exits: user-controlled, status: production<br>
+subsystem: disk cpu, keywords: disk cpu use graph<br>
+<p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
+<li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: disk, keywords: disk<br>
+<p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
+</ul>
+<h3>IO</h3>
+<ul>
+<li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
+output: sorted on-exit, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io backtrace<br>
+<p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
+<li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
+<li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
+<li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: io, keywords: io<br>
+<p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
+</ul>
+<h3>KERNEL</h3>
+<ul>
+<li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: trace callgraph<br>
+<p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
+<li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
+output: sorted-list, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling<br>
+<p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
+<li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling functions<br>
+<p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
+<li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
+output: sorted-list, exits: user-controlled, status: production<br>
+subsystem: kernel, keywords: profiling<br>
+<p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
+</ul>
+<h3>LOCKING</h3>
+<ul>
+<li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: locking, keywords: syscall locking futex<br>
+<p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
+</ul>
+<h3>NETWORK</h3>
+<ul>
+<li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
+output: timed, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network traffic per-process<br>
+<p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
+<li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: network, keywords: network socket<br>
+<p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
+</ul>
+<h3>NONE</h3>
+<ul>
+<li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
+output: text, exits: fixed, status: production<br>
+subsystem: none, keywords: simple<br>
+<p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
+</ul>
+<h3>SCHEDULER</h3>
+<ul>
+<li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: scheduler, keywords: io scheduler<br>
+<p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
+</ul>
+<h3>SIGNALS</h3>
+<ul>
+<li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
+output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>Print signal counts by process ID in descending order.</p></li>
+<li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
+output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>Print signal counts by process name in descending order.</p></li>
+<li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: signals, keywords: signals<br>
+<p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
+<li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
+output: trace, exits: user-controlled, status: experimental<br>
+subsystem: signals, keywords: signals<br>
+<p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
+</ul>
+<h3>SYSCALL</h3>
+<ul>
+<li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall read write time io<br>
+<p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
+<li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall sleep<br>
+<p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
+<li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall<br>
+<p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
+<li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
+output: sorted-list on-exit, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall<br>
+<p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
+<li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
+output: trace, exits: user-controlled, status: production<br>
+subsystem: syscall, keywords: syscall wait4<br>
+<p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
+</ul>
+       	</td>
+       </tr>
+     </table>
+    </div>
+  </div>
+
+  <table cellspacing="2" cellpadding="2" border="0" width="100%">
+    <tr>
+      <td align="center" class="footer"><a href=
+	  "http://sourceware.org/systemtap">SystemTap</a></td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/testsuite/systemtap.examples/subsystem-index.txt b/testsuite/systemtap.examples/subsystem-index.txt
new file mode 100644
index 00000000..9f83a544
--- /dev/null
+++ b/testsuite/systemtap.examples/subsystem-index.txt
@@ -0,0 +1,267 @@
+SYSTEMTAP EXAMPLES INDEX BY SUBSYSTEM
+(see also index.txt, keyword-index.txt)
+
+= CPU =
+
+general/graphs.stp - Graphing Disk and CPU Utilization
+output: plot data, exits: user-controlled, status: production
+subsystem: disk cpu, keywords: disk cpu use graph
+
+  The script tracks the disk and CPU utilization. The resulting output
+  of the script can be piped into gnuplot to generate a graph of disk
+  and CPU USE.
+
+
+= DISK =
+
+general/graphs.stp - Graphing Disk and CPU Utilization
+output: plot data, exits: user-controlled, status: production
+subsystem: disk cpu, keywords: disk cpu use graph
+
+  The script tracks the disk and CPU utilization. The resulting output
+  of the script can be piped into gnuplot to generate a graph of disk
+  and CPU USE.
+
+
+io/disktop.stp - Summarize Disk Read/Write Traffic
+output: timed, exits: user-controlled, status: production
+subsystem: disk, keywords: disk
+
+  Get the status of reading/writing disk every 5 seconds, output top
+  ten entries during that period.
+
+
+= IO =
+
+io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
+output: sorted on-exit, exits: user-controlled, status: production
+subsystem: io, keywords: io backtrace
+
+  When a reschedule occurs during an AIO io_submit call, accumulate the
+  traceback in a histogram. When the script exits prints out a sorted
+  list from most common to least common backtrace.
+
+
+io/iotop.stp - Periodically Print I/O Activity by Process Name
+output: timed, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Every five seconds print out the top ten executables generating I/O
+  traffic during that interval sorted in descending order.
+
+
+io/traceio.stp - Track Cumulative I/O Activity by Process Name
+output: timed, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Every second print out the top ten executables sorted in descending
+  order based on cumulative I/O traffic observed.
+
+
+io/traceio2.stp - Watch I/O Activity on a Particular Device
+output: trace, exits: user-controlled, status: production
+subsystem: io, keywords: io
+
+  Print out the executable name and process number as reads and writes
+  to the specified device occur.
+
+
+= KERNEL =
+
+general/para-callgraph.stp - Tracing Calls for Sections of Code
+output: trace, exits: user-controlled, status: production
+subsystem: kernel, keywords: trace callgraph
+
+  The script takes two arguments: the first argument is the function to
+  starts/stops the per thread call graph traces and the second argument
+  is the list of functions to generate trace information on. The script
+  prints out a timestap for the thread, the function name and pid,
+  followed by entry or exit symboly and function name.
+
+
+process/pf2.stp - Profile kernel functions
+output: sorted-list, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling
+
+  The pf2.stp script sets up time-based sampling. Every five seconds it
+  prints out a sorted list with the top ten kernel functions with
+  samples.
+
+
+profiling/functioncallcount.stp - Count Times Functions Called
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling functions
+
+  The functioncallcount.stp script takes one argument, a list of
+  functions to probe. The script will run and count the number of times
+  that each of the functions on the list is called. On exit the script
+  will print a sorted list from most frequently to least frequently
+  called function.
+
+
+profiling/thread-times.stp - Profile kernel functions
+output: sorted-list, exits: user-controlled, status: production
+subsystem: kernel, keywords: profiling
+
+  The thread-times.stp script sets up time-based sampling. Every five
+  seconds it prints out a sorted list with the top twenty processes
+  with samples broken down into percentage total time spent in
+  user-space and kernel-space.
+
+
+= LOCKING =
+
+process/futexes.stp - System-Wide Futex Contention
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: locking, keywords: syscall locking futex
+
+  The script watches the futex syscall on the system. On exit the
+  futexes address, the number of contentions, and the average time for
+  each contention on the futex are printed from lowest pid number to
+  highest.
+
+
+= NETWORK =
+
+network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
+output: timed, exits: user-controlled, status: production
+subsystem: network, keywords: network traffic per-process
+
+  Every five seconds the nettop.stp script prints out a list of
+  processed (PID and command) with the number of packets sent/received
+  and the amount of data sent/received by the process during that
+  interval.
+
+
+network/socket-trace.stp - Trace Functions called in Network Socket Code
+output: trace, exits: user-controlled, status: production
+subsystem: network, keywords: network socket
+
+  The script instrument each of the functions inn the Linux kernel's
+  net/socket.c file. The script prints out trace. The first element of
+  a line is  time delta in microseconds from the previous entry. This
+  is followed by the command name and the PID. The "->" and "<-"
+  indicates function entry and	function exit, respectively. The last
+  element of the line is the function name.
+
+
+= NONE =
+
+general/helloworld.stp - SystemTap "Hello World" Program
+output: text, exits: fixed, status: production
+subsystem: none, keywords: simple
+
+  A basic "Hello World" program implemented in SystemTap script. It
+  prints out "hello world" message and then immediately exits.
+
+
+= SCHEDULER =
+
+process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
+output: trace, exits: user-controlled, status: production
+subsystem: scheduler, keywords: io scheduler
+
+  The script monitor time threads spend waiting for IO operations (in
+  "D" state) in the wait_for_completion function. If a thread spends
+  over 10ms wall-clock time waiting, information is printed out
+  describing the thread number and executable name. When slow the
+  wait_for_completion function complete, backtraces for the long
+  duration calls are printed out.
+
+
+= SIGNALS =
+
+process/sig_by_pid.stp -  Signal Counts by Process ID
+output: sorted-list on-exit, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  Print signal counts by process ID in descending order.
+
+
+process/sig_by_proc.stp -  Signal Counts by Process Name
+output: sorted-list on-exit, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  Print signal counts by process name in descending order.
+
+
+process/sigkill.stp - Track SIGKILL Signals
+output: trace, exits: user-controlled, status: production
+subsystem: signals, keywords: signals
+
+  The script traces any SIGKILL signals. When that SIGKILL signal is
+  sent to a process, the script prints out the signal name, the
+  desination executable and process ID, the executable name user ID
+  that sent the signal.
+
+
+process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
+output: trace, exits: user-controlled, status: experimental
+subsystem: signals, keywords: signals
+
+  The script watches for a particular signal sent to a specific
+  process. When that signal is sent to the specified process, the
+  script prints out the PID and executable of the process sending the
+  signal, the PID and executable name of the process receiving the
+  signal, and the signal number and name.
+
+
+= SYSCALL =
+
+io/iotime.stp - Trace Time Spent in Read and Write for Files 
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall read write time io
+
+  The script watches each open, close, read, and write syscalls on the
+  system. For each file the scripts observes opened it accumulates the
+  amount of wall clock time spend in read and write operations and the
+  number of bytes read and written. When a file is closed the script
+  prints out a pair of lines for the file. Both lines begin with a
+  timestamp in microseconds, the PID number, and the executable name in
+  parenthesese. The first line with the "access" keyword lists the file
+  name, the attempted number of bytes for the read and write
+  operations. The second line with the "iotime" keyword list the file
+  name and the number of microseconds accumulated in the read and write
+  syscalls.
+
+
+process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall sleep
+
+  The script watches each nanosleep syscall on the system. At the end
+  of each nanosleep syscall the script prints out a line with a
+  timestamp in microseconds, the pid, the executable name in
+  paretheses, the "nanosleep:" key, and the duration of the sleep in
+  microseconds.
+
+
+process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall
+
+  The script watches all syscall on the system. On exit the script
+  prints a list showing the number of systemcalls executed by each PID
+  ordered from greatest to least number of syscalls.
+
+
+process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
+output: sorted-list on-exit, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall
+
+  The script watches all syscall on the system. On exit the script
+  prints a list showing the number of systemcalls executed by each
+  executable ordered from greates to least number of syscalls.
+
+
+process/wait4time.stp - Trace Time Spent in wait4 Syscalls
+output: trace, exits: user-controlled, status: production
+subsystem: syscall, keywords: syscall wait4
+
+  The script watches each wait4 syscall on the system. At the end of
+  each wait4 syscall the script prints out a line with a timestamp in
+  microseconds, the pid, the executable name in paretheses, the
+  "wait4:" key, the duration of the wait and the PID that the wait4 was
+  waiting for. If the waited for PID is not specified , it is "-1".
+
+
-- 
cgit 


From d6ff6e8c48f1d6bd1304fb5d23bcb8f6e35db6cd Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Thu, 7 Aug 2008 17:04:16 -0400
Subject: remove chmod +x from perl script to avoid spurious build-time
 rpm-found prereq

---
 testsuite/systemtap.examples/examples-index-gen.pl | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 testsuite/systemtap.examples/examples-index-gen.pl

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/examples-index-gen.pl b/testsuite/systemtap.examples/examples-index-gen.pl
old mode 100755
new mode 100644
-- 
cgit 


From 551a4f58263d6ce961658ba3b3d461c2f5046cb0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Fri, 8 Aug 2008 13:29:55 +0200
Subject: Make sure examples indexes are always generated in builddir.

---
 testsuite/systemtap.examples/ChangeLog             |  7 +++++++
 testsuite/systemtap.examples/examples-index-gen.pl | 15 +++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index d5840f96..31a981aa 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
+
+	* examples-index-gen.pl (inputdir): Make absolute.
+	(outputdir): Likewise.
+	(supportfiles): Copy from new html dir. Add README. Make sure
+	new html subdir is created in outputdir.
+
 2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
 
 	* *index.txt, *index.html: New generated files.
diff --git a/testsuite/systemtap.examples/examples-index-gen.pl b/testsuite/systemtap.examples/examples-index-gen.pl
index 8e968159..726df973 100644
--- a/testsuite/systemtap.examples/examples-index-gen.pl
+++ b/testsuite/systemtap.examples/examples-index-gen.pl
@@ -10,6 +10,7 @@
 use strict;
 use warnings;
 
+use Cwd 'abs_path';
 use File::Copy;
 use File::Find;
 use File::Path;
@@ -21,6 +22,7 @@ if ($#ARGV >= 0) {
 } else {
     $inputdir = ".";
 }
+$inputdir = abs_path($inputdir);
 
 my $outputdir;
 if ($#ARGV >= 1) {
@@ -28,6 +30,7 @@ if ($#ARGV >= 1) {
 } else {
     $outputdir = $inputdir;
 }
+$outputdir = abs_path($outputdir);
 
 my %scripts = ();
 print "Parsing .meta files in $inputdir...\n";
@@ -198,17 +201,21 @@ close (KEYINDEX);
 close (KEYHTML);
 
 my @supportfiles
-    = ("systemtapcorner.gif",
-       "systemtap.css",
-       "systemtaplogo.png");
+    = ("html/systemtapcorner.gif",
+       "html/systemtap.css",
+       "html/systemtaplogo.png",
+       "README");
 if ($inputdir ne $outputdir) {
     my $file;
     print "Copying support files...\n";
+    if (! -d "$outputdir/html") {
+	mkpath("$outputdir/html", 1, 0711);
+    }
     foreach $file (@supportfiles) {
 	my $orig = "$inputdir/$file";
 	my $dest = "$outputdir/$file";
 	print "Copying $file to $dest...\n";
-	copy("$orig", $dest) or die "$file cannot be copied to $dest, $!";
+	copy($orig, $dest) or die "$file cannot be copied to $dest, $!";
     }
 }
 
-- 
cgit 


From 03e73903d46c54ed0a1e1a06ed4c21b6570fda9e Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Fri, 8 Aug 2008 15:30:08 +0200
Subject: Don't output output, exits, status line in indexes (mentioned in
 descriptions).

---
 testsuite/systemtap.examples/ChangeLog             |   8 ++
 testsuite/systemtap.examples/examples-index-gen.pl |  18 +--
 testsuite/systemtap.examples/index.html            |  72 ++++--------
 testsuite/systemtap.examples/index.txt             |  72 ++++--------
 testsuite/systemtap.examples/keyword-index.html    | 126 +++++++--------------
 testsuite/systemtap.examples/keyword-index.txt     | 126 +++++++--------------
 testsuite/systemtap.examples/subsystem-index.html  |  75 ++++--------
 testsuite/systemtap.examples/subsystem-index.txt   |  75 ++++--------
 8 files changed, 200 insertions(+), 372 deletions(-)

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index 31a981aa..8f425995 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
+
+	* examples-index-gen.pl (add_meta_txt): Don't output output, exits,
+	status line.
+	(add_meta_html): Likewise.
+	* *index.html: Regenerated.
+	* *index.txt: Likewise.
+
 2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
 
 	* examples-index-gen.pl (inputdir): Make absolute.
diff --git a/testsuite/systemtap.examples/examples-index-gen.pl b/testsuite/systemtap.examples/examples-index-gen.pl
index 726df973..e105f3fc 100644
--- a/testsuite/systemtap.examples/examples-index-gen.pl
+++ b/testsuite/systemtap.examples/examples-index-gen.pl
@@ -48,11 +48,12 @@ sub add_meta_txt(*;$) {
 
     print $file "$scripts{$meta}{name} - $scripts{$meta}{title}\n";
 
-    print $file "output: $scripts{$meta}{output}, ";
-    print $file "exits: $scripts{$meta}{exit}, ";
-    print $file "status: $scripts{$meta}{status}\n";
+    # Don't output these, the description mentions all these in general.
+    #print $file "output: $scripts{$meta}{output}, ";
+    #print $file "exits: $scripts{$meta}{exit}, ";
+    #print $file "status: $scripts{$meta}{status}\n";
 
-    print $file "subsystem: $scripts{$meta}{subsystem}, ";
+    print $file "subsystems: $scripts{$meta}{subsystem}, ";
     print $file "keywords: $scripts{$meta}{keywords}\n\n";
 
     $Text::Wrap::columns = 72;
@@ -68,11 +69,12 @@ sub add_meta_html(*;$) {
     print $file "<li><a href=\"$name\">$name</a> ";
     print $file "- $scripts{$meta}{title}<br>\n";
 
-    print $file "output: $scripts{$meta}{output}, ";
-    print $file "exits: $scripts{$meta}{exit}, ";
-    print $file "status: $scripts{$meta}{status}<br>\n";
+    # Don't output these, the description mentions all these in general.
+    #print $file "output: $scripts{$meta}{output}, ";
+    #print $file "exits: $scripts{$meta}{exit}, ";
+    #print $file "status: $scripts{$meta}{status}<br>\n";
 
-    print $file "subsystem: $scripts{$meta}{subsystem}, ";
+    print $file "subsystems: $scripts{$meta}{subsystem}, ";
     print $file "keywords: $scripts{$meta}{keywords}<br>\n";
 
     print $file "<p>$scripts{$meta}{description}";
diff --git a/testsuite/systemtap.examples/index.html b/testsuite/systemtap.examples/index.html
index 7557fffe..327e9ef9 100644
--- a/testsuite/systemtap.examples/index.html
+++ b/testsuite/systemtap.examples/index.html
@@ -42,100 +42,76 @@
 <h2>All Examples</h2>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 <li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
-output: text, exits: fixed, status: production<br>
-subsystem: none, keywords: simple<br>
+subsystems: none, keywords: simple<br>
 <p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: trace callgraph<br>
+subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 <li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: disk, keywords: disk<br>
+subsystems: disk, keywords: disk<br>
 <p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
-output: sorted on-exit, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io backtrace<br>
+subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 <li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
 <li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
 <li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network socket<br>
+subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 <li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
 <li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process ID in descending order.</p></li>
 <li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process name in descending order.</p></li>
 <li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: trace, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: scheduler, keywords: io scheduler<br>
+subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall sleep<br>
+subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
 <li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall wait4<br>
+subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling functions<br>
+subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 <li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
 </ul>
        	</td>
diff --git a/testsuite/systemtap.examples/index.txt b/testsuite/systemtap.examples/index.txt
index e90cf2c6..aed6f457 100644
--- a/testsuite/systemtap.examples/index.txt
+++ b/testsuite/systemtap.examples/index.txt
@@ -2,8 +2,7 @@ SYSTEMTAP EXAMPLES INDEX
 (see also subsystem-index.txt, keyword-index.txt)
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -11,16 +10,14 @@ subsystem: disk cpu, keywords: disk cpu use graph
 
 
 general/helloworld.stp - SystemTap "Hello World" Program
-output: text, exits: fixed, status: production
-subsystem: none, keywords: simple
+subsystems: none, keywords: simple
 
   A basic "Hello World" program implemented in SystemTap script. It
   prints out "hello world" message and then immediately exits.
 
 
 general/para-callgraph.stp - Tracing Calls for Sections of Code
-output: trace, exits: user-controlled, status: production
-subsystem: kernel, keywords: trace callgraph
+subsystems: kernel, keywords: trace callgraph
 
   The script takes two arguments: the first argument is the function to
   starts/stops the per thread call graph traces and the second argument
@@ -30,16 +27,14 @@ subsystem: kernel, keywords: trace callgraph
 
 
 io/disktop.stp - Summarize Disk Read/Write Traffic
-output: timed, exits: user-controlled, status: production
-subsystem: disk, keywords: disk
+subsystems: disk, keywords: disk
 
   Get the status of reading/writing disk every 5 seconds, output top
   ten entries during that period.
 
 
 io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
-output: sorted on-exit, exits: user-controlled, status: production
-subsystem: io, keywords: io backtrace
+subsystems: io, keywords: io backtrace
 
   When a reschedule occurs during an AIO io_submit call, accumulate the
   traceback in a histogram. When the script exits prints out a sorted
@@ -47,8 +42,7 @@ subsystem: io, keywords: io backtrace
 
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -64,32 +58,28 @@ subsystem: syscall, keywords: syscall read write time io
 
 
 io/iotop.stp - Periodically Print I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every five seconds print out the top ten executables generating I/O
   traffic during that interval sorted in descending order.
 
 
 io/traceio.stp - Track Cumulative I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every second print out the top ten executables sorted in descending
   order based on cumulative I/O traffic observed.
 
 
 io/traceio2.stp - Watch I/O Activity on a Particular Device
-output: trace, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Print out the executable name and process number as reads and writes
   to the specified device occur.
 
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -98,8 +88,7 @@ subsystem: network, keywords: network traffic per-process
 
 
 network/socket-trace.stp - Trace Functions called in Network Socket Code
-output: trace, exits: user-controlled, status: production
-subsystem: network, keywords: network socket
+subsystems: network, keywords: network socket
 
   The script instrument each of the functions inn the Linux kernel's
   net/socket.c file. The script prints out trace. The first element of
@@ -110,8 +99,7 @@ subsystem: network, keywords: network socket
 
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -120,8 +108,7 @@ subsystem: locking, keywords: syscall locking futex
 
 
 process/pf2.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The pf2.stp script sets up time-based sampling. Every five seconds it
   prints out a sorted list with the top ten kernel functions with
@@ -129,22 +116,19 @@ subsystem: kernel, keywords: profiling
 
 
 process/sig_by_pid.stp -  Signal Counts by Process ID
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process ID in descending order.
 
 
 process/sig_by_proc.stp -  Signal Counts by Process Name
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process name in descending order.
 
 
 process/sigkill.stp - Track SIGKILL Signals
-output: trace, exits: user-controlled, status: production
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script traces any SIGKILL signals. When that SIGKILL signal is
   sent to a process, the script prints out the signal name, the
@@ -153,8 +137,7 @@ subsystem: signals, keywords: signals
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: trace, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script watches for a particular signal sent to a specific
   process. When that signal is sent to the specified process, the
@@ -164,8 +147,7 @@ subsystem: signals, keywords: signals
 
 
 process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
-output: trace, exits: user-controlled, status: production
-subsystem: scheduler, keywords: io scheduler
+subsystems: scheduler, keywords: io scheduler
 
   The script monitor time threads spend waiting for IO operations (in
   "D" state) in the wait_for_completion function. If a thread spends
@@ -176,8 +158,7 @@ subsystem: scheduler, keywords: io scheduler
 
 
 process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall sleep
+subsystems: syscall, keywords: syscall sleep
 
   The script watches each nanosleep syscall on the system. At the end
   of each nanosleep syscall the script prints out a line with a
@@ -187,8 +168,7 @@ subsystem: syscall, keywords: syscall sleep
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each PID
@@ -196,8 +176,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each
@@ -205,8 +184,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/wait4time.stp - Trace Time Spent in wait4 Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall wait4
+subsystems: syscall, keywords: syscall wait4
 
   The script watches each wait4 syscall on the system. At the end of
   each wait4 syscall the script prints out a line with a timestamp in
@@ -216,8 +194,7 @@ subsystem: syscall, keywords: syscall wait4
 
 
 profiling/functioncallcount.stp - Count Times Functions Called
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling functions
+subsystems: kernel, keywords: profiling functions
 
   The functioncallcount.stp script takes one argument, a list of
   functions to probe. The script will run and count the number of times
@@ -227,8 +204,7 @@ subsystem: kernel, keywords: profiling functions
 
 
 profiling/thread-times.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The thread-times.stp script sets up time-based sampling. Every five
   seconds it prints out a sorted list with the top twenty processes
diff --git a/testsuite/systemtap.examples/keyword-index.html b/testsuite/systemtap.examples/keyword-index.html
index 07cca25b..c48465cc 100644
--- a/testsuite/systemtap.examples/keyword-index.html
+++ b/testsuite/systemtap.examples/keyword-index.html
@@ -43,244 +43,202 @@
 <h3>BACKTRACE</h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
-output: sorted on-exit, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io backtrace<br>
+subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 </ul>
 <h3>CALLGRAPH</h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: trace callgraph<br>
+subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 </ul>
 <h3>CPU</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
 <h3>DISK</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 <li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: disk, keywords: disk<br>
+subsystems: disk, keywords: disk<br>
 <p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
 </ul>
 <h3>FUNCTIONS</h3>
 <ul>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling functions<br>
+subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 </ul>
 <h3>FUTEX</h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
 <h3>GRAPH</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
 <h3>IO</h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
-output: sorted on-exit, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io backtrace<br>
+subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 <li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
 <li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
 <li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: scheduler, keywords: io scheduler<br>
+subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
 <h3>LOCKING</h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
 <h3>NETWORK</h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network socket<br>
+subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
 <h3>PER-PROCESS</h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 </ul>
 <h3>PROFILING</h3>
 <ul>
 <li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling functions<br>
+subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 <li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
 </ul>
 <h3>READ</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 </ul>
 <h3>SCHEDULER</h3>
 <ul>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: scheduler, keywords: io scheduler<br>
+subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
 <h3>SIGNALS</h3>
 <ul>
 <li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process ID in descending order.</p></li>
 <li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process name in descending order.</p></li>
 <li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: trace, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
 </ul>
 <h3>SIMPLE</h3>
 <ul>
 <li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
-output: text, exits: fixed, status: production<br>
-subsystem: none, keywords: simple<br>
+subsystems: none, keywords: simple<br>
 <p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
 </ul>
 <h3>SLEEP</h3>
 <ul>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall sleep<br>
+subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 </ul>
 <h3>SOCKET</h3>
 <ul>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network socket<br>
+subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
 <h3>SYSCALL</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall sleep<br>
+subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
 <li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall wait4<br>
+subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 </ul>
 <h3>TIME</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 </ul>
 <h3>TRACE</h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: trace callgraph<br>
+subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 </ul>
 <h3>TRAFFIC</h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 </ul>
 <h3>USE</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
 <h3>WAIT4</h3>
 <ul>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall wait4<br>
+subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 </ul>
 <h3>WRITE</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 </ul>
        	</td>
diff --git a/testsuite/systemtap.examples/keyword-index.txt b/testsuite/systemtap.examples/keyword-index.txt
index 606430f2..d2e20148 100644
--- a/testsuite/systemtap.examples/keyword-index.txt
+++ b/testsuite/systemtap.examples/keyword-index.txt
@@ -4,8 +4,7 @@ SYSTEMTAP EXAMPLES INDEX BY KEYWORD
 = BACKTRACE =
 
 io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
-output: sorted on-exit, exits: user-controlled, status: production
-subsystem: io, keywords: io backtrace
+subsystems: io, keywords: io backtrace
 
   When a reschedule occurs during an AIO io_submit call, accumulate the
   traceback in a histogram. When the script exits prints out a sorted
@@ -15,8 +14,7 @@ subsystem: io, keywords: io backtrace
 = CALLGRAPH =
 
 general/para-callgraph.stp - Tracing Calls for Sections of Code
-output: trace, exits: user-controlled, status: production
-subsystem: kernel, keywords: trace callgraph
+subsystems: kernel, keywords: trace callgraph
 
   The script takes two arguments: the first argument is the function to
   starts/stops the per thread call graph traces and the second argument
@@ -28,8 +26,7 @@ subsystem: kernel, keywords: trace callgraph
 = CPU =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -39,8 +36,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 = DISK =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -48,8 +44,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 
 
 io/disktop.stp - Summarize Disk Read/Write Traffic
-output: timed, exits: user-controlled, status: production
-subsystem: disk, keywords: disk
+subsystems: disk, keywords: disk
 
   Get the status of reading/writing disk every 5 seconds, output top
   ten entries during that period.
@@ -58,8 +53,7 @@ subsystem: disk, keywords: disk
 = FUNCTIONS =
 
 profiling/functioncallcount.stp - Count Times Functions Called
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling functions
+subsystems: kernel, keywords: profiling functions
 
   The functioncallcount.stp script takes one argument, a list of
   functions to probe. The script will run and count the number of times
@@ -71,8 +65,7 @@ subsystem: kernel, keywords: profiling functions
 = FUTEX =
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -83,8 +76,7 @@ subsystem: locking, keywords: syscall locking futex
 = GRAPH =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -94,8 +86,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 = IO =
 
 io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
-output: sorted on-exit, exits: user-controlled, status: production
-subsystem: io, keywords: io backtrace
+subsystems: io, keywords: io backtrace
 
   When a reschedule occurs during an AIO io_submit call, accumulate the
   traceback in a histogram. When the script exits prints out a sorted
@@ -103,8 +94,7 @@ subsystem: io, keywords: io backtrace
 
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -120,32 +110,28 @@ subsystem: syscall, keywords: syscall read write time io
 
 
 io/iotop.stp - Periodically Print I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every five seconds print out the top ten executables generating I/O
   traffic during that interval sorted in descending order.
 
 
 io/traceio.stp - Track Cumulative I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every second print out the top ten executables sorted in descending
   order based on cumulative I/O traffic observed.
 
 
 io/traceio2.stp - Watch I/O Activity on a Particular Device
-output: trace, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Print out the executable name and process number as reads and writes
   to the specified device occur.
 
 
 process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
-output: trace, exits: user-controlled, status: production
-subsystem: scheduler, keywords: io scheduler
+subsystems: scheduler, keywords: io scheduler
 
   The script monitor time threads spend waiting for IO operations (in
   "D" state) in the wait_for_completion function. If a thread spends
@@ -158,8 +144,7 @@ subsystem: scheduler, keywords: io scheduler
 = LOCKING =
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -170,8 +155,7 @@ subsystem: locking, keywords: syscall locking futex
 = NETWORK =
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -180,8 +164,7 @@ subsystem: network, keywords: network traffic per-process
 
 
 network/socket-trace.stp - Trace Functions called in Network Socket Code
-output: trace, exits: user-controlled, status: production
-subsystem: network, keywords: network socket
+subsystems: network, keywords: network socket
 
   The script instrument each of the functions inn the Linux kernel's
   net/socket.c file. The script prints out trace. The first element of
@@ -194,8 +177,7 @@ subsystem: network, keywords: network socket
 = PER-PROCESS =
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -206,8 +188,7 @@ subsystem: network, keywords: network traffic per-process
 = PROFILING =
 
 process/pf2.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The pf2.stp script sets up time-based sampling. Every five seconds it
   prints out a sorted list with the top ten kernel functions with
@@ -215,8 +196,7 @@ subsystem: kernel, keywords: profiling
 
 
 profiling/functioncallcount.stp - Count Times Functions Called
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling functions
+subsystems: kernel, keywords: profiling functions
 
   The functioncallcount.stp script takes one argument, a list of
   functions to probe. The script will run and count the number of times
@@ -226,8 +206,7 @@ subsystem: kernel, keywords: profiling functions
 
 
 profiling/thread-times.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The thread-times.stp script sets up time-based sampling. Every five
   seconds it prints out a sorted list with the top twenty processes
@@ -238,8 +217,7 @@ subsystem: kernel, keywords: profiling
 = READ =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -257,8 +235,7 @@ subsystem: syscall, keywords: syscall read write time io
 = SCHEDULER =
 
 process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
-output: trace, exits: user-controlled, status: production
-subsystem: scheduler, keywords: io scheduler
+subsystems: scheduler, keywords: io scheduler
 
   The script monitor time threads spend waiting for IO operations (in
   "D" state) in the wait_for_completion function. If a thread spends
@@ -271,22 +248,19 @@ subsystem: scheduler, keywords: io scheduler
 = SIGNALS =
 
 process/sig_by_pid.stp -  Signal Counts by Process ID
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process ID in descending order.
 
 
 process/sig_by_proc.stp -  Signal Counts by Process Name
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process name in descending order.
 
 
 process/sigkill.stp - Track SIGKILL Signals
-output: trace, exits: user-controlled, status: production
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script traces any SIGKILL signals. When that SIGKILL signal is
   sent to a process, the script prints out the signal name, the
@@ -295,8 +269,7 @@ subsystem: signals, keywords: signals
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: trace, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script watches for a particular signal sent to a specific
   process. When that signal is sent to the specified process, the
@@ -308,8 +281,7 @@ subsystem: signals, keywords: signals
 = SIMPLE =
 
 general/helloworld.stp - SystemTap "Hello World" Program
-output: text, exits: fixed, status: production
-subsystem: none, keywords: simple
+subsystems: none, keywords: simple
 
   A basic "Hello World" program implemented in SystemTap script. It
   prints out "hello world" message and then immediately exits.
@@ -318,8 +290,7 @@ subsystem: none, keywords: simple
 = SLEEP =
 
 process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall sleep
+subsystems: syscall, keywords: syscall sleep
 
   The script watches each nanosleep syscall on the system. At the end
   of each nanosleep syscall the script prints out a line with a
@@ -331,8 +302,7 @@ subsystem: syscall, keywords: syscall sleep
 = SOCKET =
 
 network/socket-trace.stp - Trace Functions called in Network Socket Code
-output: trace, exits: user-controlled, status: production
-subsystem: network, keywords: network socket
+subsystems: network, keywords: network socket
 
   The script instrument each of the functions inn the Linux kernel's
   net/socket.c file. The script prints out trace. The first element of
@@ -345,8 +315,7 @@ subsystem: network, keywords: network socket
 = SYSCALL =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -362,8 +331,7 @@ subsystem: syscall, keywords: syscall read write time io
 
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -372,8 +340,7 @@ subsystem: locking, keywords: syscall locking futex
 
 
 process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall sleep
+subsystems: syscall, keywords: syscall sleep
 
   The script watches each nanosleep syscall on the system. At the end
   of each nanosleep syscall the script prints out a line with a
@@ -383,8 +350,7 @@ subsystem: syscall, keywords: syscall sleep
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each PID
@@ -392,8 +358,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each
@@ -401,8 +366,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/wait4time.stp - Trace Time Spent in wait4 Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall wait4
+subsystems: syscall, keywords: syscall wait4
 
   The script watches each wait4 syscall on the system. At the end of
   each wait4 syscall the script prints out a line with a timestamp in
@@ -414,8 +378,7 @@ subsystem: syscall, keywords: syscall wait4
 = TIME =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -433,8 +396,7 @@ subsystem: syscall, keywords: syscall read write time io
 = TRACE =
 
 general/para-callgraph.stp - Tracing Calls for Sections of Code
-output: trace, exits: user-controlled, status: production
-subsystem: kernel, keywords: trace callgraph
+subsystems: kernel, keywords: trace callgraph
 
   The script takes two arguments: the first argument is the function to
   starts/stops the per thread call graph traces and the second argument
@@ -446,8 +408,7 @@ subsystem: kernel, keywords: trace callgraph
 = TRAFFIC =
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -458,8 +419,7 @@ subsystem: network, keywords: network traffic per-process
 = USE =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -469,8 +429,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 = WAIT4 =
 
 process/wait4time.stp - Trace Time Spent in wait4 Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall wait4
+subsystems: syscall, keywords: syscall wait4
 
   The script watches each wait4 syscall on the system. At the end of
   each wait4 syscall the script prints out a line with a timestamp in
@@ -482,8 +441,7 @@ subsystem: syscall, keywords: syscall wait4
 = WRITE =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
diff --git a/testsuite/systemtap.examples/subsystem-index.html b/testsuite/systemtap.examples/subsystem-index.html
index c868d340..f2767f31 100644
--- a/testsuite/systemtap.examples/subsystem-index.html
+++ b/testsuite/systemtap.examples/subsystem-index.html
@@ -43,131 +43,106 @@
 <h3>CPU</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
 <h3>DISK</h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
-output: plot data, exits: user-controlled, status: production<br>
-subsystem: disk cpu, keywords: disk cpu use graph<br>
+subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 <li><a href="io/disktop.stp">io/disktop.stp</a> - Summarize Disk Read/Write Traffic<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: disk, keywords: disk<br>
+subsystems: disk, keywords: disk<br>
 <p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
 </ul>
 <h3>IO</h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
-output: sorted on-exit, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io backtrace<br>
+subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 <li><a href="io/iotop.stp">io/iotop.stp</a> - Periodically Print I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every five seconds print out the top ten executables generating I/O traffic during that interval sorted in descending order.</p></li>
 <li><a href="io/traceio.stp">io/traceio.stp</a> - Track Cumulative I/O Activity by Process Name<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Every second print out the top ten executables sorted in descending order based on cumulative I/O traffic observed.</p></li>
 <li><a href="io/traceio2.stp">io/traceio2.stp</a> - Watch I/O Activity on a Particular Device<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: io, keywords: io<br>
+subsystems: io, keywords: io<br>
 <p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
 </ul>
 <h3>KERNEL</h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: trace callgraph<br>
+subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 <li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The pf2.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top ten kernel functions with samples.</p></li>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling functions<br>
+subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 <li><a href="profiling/thread-times.stp">profiling/thread-times.stp</a> - Profile kernel functions<br>
-output: sorted-list, exits: user-controlled, status: production<br>
-subsystem: kernel, keywords: profiling<br>
+subsystems: kernel, keywords: profiling<br>
 <p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
 </ul>
 <h3>LOCKING</h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: locking, keywords: syscall locking futex<br>
+subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
 <h3>NETWORK</h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
-output: timed, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network traffic per-process<br>
+subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: network, keywords: network socket<br>
+subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
 <h3>NONE</h3>
 <ul>
 <li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
-output: text, exits: fixed, status: production<br>
-subsystem: none, keywords: simple<br>
+subsystems: none, keywords: simple<br>
 <p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
 </ul>
 <h3>SCHEDULER</h3>
 <ul>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: scheduler, keywords: io scheduler<br>
+subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
 <h3>SIGNALS</h3>
 <ul>
 <li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process ID in descending order.</p></li>
 <li><a href="process/sig_by_proc.stp">process/sig_by_proc.stp</a> -  Signal Counts by Process Name<br>
-output: sorted-list on-exit, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>Print signal counts by process name in descending order.</p></li>
 <li><a href="process/sigkill.stp">process/sigkill.stp</a> - Track SIGKILL Signals<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script traces any SIGKILL signals. When that SIGKILL signal is sent to a process, the script prints out the signal name, the desination executable and process ID, the executable name user ID that sent the signal.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: trace, exits: user-controlled, status: experimental<br>
-subsystem: signals, keywords: signals<br>
+subsystems: signals, keywords: signals<br>
 <p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
 </ul>
 <h3>SYSCALL</h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall read write time io<br>
+subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall sleep<br>
+subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 <li><a href="process/syscalls_by_pid.stp">process/syscalls_by_pid.stp</a> - System-Wide Count of Syscalls by PID<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each PID ordered from greatest to least number of syscalls.</p></li>
 <li><a href="process/syscalls_by_proc.stp">process/syscalls_by_proc.stp</a> - System-Wide Count of Syscalls by Executable<br>
-output: sorted-list on-exit, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall<br>
+subsystems: syscall, keywords: syscall<br>
 <p>The script watches all syscall on the system. On exit the script prints a list showing the number of systemcalls executed by each executable ordered from greates to least number of syscalls.</p></li>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
-output: trace, exits: user-controlled, status: production<br>
-subsystem: syscall, keywords: syscall wait4<br>
+subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 </ul>
        	</td>
diff --git a/testsuite/systemtap.examples/subsystem-index.txt b/testsuite/systemtap.examples/subsystem-index.txt
index 9f83a544..98e75e98 100644
--- a/testsuite/systemtap.examples/subsystem-index.txt
+++ b/testsuite/systemtap.examples/subsystem-index.txt
@@ -4,8 +4,7 @@ SYSTEMTAP EXAMPLES INDEX BY SUBSYSTEM
 = CPU =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -15,8 +14,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 = DISK =
 
 general/graphs.stp - Graphing Disk and CPU Utilization
-output: plot data, exits: user-controlled, status: production
-subsystem: disk cpu, keywords: disk cpu use graph
+subsystems: disk cpu, keywords: disk cpu use graph
 
   The script tracks the disk and CPU utilization. The resulting output
   of the script can be piped into gnuplot to generate a graph of disk
@@ -24,8 +22,7 @@ subsystem: disk cpu, keywords: disk cpu use graph
 
 
 io/disktop.stp - Summarize Disk Read/Write Traffic
-output: timed, exits: user-controlled, status: production
-subsystem: disk, keywords: disk
+subsystems: disk, keywords: disk
 
   Get the status of reading/writing disk every 5 seconds, output top
   ten entries during that period.
@@ -34,8 +31,7 @@ subsystem: disk, keywords: disk
 = IO =
 
 io/io_submit.stp - Tally Reschedule Reason During AIO io_submit Call
-output: sorted on-exit, exits: user-controlled, status: production
-subsystem: io, keywords: io backtrace
+subsystems: io, keywords: io backtrace
 
   When a reschedule occurs during an AIO io_submit call, accumulate the
   traceback in a histogram. When the script exits prints out a sorted
@@ -43,24 +39,21 @@ subsystem: io, keywords: io backtrace
 
 
 io/iotop.stp - Periodically Print I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every five seconds print out the top ten executables generating I/O
   traffic during that interval sorted in descending order.
 
 
 io/traceio.stp - Track Cumulative I/O Activity by Process Name
-output: timed, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Every second print out the top ten executables sorted in descending
   order based on cumulative I/O traffic observed.
 
 
 io/traceio2.stp - Watch I/O Activity on a Particular Device
-output: trace, exits: user-controlled, status: production
-subsystem: io, keywords: io
+subsystems: io, keywords: io
 
   Print out the executable name and process number as reads and writes
   to the specified device occur.
@@ -69,8 +62,7 @@ subsystem: io, keywords: io
 = KERNEL =
 
 general/para-callgraph.stp - Tracing Calls for Sections of Code
-output: trace, exits: user-controlled, status: production
-subsystem: kernel, keywords: trace callgraph
+subsystems: kernel, keywords: trace callgraph
 
   The script takes two arguments: the first argument is the function to
   starts/stops the per thread call graph traces and the second argument
@@ -80,8 +72,7 @@ subsystem: kernel, keywords: trace callgraph
 
 
 process/pf2.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The pf2.stp script sets up time-based sampling. Every five seconds it
   prints out a sorted list with the top ten kernel functions with
@@ -89,8 +80,7 @@ subsystem: kernel, keywords: profiling
 
 
 profiling/functioncallcount.stp - Count Times Functions Called
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling functions
+subsystems: kernel, keywords: profiling functions
 
   The functioncallcount.stp script takes one argument, a list of
   functions to probe. The script will run and count the number of times
@@ -100,8 +90,7 @@ subsystem: kernel, keywords: profiling functions
 
 
 profiling/thread-times.stp - Profile kernel functions
-output: sorted-list, exits: user-controlled, status: production
-subsystem: kernel, keywords: profiling
+subsystems: kernel, keywords: profiling
 
   The thread-times.stp script sets up time-based sampling. Every five
   seconds it prints out a sorted list with the top twenty processes
@@ -112,8 +101,7 @@ subsystem: kernel, keywords: profiling
 = LOCKING =
 
 process/futexes.stp - System-Wide Futex Contention
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: locking, keywords: syscall locking futex
+subsystems: locking, keywords: syscall locking futex
 
   The script watches the futex syscall on the system. On exit the
   futexes address, the number of contentions, and the average time for
@@ -124,8 +112,7 @@ subsystem: locking, keywords: syscall locking futex
 = NETWORK =
 
 network/nettop.stp - Periodic Listing of Processes Using Network Interfaces
-output: timed, exits: user-controlled, status: production
-subsystem: network, keywords: network traffic per-process
+subsystems: network, keywords: network traffic per-process
 
   Every five seconds the nettop.stp script prints out a list of
   processed (PID and command) with the number of packets sent/received
@@ -134,8 +121,7 @@ subsystem: network, keywords: network traffic per-process
 
 
 network/socket-trace.stp - Trace Functions called in Network Socket Code
-output: trace, exits: user-controlled, status: production
-subsystem: network, keywords: network socket
+subsystems: network, keywords: network socket
 
   The script instrument each of the functions inn the Linux kernel's
   net/socket.c file. The script prints out trace. The first element of
@@ -148,8 +134,7 @@ subsystem: network, keywords: network socket
 = NONE =
 
 general/helloworld.stp - SystemTap "Hello World" Program
-output: text, exits: fixed, status: production
-subsystem: none, keywords: simple
+subsystems: none, keywords: simple
 
   A basic "Hello World" program implemented in SystemTap script. It
   prints out "hello world" message and then immediately exits.
@@ -158,8 +143,7 @@ subsystem: none, keywords: simple
 = SCHEDULER =
 
 process/sleepingBeauties.stp - Generating Backtraces of Threads Waiting for IO Operations
-output: trace, exits: user-controlled, status: production
-subsystem: scheduler, keywords: io scheduler
+subsystems: scheduler, keywords: io scheduler
 
   The script monitor time threads spend waiting for IO operations (in
   "D" state) in the wait_for_completion function. If a thread spends
@@ -172,22 +156,19 @@ subsystem: scheduler, keywords: io scheduler
 = SIGNALS =
 
 process/sig_by_pid.stp -  Signal Counts by Process ID
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process ID in descending order.
 
 
 process/sig_by_proc.stp -  Signal Counts by Process Name
-output: sorted-list on-exit, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   Print signal counts by process name in descending order.
 
 
 process/sigkill.stp - Track SIGKILL Signals
-output: trace, exits: user-controlled, status: production
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script traces any SIGKILL signals. When that SIGKILL signal is
   sent to a process, the script prints out the signal name, the
@@ -196,8 +177,7 @@ subsystem: signals, keywords: signals
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: trace, exits: user-controlled, status: experimental
-subsystem: signals, keywords: signals
+subsystems: signals, keywords: signals
 
   The script watches for a particular signal sent to a specific
   process. When that signal is sent to the specified process, the
@@ -209,8 +189,7 @@ subsystem: signals, keywords: signals
 = SYSCALL =
 
 io/iotime.stp - Trace Time Spent in Read and Write for Files 
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall read write time io
+subsystems: syscall, keywords: syscall read write time io
 
   The script watches each open, close, read, and write syscalls on the
   system. For each file the scripts observes opened it accumulates the
@@ -226,8 +205,7 @@ subsystem: syscall, keywords: syscall read write time io
 
 
 process/sleeptime.stp - Trace Time Spent in nanosleep Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall sleep
+subsystems: syscall, keywords: syscall sleep
 
   The script watches each nanosleep syscall on the system. At the end
   of each nanosleep syscall the script prints out a line with a
@@ -237,8 +215,7 @@ subsystem: syscall, keywords: syscall sleep
 
 
 process/syscalls_by_pid.stp - System-Wide Count of Syscalls by PID
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each PID
@@ -246,8 +223,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/syscalls_by_proc.stp - System-Wide Count of Syscalls by Executable
-output: sorted-list on-exit, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall
+subsystems: syscall, keywords: syscall
 
   The script watches all syscall on the system. On exit the script
   prints a list showing the number of systemcalls executed by each
@@ -255,8 +231,7 @@ subsystem: syscall, keywords: syscall
 
 
 process/wait4time.stp - Trace Time Spent in wait4 Syscalls
-output: trace, exits: user-controlled, status: production
-subsystem: syscall, keywords: syscall wait4
+subsystems: syscall, keywords: syscall wait4
 
   The script watches each wait4 syscall on the system. At the end of
   each wait4 syscall the script prints out a line with a timestamp in
-- 
cgit 


From 6bba5be0972dae052f8ad7623e21ecc0425350d0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Fri, 8 Aug 2008 15:59:54 +0200
Subject: Add index of subsystem and keywords at top of HTML indexes.

---
 testsuite/systemtap.examples/ChangeLog             |  7 +++
 testsuite/systemtap.examples/examples-index-gen.pl | 22 +++++++++-
 testsuite/systemtap.examples/keyword-index.html    | 51 +++++++++++-----------
 testsuite/systemtap.examples/subsystem-index.html  | 21 ++++-----
 4 files changed, 64 insertions(+), 37 deletions(-)

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index 8f425995..a7fcd069 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
+
+	* examples-index-gen.pl: Add index of subsystem and keywords at top of
+	HTML indexes.
+	* *index.html: Regenerated.
+	* *index.txt: Likewise.
+
 2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
 
 	* examples-index-gen.pl (add_meta_txt): Don't output output, exits,
diff --git a/testsuite/systemtap.examples/examples-index-gen.pl b/testsuite/systemtap.examples/examples-index-gen.pl
index e105f3fc..9bdc1174 100644
--- a/testsuite/systemtap.examples/examples-index-gen.pl
+++ b/testsuite/systemtap.examples/examples-index-gen.pl
@@ -155,9 +155,18 @@ print "Creating $subhtml...\n";
 print SUBHTML $HTMLHEADER;
 print SUBHTML "<h2>Examples by Subsystem</h2>\n";
 
+# On top link list
+print SUBHTML "<p><tt>";
+foreach $subsystem (sort keys %subsystems) {
+    print SUBHTML '<a href="#' . (uc $subsystem) . '">'
+		  . (uc $subsystem) . "</a> ";
+}
+print SUBHTML "</tt></p>\n";
+
 foreach $subsystem (sort keys %subsystems) {
     print SUBINDEX "= " . (uc $subsystem) . " =\n\n";
-    print SUBHTML "<h3>" . (uc $subsystem) . "</h3>\n";
+    print SUBHTML "<h3>" . '<a name="' . (uc $subsystem) . '">'
+		  . (uc $subsystem) . "</a></h3>\n";
     print SUBHTML "<ul>\n";
 
     foreach $meta (sort @{$subsystems{$subsystem}}) {
@@ -187,9 +196,18 @@ print "Creating $keyhtml...\n";
 print KEYHTML $HTMLHEADER;
 print KEYHTML "<h2>Examples by Keyword</h2>\n";
 
+# On top link list
+print KEYHTML "<p><tt>";
+foreach $keyword (sort keys %keywords) {
+    print KEYHTML '<a href="#' . (uc $keyword) . '">'
+		  . (uc $keyword) . "</a> ";
+}
+print KEYHTML "</tt></p>\n";
+
 foreach $keyword (sort keys %keywords) {
     print KEYINDEX "= " . (uc $keyword) . " =\n\n";
-    print KEYHTML "<h3>" . (uc $keyword) . "</h3>\n";
+    print KEYHTML "<h3>" . '<a name="' . (uc $keyword) . '">'
+		  . (uc $keyword) . "</a></h3>\n";
     print KEYHTML "<ul>\n";
 
     foreach $meta (sort @{$keywords{$keyword}}) {
diff --git a/testsuite/systemtap.examples/keyword-index.html b/testsuite/systemtap.examples/keyword-index.html
index c48465cc..5d1c79e0 100644
--- a/testsuite/systemtap.examples/keyword-index.html
+++ b/testsuite/systemtap.examples/keyword-index.html
@@ -40,25 +40,26 @@
          	</ul>
 
 <h2>Examples by Keyword</h2>
-<h3>BACKTRACE</h3>
+<p><tt><a href="#BACKTRACE">BACKTRACE</a> <a href="#CALLGRAPH">CALLGRAPH</a> <a href="#CPU">CPU</a> <a href="#DISK">DISK</a> <a href="#FUNCTIONS">FUNCTIONS</a> <a href="#FUTEX">FUTEX</a> <a href="#GRAPH">GRAPH</a> <a href="#IO">IO</a> <a href="#LOCKING">LOCKING</a> <a href="#NETWORK">NETWORK</a> <a href="#PER-PROCESS">PER-PROCESS</a> <a href="#PROFILING">PROFILING</a> <a href="#READ">READ</a> <a href="#SCHEDULER">SCHEDULER</a> <a href="#SIGNALS">SIGNALS</a> <a href="#SIMPLE">SIMPLE</a> <a href="#SLEEP">SLEEP</a> <a href="#SOCKET">SOCKET</a> <a href="#SYSCALL">SYSCALL</a> <a href="#TIME">TIME</a> <a href="#TRACE">TRACE</a> <a href="#TRAFFIC">TRAFFIC</a> <a href="#USE">USE</a> <a href="#WAIT4">WAIT4</a> <a href="#WRITE">WRITE</a> </tt></p>
+<h3><a name="BACKTRACE">BACKTRACE</a></h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
 subsystems: io, keywords: io backtrace<br>
 <p>When a reschedule occurs during an AIO io_submit call, accumulate the traceback in a histogram. When the script exits prints out a sorted list from most common to least common backtrace.</p></li>
 </ul>
-<h3>CALLGRAPH</h3>
+<h3><a name="CALLGRAPH">CALLGRAPH</a></h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
 subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 </ul>
-<h3>CPU</h3>
+<h3><a name="CPU">CPU</a></h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
 subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
-<h3>DISK</h3>
+<h3><a name="DISK">DISK</a></h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
 subsystems: disk cpu, keywords: disk cpu use graph<br>
@@ -67,25 +68,25 @@ subsystems: disk cpu, keywords: disk cpu use graph<br>
 subsystems: disk, keywords: disk<br>
 <p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
 </ul>
-<h3>FUNCTIONS</h3>
+<h3><a name="FUNCTIONS">FUNCTIONS</a></h3>
 <ul>
 <li><a href="profiling/functioncallcount.stp">profiling/functioncallcount.stp</a> - Count Times Functions Called<br>
 subsystems: kernel, keywords: profiling functions<br>
 <p>The functioncallcount.stp script takes one argument, a list of functions to probe. The script will run and count the number of times that each of the functions on the list is called. On exit the script will print a sorted list from most frequently to least frequently called function.</p></li>
 </ul>
-<h3>FUTEX</h3>
+<h3><a name="FUTEX">FUTEX</a></h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
 subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
-<h3>GRAPH</h3>
+<h3><a name="GRAPH">GRAPH</a></h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
 subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
-<h3>IO</h3>
+<h3><a name="IO">IO</a></h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
 subsystems: io, keywords: io backtrace<br>
@@ -106,13 +107,13 @@ subsystems: io, keywords: io<br>
 subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
-<h3>LOCKING</h3>
+<h3><a name="LOCKING">LOCKING</a></h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
 subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
-<h3>NETWORK</h3>
+<h3><a name="NETWORK">NETWORK</a></h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
 subsystems: network, keywords: network traffic per-process<br>
@@ -121,13 +122,13 @@ subsystems: network, keywords: network traffic per-process<br>
 subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
-<h3>PER-PROCESS</h3>
+<h3><a name="PER-PROCESS">PER-PROCESS</a></h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
 subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 </ul>
-<h3>PROFILING</h3>
+<h3><a name="PROFILING">PROFILING</a></h3>
 <ul>
 <li><a href="process/pf2.stp">process/pf2.stp</a> - Profile kernel functions<br>
 subsystems: kernel, keywords: profiling<br>
@@ -139,19 +140,19 @@ subsystems: kernel, keywords: profiling functions<br>
 subsystems: kernel, keywords: profiling<br>
 <p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
 </ul>
-<h3>READ</h3>
+<h3><a name="READ">READ</a></h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
 subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 </ul>
-<h3>SCHEDULER</h3>
+<h3><a name="SCHEDULER">SCHEDULER</a></h3>
 <ul>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
 subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
-<h3>SIGNALS</h3>
+<h3><a name="SIGNALS">SIGNALS</a></h3>
 <ul>
 <li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
 subsystems: signals, keywords: signals<br>
@@ -166,25 +167,25 @@ subsystems: signals, keywords: signals<br>
 subsystems: signals, keywords: signals<br>
 <p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
 </ul>
-<h3>SIMPLE</h3>
+<h3><a name="SIMPLE">SIMPLE</a></h3>
 <ul>
 <li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
 subsystems: none, keywords: simple<br>
 <p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
 </ul>
-<h3>SLEEP</h3>
+<h3><a name="SLEEP">SLEEP</a></h3>
 <ul>
 <li><a href="process/sleeptime.stp">process/sleeptime.stp</a> - Trace Time Spent in nanosleep Syscalls<br>
 subsystems: syscall, keywords: syscall sleep<br>
 <p>The script watches each nanosleep syscall on the system. At the end of each nanosleep syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "nanosleep:" key, and the duration of the sleep in microseconds.</p></li>
 </ul>
-<h3>SOCKET</h3>
+<h3><a name="SOCKET">SOCKET</a></h3>
 <ul>
 <li><a href="network/socket-trace.stp">network/socket-trace.stp</a> - Trace Functions called in Network Socket Code<br>
 subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
-<h3>SYSCALL</h3>
+<h3><a name="SYSCALL">SYSCALL</a></h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
 subsystems: syscall, keywords: syscall read write time io<br>
@@ -205,37 +206,37 @@ subsystems: syscall, keywords: syscall<br>
 subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 </ul>
-<h3>TIME</h3>
+<h3><a name="TIME">TIME</a></h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
 subsystems: syscall, keywords: syscall read write time io<br>
 <p>The script watches each open, close, read, and write syscalls on the system. For each file the scripts observes opened it accumulates the amount of wall clock time spend in read and write operations and the number of bytes read and written. When a file is closed the script prints out a pair of lines for the file. Both lines begin with a timestamp in microseconds, the PID number, and the executable name in parenthesese. The first line with the "access" keyword lists the file name, the attempted number of bytes for the read and write operations. The second line with the "iotime" keyword list the file name and the number of microseconds accumulated in the read and write syscalls.</p></li>
 </ul>
-<h3>TRACE</h3>
+<h3><a name="TRACE">TRACE</a></h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
 subsystems: kernel, keywords: trace callgraph<br>
 <p>The script takes two arguments: the first argument is the function to starts/stops the per thread call graph traces and the second argument is the list of functions to generate trace information on. The script prints out a timestap for the thread, the function name and pid, followed by entry or exit symboly and function name.</p></li>
 </ul>
-<h3>TRAFFIC</h3>
+<h3><a name="TRAFFIC">TRAFFIC</a></h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
 subsystems: network, keywords: network traffic per-process<br>
 <p>Every five seconds the nettop.stp script prints out a list of processed (PID and command) with the number of packets sent/received and the amount of data sent/received by the process during that interval.</p></li>
 </ul>
-<h3>USE</h3>
+<h3><a name="USE">USE</a></h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
 subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
-<h3>WAIT4</h3>
+<h3><a name="WAIT4">WAIT4</a></h3>
 <ul>
 <li><a href="process/wait4time.stp">process/wait4time.stp</a> - Trace Time Spent in wait4 Syscalls<br>
 subsystems: syscall, keywords: syscall wait4<br>
 <p>The script watches each wait4 syscall on the system. At the end of each wait4 syscall the script prints out a line with a timestamp in microseconds, the pid, the executable name in paretheses, the "wait4:" key, the duration of the wait and the PID that the wait4 was waiting for. If the waited for PID is not specified , it is "-1".</p></li>
 </ul>
-<h3>WRITE</h3>
+<h3><a name="WRITE">WRITE</a></h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
 subsystems: syscall, keywords: syscall read write time io<br>
diff --git a/testsuite/systemtap.examples/subsystem-index.html b/testsuite/systemtap.examples/subsystem-index.html
index f2767f31..9bdec0c8 100644
--- a/testsuite/systemtap.examples/subsystem-index.html
+++ b/testsuite/systemtap.examples/subsystem-index.html
@@ -40,13 +40,14 @@
          	</ul>
 
 <h2>Examples by Subsystem</h2>
-<h3>CPU</h3>
+<p><tt><a href="#CPU">CPU</a> <a href="#DISK">DISK</a> <a href="#IO">IO</a> <a href="#KERNEL">KERNEL</a> <a href="#LOCKING">LOCKING</a> <a href="#NETWORK">NETWORK</a> <a href="#NONE">NONE</a> <a href="#SCHEDULER">SCHEDULER</a> <a href="#SIGNALS">SIGNALS</a> <a href="#SYSCALL">SYSCALL</a> </tt></p>
+<h3><a name="CPU">CPU</a></h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
 subsystems: disk cpu, keywords: disk cpu use graph<br>
 <p>The script tracks the disk and CPU utilization. The resulting output of the script can be piped into gnuplot to generate a graph of disk and CPU USE.</p></li>
 </ul>
-<h3>DISK</h3>
+<h3><a name="DISK">DISK</a></h3>
 <ul>
 <li><a href="general/graphs.stp">general/graphs.stp</a> - Graphing Disk and CPU Utilization<br>
 subsystems: disk cpu, keywords: disk cpu use graph<br>
@@ -55,7 +56,7 @@ subsystems: disk cpu, keywords: disk cpu use graph<br>
 subsystems: disk, keywords: disk<br>
 <p>Get the status of reading/writing disk every 5 seconds, output top ten entries during that period.</p></li>
 </ul>
-<h3>IO</h3>
+<h3><a name="IO">IO</a></h3>
 <ul>
 <li><a href="io/io_submit.stp">io/io_submit.stp</a> - Tally Reschedule Reason During AIO io_submit Call<br>
 subsystems: io, keywords: io backtrace<br>
@@ -70,7 +71,7 @@ subsystems: io, keywords: io<br>
 subsystems: io, keywords: io<br>
 <p>Print out the executable name and process number as reads and writes to the specified device occur.</p></li>
 </ul>
-<h3>KERNEL</h3>
+<h3><a name="KERNEL">KERNEL</a></h3>
 <ul>
 <li><a href="general/para-callgraph.stp">general/para-callgraph.stp</a> - Tracing Calls for Sections of Code<br>
 subsystems: kernel, keywords: trace callgraph<br>
@@ -85,13 +86,13 @@ subsystems: kernel, keywords: profiling functions<br>
 subsystems: kernel, keywords: profiling<br>
 <p>The thread-times.stp script sets up time-based sampling. Every five seconds it prints out a sorted list with the top twenty processes with samples broken down into percentage total time spent in user-space and kernel-space.</p></li>
 </ul>
-<h3>LOCKING</h3>
+<h3><a name="LOCKING">LOCKING</a></h3>
 <ul>
 <li><a href="process/futexes.stp">process/futexes.stp</a> - System-Wide Futex Contention<br>
 subsystems: locking, keywords: syscall locking futex<br>
 <p>The script watches the futex syscall on the system. On exit the futexes address, the number of contentions, and the average time for each contention on the futex are printed from lowest pid number to highest.</p></li>
 </ul>
-<h3>NETWORK</h3>
+<h3><a name="NETWORK">NETWORK</a></h3>
 <ul>
 <li><a href="network/nettop.stp">network/nettop.stp</a> - Periodic Listing of Processes Using Network Interfaces<br>
 subsystems: network, keywords: network traffic per-process<br>
@@ -100,19 +101,19 @@ subsystems: network, keywords: network traffic per-process<br>
 subsystems: network, keywords: network socket<br>
 <p>The script instrument each of the functions inn the Linux kernel's net/socket.c file. The script prints out trace. The first element of a line is  time delta in microseconds from the previous entry. This is followed by the command name and the PID. The "->" and "<-" indicates function entry and  function exit, respectively. The last element of the line is the function name.</p></li>
 </ul>
-<h3>NONE</h3>
+<h3><a name="NONE">NONE</a></h3>
 <ul>
 <li><a href="general/helloworld.stp">general/helloworld.stp</a> - SystemTap "Hello World" Program<br>
 subsystems: none, keywords: simple<br>
 <p>A basic "Hello World" program implemented in SystemTap script. It prints out "hello world" message and then immediately exits.</p></li>
 </ul>
-<h3>SCHEDULER</h3>
+<h3><a name="SCHEDULER">SCHEDULER</a></h3>
 <ul>
 <li><a href="process/sleepingBeauties.stp">process/sleepingBeauties.stp</a> - Generating Backtraces of Threads Waiting for IO Operations<br>
 subsystems: scheduler, keywords: io scheduler<br>
 <p>The script monitor time threads spend waiting for IO operations (in "D" state) in the wait_for_completion function. If a thread spends over 10ms wall-clock time waiting, information is printed out describing the thread number and executable name. When slow the wait_for_completion function complete, backtraces for the long duration calls are printed out.</p></li>
 </ul>
-<h3>SIGNALS</h3>
+<h3><a name="SIGNALS">SIGNALS</a></h3>
 <ul>
 <li><a href="process/sig_by_pid.stp">process/sig_by_pid.stp</a> -  Signal Counts by Process ID<br>
 subsystems: signals, keywords: signals<br>
@@ -127,7 +128,7 @@ subsystems: signals, keywords: signals<br>
 subsystems: signals, keywords: signals<br>
 <p>The script watches for a particular signal sent to a specific process. When that signal is sent to the specified process, the script prints out the PID and executable of the process sending the signal, the PID and executable name of the process receiving the signal, and the signal number and name.</p></li>
 </ul>
-<h3>SYSCALL</h3>
+<h3><a name="SYSCALL">SYSCALL</a></h3>
 <ul>
 <li><a href="io/iotime.stp">io/iotime.stp</a> - Trace Time Spent in Read and Write for Files <br>
 subsystems: syscall, keywords: syscall read write time io<br>
-- 
cgit 


From a81c61ac1947cb5c13d3a758fc793a119b88b4e0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Mon, 11 Aug 2008 12:24:47 +0200
Subject: PR2895. Add proper #! /usr/bin/env stap line. Make example scripts
 executable.

---
 testsuite/systemtap.examples/ChangeLog                     | 14 ++++++++++++++
 testsuite/systemtap.examples/general/graphs.stp            |  2 +-
 testsuite/systemtap.examples/general/para-callgraph.stp    |  2 ++
 testsuite/systemtap.examples/io/disktop.stp                |  0
 testsuite/systemtap.examples/io/io_submit.stp              |  2 +-
 testsuite/systemtap.examples/io/iotop.stp                  |  2 ++
 testsuite/systemtap.examples/io/traceio.stp                |  2 +-
 testsuite/systemtap.examples/io/traceio2.stp               |  0
 testsuite/systemtap.examples/process/proc_snoop.stp        |  2 +-
 testsuite/systemtap.examples/process/sigkill.stp           |  2 +-
 testsuite/systemtap.examples/process/sleepingBeauties.stp  |  0
 .../systemtap.examples/profiling/functioncallcount.stp     |  0
 testsuite/systemtap.examples/profiling/thread-times.stp    |  0
 13 files changed, 23 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 testsuite/systemtap.examples/general/graphs.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/general/para-callgraph.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/io/disktop.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/io/io_submit.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/io/iotop.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/io/traceio.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/io/traceio2.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/process/sigkill.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/process/sleepingBeauties.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/profiling/functioncallcount.stp
 mode change 100644 => 100755 testsuite/systemtap.examples/profiling/thread-times.stp

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index a7fcd069..e2389993 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,17 @@
+2008-08-11  Mark Wielaard  <mwielaard@redhat.com>
+
+	PR2895. Reported by Eugeniy Meshcheryakov <eugen@debian.org>
+	*  general/graphs.stp: Add proper #! /usr/bin/env stap line.
+	* general/para-callgraph.stp: Likewise.
+	* io/io_submit.stp: Likewise.
+	* io/iotop.stp: Likewise.
+	* io/traceio.stp: Likewise.
+	* process/proc_snoop.stp: Likewise.
+	* process/sigkill.stp: Likewise.
+	* iotask.stp: Likewise.
+	* pfaults.stp: Likewise.
+	* profile.stp: Likewise.
+
 2008-08-08  Mark Wielaard  <mwielaard@redhat.com>
 
 	* examples-index-gen.pl: Add index of subsystem and keywords at top of
diff --git a/testsuite/systemtap.examples/general/graphs.stp b/testsuite/systemtap.examples/general/graphs.stp
old mode 100644
new mode 100755
index 0c8e3796..f55d6cee
--- a/testsuite/systemtap.examples/general/graphs.stp
+++ b/testsuite/systemtap.examples/general/graphs.stp
@@ -1,4 +1,4 @@
-#! stap
+#! /usr/bin/stap
 
 # ------------------------------------------------------------------------
 # data collection
diff --git a/testsuite/systemtap.examples/general/para-callgraph.stp b/testsuite/systemtap.examples/general/para-callgraph.stp
old mode 100644
new mode 100755
index 1afb8837..e28f5d6b
--- a/testsuite/systemtap.examples/general/para-callgraph.stp
+++ b/testsuite/systemtap.examples/general/para-callgraph.stp
@@ -1,3 +1,5 @@
+#! /usr/bin/env stap
+
 function trace(entry_p) {
    if(tid() in trace)
        printf("%s%s%s\n",thread_indent(entry_p),
diff --git a/testsuite/systemtap.examples/io/disktop.stp b/testsuite/systemtap.examples/io/disktop.stp
old mode 100644
new mode 100755
diff --git a/testsuite/systemtap.examples/io/io_submit.stp b/testsuite/systemtap.examples/io/io_submit.stp
old mode 100644
new mode 100755
index 735dd6f9..7f350305
--- a/testsuite/systemtap.examples/io/io_submit.stp
+++ b/testsuite/systemtap.examples/io/io_submit.stp
@@ -1,4 +1,4 @@
-#!/bin/env stap
+#! /bin/env stap
 #
 # Copyright (C) 2007 Oracle Corp. Chris Mason <chris.mason@oracle.com>
 #
diff --git a/testsuite/systemtap.examples/io/iotop.stp b/testsuite/systemtap.examples/io/iotop.stp
old mode 100644
new mode 100755
index 6050343c..2fa3e3ae
--- a/testsuite/systemtap.examples/io/iotop.stp
+++ b/testsuite/systemtap.examples/io/iotop.stp
@@ -1,3 +1,5 @@
+#! /usr/bin/env stap
+
 global reads, writes, total_io
 
 probe kernel.function("vfs_read") {
diff --git a/testsuite/systemtap.examples/io/traceio.stp b/testsuite/systemtap.examples/io/traceio.stp
old mode 100644
new mode 100755
index d3757c23..cb667be5
--- a/testsuite/systemtap.examples/io/traceio.stp
+++ b/testsuite/systemtap.examples/io/traceio.stp
@@ -1,4 +1,4 @@
-#!/usr/bin/env stap
+#! /usr/bin/env stap
 # traceio.stp
 # Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@redhat.com>
 #
diff --git a/testsuite/systemtap.examples/io/traceio2.stp b/testsuite/systemtap.examples/io/traceio2.stp
old mode 100644
new mode 100755
diff --git a/testsuite/systemtap.examples/process/proc_snoop.stp b/testsuite/systemtap.examples/process/proc_snoop.stp
index 24499b4b..5203c93f 100755
--- a/testsuite/systemtap.examples/process/proc_snoop.stp
+++ b/testsuite/systemtap.examples/process/proc_snoop.stp
@@ -1,4 +1,4 @@
-#!/usr/bin/env stap
+#! /usr/bin/env stap
 
 global start_ts
 
diff --git a/testsuite/systemtap.examples/process/sigkill.stp b/testsuite/systemtap.examples/process/sigkill.stp
old mode 100644
new mode 100755
index 8f754219..6cb6ed1e
--- a/testsuite/systemtap.examples/process/sigkill.stp
+++ b/testsuite/systemtap.examples/process/sigkill.stp
@@ -1,4 +1,4 @@
-#!/usr/bin/env stap
+#! /usr/bin/env stap
 # sigkill.stp
 # Copyright (C) 2007 Red Hat, Inc., Eugene Teo <eteo@redhat.com>
 #
diff --git a/testsuite/systemtap.examples/process/sleepingBeauties.stp b/testsuite/systemtap.examples/process/sleepingBeauties.stp
old mode 100644
new mode 100755
diff --git a/testsuite/systemtap.examples/profiling/functioncallcount.stp b/testsuite/systemtap.examples/profiling/functioncallcount.stp
old mode 100644
new mode 100755
diff --git a/testsuite/systemtap.examples/profiling/thread-times.stp b/testsuite/systemtap.examples/profiling/thread-times.stp
old mode 100644
new mode 100755
-- 
cgit 


From 42f543d05a6f441bb212bd94f9ff44b4095f20dd Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Mon, 11 Aug 2008 17:04:36 +0200
Subject: PR6835. io/io_submit.stp: Fix #! start. Convert to normal
 line-ending.

---
 testsuite/systemtap.examples/ChangeLog        |   5 +
 testsuite/systemtap.examples/io/io_submit.stp | 142 +++++++++++++-------------
 2 files changed, 76 insertions(+), 71 deletions(-)

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index e2389993..c50bcefc 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-11  Mark Wielaard  <mwielaard@redhat.com>
+
+	PR6835. Reported by Eugeniy Meshcheryakov <eugen@debian.org>
+	* io/io_submit.stp: Fix #! start. Convert to normal line-ending.
+
 2008-08-11  Mark Wielaard  <mwielaard@redhat.com>
 
 	PR2895. Reported by Eugeniy Meshcheryakov <eugen@debian.org>
diff --git a/testsuite/systemtap.examples/io/io_submit.stp b/testsuite/systemtap.examples/io/io_submit.stp
index 7f350305..13dcc5a3 100755
--- a/testsuite/systemtap.examples/io/io_submit.stp
+++ b/testsuite/systemtap.examples/io/io_submit.stp
@@ -1,71 +1,71 @@
-#! /bin/env stap
-#
-# Copyright (C) 2007 Oracle Corp. Chris Mason <chris.mason@oracle.com>
-#
-# This was implemented to find the most common causes of schedule during
-# the AIO io_submit call.  It does this by recording which pids are inside
-# AIO, and recording the current stack trace if one of those pids is
-# inside schedule.
-# When the probe exits, it prints out the 30 most common call stacks for
-# schedule().
-#
-# This file is free software. You can redistribute it and/or modify it under 
-# the terms of the GNU General Public License (GPL); either version 2, or (at
-# your option) any later version.
-
-global in_iosubmit
-global traces
-
-/*
- * add a probe to sys_io_submit, on entry, record in the in_iosubmit
- * hash table that this proc is in io_submit
- */
-probe syscall.io_submit {
-	in_iosubmit[tid()] = 1
-}
-
-/*
- * when we return from sys_io_submit, record that we're no longer there
- */
-probe syscall.io_submit.return {
-	/* this assumes a given proc will do lots of io_submit calls, and
-	 * so doesn't do the more expensive "delete in_iosubmit[p]".  If
-	 * there are lots of procs doing small number of io_submit calls,
-	 * the hash may grow pretty big, so using delete may be better
-	 */
-	in_iosubmit[tid()] = 0
-}
-
-/*
- * every time we call schedule, check to see if we started off in
- * io_submit.  If so, record our backtrace into the traces histogram
- */
-probe kernel.function("schedule") {
-	if (tid() in in_iosubmit) {
-		traces[backtrace()]++
-
-		/*
-		 * change this to if (1) if you want a backtrace every time
-		 * you go into schedule from io_submit.  Unfortunately, the traces
-		 * saved into the traces histogram above are truncated to just a
-		 * few lines.  so the only way to see the full trace is via the
-		 * more verbose print_backtrace() right here.
-		 */
-		if (0) {
-			printf("schedule in io_submit!\n")
-			print_backtrace()
-		}
-	}
-}
-
-/*
- * when stap is done (via ctrl-c) go through the record of all the
- * trace paths and print the 30 most common.
- */
-probe end {
-	foreach (stack in traces- limit 30) {
-		printf("%d:", traces[stack])
-		print_stack(stack);
-	}
-}
-
+#! /usr/bin/env stap
+#
+# Copyright (C) 2007 Oracle Corp. Chris Mason <chris.mason@oracle.com>
+#
+# This was implemented to find the most common causes of schedule during
+# the AIO io_submit call.  It does this by recording which pids are inside
+# AIO, and recording the current stack trace if one of those pids is
+# inside schedule.
+# When the probe exits, it prints out the 30 most common call stacks for
+# schedule().
+#
+# This file is free software. You can redistribute it and/or modify it under 
+# the terms of the GNU General Public License (GPL); either version 2, or (at
+# your option) any later version.
+
+global in_iosubmit
+global traces
+
+/*
+ * add a probe to sys_io_submit, on entry, record in the in_iosubmit
+ * hash table that this proc is in io_submit
+ */
+probe syscall.io_submit {
+	in_iosubmit[tid()] = 1
+}
+
+/*
+ * when we return from sys_io_submit, record that we're no longer there
+ */
+probe syscall.io_submit.return {
+	/* this assumes a given proc will do lots of io_submit calls, and
+	 * so doesn't do the more expensive "delete in_iosubmit[p]".  If
+	 * there are lots of procs doing small number of io_submit calls,
+	 * the hash may grow pretty big, so using delete may be better
+	 */
+	in_iosubmit[tid()] = 0
+}
+
+/*
+ * every time we call schedule, check to see if we started off in
+ * io_submit.  If so, record our backtrace into the traces histogram
+ */
+probe kernel.function("schedule") {
+	if (tid() in in_iosubmit) {
+		traces[backtrace()]++
+
+		/*
+		 * change this to if (1) if you want a backtrace every time
+		 * you go into schedule from io_submit.  Unfortunately, the traces
+		 * saved into the traces histogram above are truncated to just a
+		 * few lines.  so the only way to see the full trace is via the
+		 * more verbose print_backtrace() right here.
+		 */
+		if (0) {
+			printf("schedule in io_submit!\n")
+			print_backtrace()
+		}
+	}
+}
+
+/*
+ * when stap is done (via ctrl-c) go through the record of all the
+ * trace paths and print the 30 most common.
+ */
+probe end {
+	foreach (stack in traces- limit 30) {
+		printf("%d:", traces[stack])
+		print_stack(stack);
+	}
+}
+
-- 
cgit 


From a238792343eba4fc3a752f8f44bd3ff99472ed33 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Mon, 11 Aug 2008 17:18:32 +0200
Subject: Redirect stderr gets redircted so warnings don't let example script
 run fail.

---
 testsuite/systemtap.examples/ChangeLog | 5 +++++
 testsuite/systemtap.examples/check.exp | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'testsuite/systemtap.examples')

diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index c50bcefc..682e44e5 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-11  Mark Wielaard  <mwielaard@redhat.com>
+
+	* check.exp: Make sure that stderr gets redircted so warnings don't
+	make example script run fail.
+
 2008-08-11  Mark Wielaard  <mwielaard@redhat.com>
 
 	PR6835. Reported by Eugeniy Meshcheryakov <eugen@debian.org>
diff --git a/testsuite/systemtap.examples/check.exp b/testsuite/systemtap.examples/check.exp
index 14d9a57e..482738cc 100644
--- a/testsuite/systemtap.examples/check.exp
+++ b/testsuite/systemtap.examples/check.exp
@@ -36,7 +36,10 @@ proc run_command { test command } {
     #FIXME tcl says that single quotes not dealt with
     if { $command != "" } then {
 	verbose -log "attempting command $command"
-	set res [catch {eval exec $command} value]
+	# Pipe both stdout and stderr to cat, otherwise any stderr
+	# output results in res being set to 1 (TCL_ERROR). This breaks
+	# scripts that have WARNINGS about for example skipped probes.
+	set res [catch {eval exec "$command |& cat"} value]
 	verbose -log "OUT $value"
 	verbose -log "RC $res"
 	if {$res != 0 } {
-- 
cgit