83 files changed, 5 insertions, 373 deletions
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/small_demos/ansi_colors.stp b/testsuite/systemtap.examples/general/ansi_colors.stp
index 0d9d7c47..0d9d7c47 100755
--- a/testsuite/systemtap.examples/small_demos/ansi_colors.stp
+++ b/testsuite/systemtap.examples/general/ansi_colors.stp
diff --git a/testsuite/systemtap.examples/small_demos/click.wav b/testsuite/systemtap.examples/general/click.wav
index 8214b229..8214b229 100644
--- a/testsuite/systemtap.examples/small_demos/click.wav
+++ b/testsuite/systemtap.examples/general/click.wav
diff --git a/testsuite/systemtap.examples/graphs.meta b/testsuite/systemtap.examples/general/graphs.meta
index 60a522b3..60a522b3 100644
--- a/testsuite/systemtap.examples/graphs.meta
+++ b/testsuite/systemtap.examples/general/graphs.meta
diff --git a/testsuite/systemtap.examples/graphs.stp b/testsuite/systemtap.examples/general/graphs.stp
index 0c8e3796..0c8e3796 100644
--- a/testsuite/systemtap.examples/graphs.stp
+++ b/testsuite/systemtap.examples/general/graphs.stp
diff --git a/testsuite/systemtap.examples/helloworld.meta b/testsuite/systemtap.examples/general/helloworld.meta
index 60bc53f2..60bc53f2 100644
--- a/testsuite/systemtap.examples/helloworld.meta
+++ b/testsuite/systemtap.examples/general/helloworld.meta
diff --git a/testsuite/systemtap.examples/helloworld.stp b/testsuite/systemtap.examples/general/helloworld.stp
index efe45b79..efe45b79 100755
--- a/testsuite/systemtap.examples/helloworld.stp
+++ b/testsuite/systemtap.examples/general/helloworld.stp
diff --git a/testsuite/systemtap.examples/small_demos/key.stp b/testsuite/systemtap.examples/general/key.stp
index 6d2d6c3f..6d2d6c3f 100755
--- a/testsuite/systemtap.examples/small_demos/key.stp
+++ b/testsuite/systemtap.examples/general/key.stp
diff --git a/testsuite/systemtap.examples/small_demos/keyhack.stp b/testsuite/systemtap.examples/general/keyhack.stp
index 3137baad..3137baad 100755
--- a/testsuite/systemtap.examples/small_demos/keyhack.stp
+++ b/testsuite/systemtap.examples/general/keyhack.stp
diff --git a/testsuite/systemtap.examples/para-callgraph.meta b/testsuite/systemtap.examples/general/para-callgraph.meta
index 3ce4b648..3ce4b648 100644
--- a/testsuite/systemtap.examples/para-callgraph.meta
+++ b/testsuite/systemtap.examples/general/para-callgraph.meta
diff --git a/testsuite/systemtap.examples/para-callgraph.stp b/testsuite/systemtap.examples/general/para-callgraph.stp
index 1afb8837..1afb8837 100644
--- a/testsuite/systemtap.examples/para-callgraph.stp
+++ b/testsuite/systemtap.examples/general/para-callgraph.stp
diff --git a/testsuite/systemtap.examples/small_demos/return.wav b/testsuite/systemtap.examples/general/return.wav
index 20f978cc..20f978cc 100644
--- a/testsuite/systemtap.examples/small_demos/return.wav
+++ b/testsuite/systemtap.examples/general/return.wav
diff --git a/testsuite/systemtap.examples/html_footer.tmpl b/testsuite/systemtap.examples/html/html_footer.tmpl
index 27eccd3c..27eccd3c 100644
--- a/testsuite/systemtap.examples/html_footer.tmpl
+++ b/testsuite/systemtap.examples/html/html_footer.tmpl
diff --git a/testsuite/systemtap.examples/html_header.tmpl b/testsuite/systemtap.examples/html/html_header.tmpl
index 33ce558f..33ce558f 100644
--- a/testsuite/systemtap.examples/html_header.tmpl
+++ b/testsuite/systemtap.examples/html/html_header.tmpl
diff --git a/testsuite/systemtap.examples/systemtap.css b/testsuite/systemtap.examples/html/systemtap.css
index 445d95f4..445d95f4 100644
--- a/testsuite/systemtap.examples/systemtap.css
+++ b/testsuite/systemtap.examples/html/systemtap.css
diff --git a/testsuite/systemtap.examples/systemtapcorner.gif b/testsuite/systemtap.examples/html/systemtapcorner.gif
index c44f2c75..c44f2c75 100644
--- a/testsuite/systemtap.examples/systemtapcorner.gif
+++ b/testsuite/systemtap.examples/html/systemtapcorner.gif
diff --git a/testsuite/systemtap.examples/systemtaplogo.png b/testsuite/systemtap.examples/html/systemtaplogo.png
index c223babd..c223babd 100644
--- a/testsuite/systemtap.examples/systemtaplogo.png
+++ b/testsuite/systemtap.examples/html/systemtaplogo.png
diff --git a/testsuite/systemtap.examples/disktop.meta b/testsuite/systemtap.examples/io/disktop.meta
index b063075b..b063075b 100644
--- a/testsuite/systemtap.examples/disktop.meta
+++ b/testsuite/systemtap.examples/io/disktop.meta
diff --git a/testsuite/systemtap.examples/disktop.stp b/testsuite/systemtap.examples/io/disktop.stp
index 2637d735..2637d735 100644
--- a/testsuite/systemtap.examples/disktop.stp
+++ b/testsuite/systemtap.examples/io/disktop.stp
diff --git a/testsuite/systemtap.examples/io_submit.meta b/testsuite/systemtap.examples/io/io_submit.meta
index 911cb837..911cb837 100644
--- a/testsuite/systemtap.examples/io_submit.meta
+++ b/testsuite/systemtap.examples/io/io_submit.meta
diff --git a/testsuite/systemtap.examples/io_submit.stp b/testsuite/systemtap.examples/io/io_submit.stp
index 735dd6f9..735dd6f9 100644
--- a/testsuite/systemtap.examples/io_submit.stp
+++ b/testsuite/systemtap.examples/io/io_submit.stp
diff --git a/testsuite/systemtap.examples/iostat-scsi.stp b/testsuite/systemtap.examples/io/iostat-scsi.stp
index ef778e53..ef778e53 100755
--- a/testsuite/systemtap.examples/iostat-scsi.stp
+++ b/testsuite/systemtap.examples/io/iostat-scsi.stp
diff --git a/testsuite/systemtap.examples/iostat-scsi.txt b/testsuite/systemtap.examples/io/iostat-scsi.txt
index 8222f659..8222f659 100644
--- a/testsuite/systemtap.examples/iostat-scsi.txt
+++ b/testsuite/systemtap.examples/io/iostat-scsi.txt
diff --git a/testsuite/systemtap.examples/iotime.meta b/testsuite/systemtap.examples/io/iotime.meta
index f656ff85..f656ff85 100644
--- a/testsuite/systemtap.examples/iotime.meta
+++ b/testsuite/systemtap.examples/io/iotime.meta
diff --git a/testsuite/systemtap.examples/iotime.stp b/testsuite/systemtap.examples/io/iotime.stp
index 4fbd6b6e..4fbd6b6e 100755
--- a/testsuite/systemtap.examples/iotime.stp
+++ b/testsuite/systemtap.examples/io/iotime.stp
diff --git a/testsuite/systemtap.examples/iotop.meta b/testsuite/systemtap.examples/io/iotop.meta
index d5331eda..d5331eda 100644
--- a/testsuite/systemtap.examples/iotop.meta
+++ b/testsuite/systemtap.examples/io/iotop.meta
diff --git a/testsuite/systemtap.examples/iotop.stp b/testsuite/systemtap.examples/io/iotop.stp
index 6050343c..6050343c 100644
--- a/testsuite/systemtap.examples/iotop.stp
+++ b/testsuite/systemtap.examples/io/iotop.stp
diff --git a/testsuite/systemtap.examples/traceio.meta b/testsuite/systemtap.examples/io/traceio.meta
index da0b99f3..da0b99f3 100644
--- a/testsuite/systemtap.examples/traceio.meta
+++ b/testsuite/systemtap.examples/io/traceio.meta
diff --git a/testsuite/systemtap.examples/traceio.stp b/testsuite/systemtap.examples/io/traceio.stp
index d3757c23..d3757c23 100644
--- a/testsuite/systemtap.examples/traceio.stp
+++ b/testsuite/systemtap.examples/io/traceio.stp
diff --git a/testsuite/systemtap.examples/traceio2.meta b/testsuite/systemtap.examples/io/traceio2.meta
index 4b63108c..4b63108c 100644
--- a/testsuite/systemtap.examples/traceio2.meta
+++ b/testsuite/systemtap.examples/io/traceio2.meta
diff --git a/testsuite/systemtap.examples/traceio2.stp b/testsuite/systemtap.examples/io/traceio2.stp
index 656c38b3..656c38b3 100644
--- a/testsuite/systemtap.examples/traceio2.stp
+++ b/testsuite/systemtap.examples/io/traceio2.stp
diff --git a/testsuite/systemtap.examples/nettop.meta b/testsuite/systemtap.examples/network/nettop.meta
index 61d1c153..61d1c153 100644
--- a/testsuite/systemtap.examples/nettop.meta
+++ b/testsuite/systemtap.examples/network/nettop.meta
diff --git a/testsuite/systemtap.examples/nettop.stp b/testsuite/systemtap.examples/network/nettop.stp
index 96db413a..96db413a 100755
--- a/testsuite/systemtap.examples/nettop.stp
+++ b/testsuite/systemtap.examples/network/nettop.stp
diff --git a/testsuite/systemtap.examples/nettop.txt b/testsuite/systemtap.examples/network/nettop.txt
index 2bfd4967..2bfd4967 100644
--- a/testsuite/systemtap.examples/nettop.txt
+++ b/testsuite/systemtap.examples/network/nettop.txt
diff --git a/testsuite/systemtap.examples/socket-trace.meta b/testsuite/systemtap.examples/network/socket-trace.meta
index 0b26f2fe..0b26f2fe 100644
--- a/testsuite/systemtap.examples/socket-trace.meta
+++ b/testsuite/systemtap.examples/network/socket-trace.meta
diff --git a/testsuite/systemtap.examples/socket-trace.stp b/testsuite/systemtap.examples/network/socket-trace.stp
index 13ab8e06..13ab8e06 100755
--- a/testsuite/systemtap.examples/socket-trace.stp
+++ b/testsuite/systemtap.examples/network/socket-trace.stp
diff --git a/testsuite/systemtap.examples/socktop b/testsuite/systemtap.examples/network/socktop
index 123e37e9..123e37e9 100755
--- a/testsuite/systemtap.examples/socktop
+++ b/testsuite/systemtap.examples/network/socktop
diff --git a/testsuite/systemtap.examples/socktop.txt b/testsuite/systemtap.examples/network/socktop.txt
index 0ebce003..0ebce003 100644
--- a/testsuite/systemtap.examples/socktop.txt
+++ b/testsuite/systemtap.examples/network/socktop.txt
diff --git a/testsuite/systemtap.examples/futexes.meta b/testsuite/systemtap.examples/process/futexes.meta
index ff303122..ff303122 100644
--- a/testsuite/systemtap.examples/futexes.meta
+++ b/testsuite/systemtap.examples/process/futexes.meta
diff --git a/testsuite/systemtap.examples/futexes.stp b/testsuite/systemtap.examples/process/futexes.stp
index 16c62937..16c62937 100755
--- a/testsuite/systemtap.examples/futexes.stp
+++ b/testsuite/systemtap.examples/process/futexes.stp
diff --git a/testsuite/systemtap.examples/futexes.txt b/testsuite/systemtap.examples/process/futexes.txt
index 51de4352..51de4352 100644
--- a/testsuite/systemtap.examples/futexes.txt
+++ b/testsuite/systemtap.examples/process/futexes.txt
diff --git a/testsuite/systemtap.examples/pf2.meta b/testsuite/systemtap.examples/process/pf2.meta
index d0a534bd..d0a534bd 100644
--- a/testsuite/systemtap.examples/pf2.meta
+++ b/testsuite/systemtap.examples/process/pf2.meta
diff --git a/testsuite/systemtap.examples/pf2.stp b/testsuite/systemtap.examples/process/pf2.stp
index a804c3ff..a804c3ff 100755
--- a/testsuite/systemtap.examples/pf2.stp
+++ b/testsuite/systemtap.examples/process/pf2.stp
diff --git a/testsuite/systemtap.examples/pf2.txt b/testsuite/systemtap.examples/process/pf2.txt
index 0fafe17e..0fafe17e 100644
--- a/testsuite/systemtap.examples/pf2.txt
+++ b/testsuite/systemtap.examples/process/pf2.txt
diff --git a/testsuite/systemtap.examples/small_demos/proc_snoop.stp b/testsuite/systemtap.examples/process/proc_snoop.stp
index 24499b4b..24499b4b 100755
--- a/testsuite/systemtap.examples/small_demos/proc_snoop.stp
+++ b/testsuite/systemtap.examples/process/proc_snoop.stp
diff --git a/testsuite/systemtap.examples/sig_by_pid.meta b/testsuite/systemtap.examples/process/sig_by_pid.meta
index 03b02fba..03b02fba 100644
--- a/testsuite/systemtap.examples/sig_by_pid.meta
+++ b/testsuite/systemtap.examples/process/sig_by_pid.meta
diff --git a/testsuite/systemtap.examples/sig_by_pid.stp b/testsuite/systemtap.examples/process/sig_by_pid.stp
index 9c1493f5..9c1493f5 100755
--- a/testsuite/systemtap.examples/sig_by_pid.stp
+++ b/testsuite/systemtap.examples/process/sig_by_pid.stp
diff --git a/testsuite/systemtap.examples/sig_by_pid.txt b/testsuite/systemtap.examples/process/sig_by_pid.txt
index 927b4607..927b4607 100644
--- a/testsuite/systemtap.examples/sig_by_pid.txt
+++ b/testsuite/systemtap.examples/process/sig_by_pid.txt
diff --git a/testsuite/systemtap.examples/sig_by_proc.meta b/testsuite/systemtap.examples/process/sig_by_proc.meta
index eea42be4..eea42be4 100644
--- a/testsuite/systemtap.examples/sig_by_proc.meta
+++ b/testsuite/systemtap.examples/process/sig_by_proc.meta
diff --git a/testsuite/systemtap.examples/sig_by_proc.stp b/testsuite/systemtap.examples/process/sig_by_proc.stp
index ce845aed..ce845aed 100755
--- a/testsuite/systemtap.examples/sig_by_proc.stp
+++ b/testsuite/systemtap.examples/process/sig_by_proc.stp
diff --git a/testsuite/systemtap.examples/sig_by_proc.txt b/testsuite/systemtap.examples/process/sig_by_proc.txt
index d09da9fe..d09da9fe 100644
--- a/testsuite/systemtap.examples/sig_by_proc.txt
+++ b/testsuite/systemtap.examples/process/sig_by_proc.txt
diff --git a/testsuite/systemtap.examples/sigkill.meta b/testsuite/systemtap.examples/process/sigkill.meta
index 57032224..57032224 100644
--- a/testsuite/systemtap.examples/sigkill.meta
+++ b/testsuite/systemtap.examples/process/sigkill.meta
diff --git a/testsuite/systemtap.examples/sigkill.stp b/testsuite/systemtap.examples/process/sigkill.stp
index 8f754219..8f754219 100644
--- a/testsuite/systemtap.examples/sigkill.stp
+++ b/testsuite/systemtap.examples/process/sigkill.stp
diff --git a/testsuite/systemtap.examples/sigmon.meta b/testsuite/systemtap.examples/process/sigmon.meta
index 18834997..18834997 100644
--- a/testsuite/systemtap.examples/sigmon.meta
+++ b/testsuite/systemtap.examples/process/sigmon.meta
diff --git a/testsuite/systemtap.examples/sigmon.stp b/testsuite/systemtap.examples/process/sigmon.stp
index 31d7822e..31d7822e 100755
--- a/testsuite/systemtap.examples/sigmon.stp
+++ b/testsuite/systemtap.examples/process/sigmon.stp
diff --git a/testsuite/systemtap.examples/sleepingBeauties.meta b/testsuite/systemtap.examples/process/sleepingBeauties.meta
index 95e08361..95e08361 100644
--- a/testsuite/systemtap.examples/sleepingBeauties.meta
+++ b/testsuite/systemtap.examples/process/sleepingBeauties.meta
diff --git a/testsuite/systemtap.examples/sleepingBeauties.stp b/testsuite/systemtap.examples/process/sleepingBeauties.stp
index 64c563a3..64c563a3 100644
--- a/testsuite/systemtap.examples/sleepingBeauties.stp
+++ b/testsuite/systemtap.examples/process/sleepingBeauties.stp
diff --git a/testsuite/systemtap.examples/sleeptime.meta b/testsuite/systemtap.examples/process/sleeptime.meta
index d6c59345..d6c59345 100644
--- a/testsuite/systemtap.examples/sleeptime.meta
+++ b/testsuite/systemtap.examples/process/sleeptime.meta
diff --git a/testsuite/systemtap.examples/sleeptime.stp b/testsuite/systemtap.examples/process/sleeptime.stp
index b5729ceb..b5729ceb 100755
--- a/testsuite/systemtap.examples/sleeptime.stp
+++ b/testsuite/systemtap.examples/process/sleeptime.stp
diff --git a/testsuite/systemtap.examples/syscalls_by_pid.meta b/testsuite/systemtap.examples/process/syscalls_by_pid.meta
index 590652b3..590652b3 100644
--- a/testsuite/systemtap.examples/syscalls_by_pid.meta
+++ b/testsuite/systemtap.examples/process/syscalls_by_pid.meta
diff --git a/testsuite/systemtap.examples/syscalls_by_pid.stp b/testsuite/systemtap.examples/process/syscalls_by_pid.stp
index 47aa4955..47aa4955 100755
--- a/testsuite/systemtap.examples/syscalls_by_pid.stp
+++ b/testsuite/systemtap.examples/process/syscalls_by_pid.stp
diff --git a/testsuite/systemtap.examples/syscalls_by_pid.txt b/testsuite/systemtap.examples/process/syscalls_by_pid.txt
index 4943a139..4943a139 100644
--- a/testsuite/systemtap.examples/syscalls_by_pid.txt
+++ b/testsuite/systemtap.examples/process/syscalls_by_pid.txt
diff --git a/testsuite/systemtap.examples/syscalls_by_proc.meta b/testsuite/systemtap.examples/process/syscalls_by_proc.meta
index 79aa3e87..79aa3e87 100644
--- a/testsuite/systemtap.examples/syscalls_by_proc.meta
+++ b/testsuite/systemtap.examples/process/syscalls_by_proc.meta
diff --git a/testsuite/systemtap.examples/syscalls_by_proc.stp b/testsuite/systemtap.examples/process/syscalls_by_proc.stp
index af7d6932..af7d6932 100755
--- a/testsuite/systemtap.examples/syscalls_by_proc.stp
+++ b/testsuite/systemtap.examples/process/syscalls_by_proc.stp
diff --git a/testsuite/systemtap.examples/syscalls_by_proc.txt b/testsuite/systemtap.examples/process/syscalls_by_proc.txt
index dd554083..dd554083 100644
--- a/testsuite/systemtap.examples/syscalls_by_proc.txt
+++ b/testsuite/systemtap.examples/process/syscalls_by_proc.txt
diff --git a/testsuite/systemtap.examples/syscalltimes b/testsuite/systemtap.examples/process/syscalltimes
index 84ca77a9..84ca77a9 100755
--- a/testsuite/systemtap.examples/syscalltimes
+++ b/testsuite/systemtap.examples/process/syscalltimes
diff --git a/testsuite/systemtap.examples/syscalltimes.txt b/testsuite/systemtap.examples/process/syscalltimes.txt
index d50f73ad..d50f73ad 100644
--- a/testsuite/systemtap.examples/syscalltimes.txt
+++ b/testsuite/systemtap.examples/process/syscalltimes.txt
diff --git a/testsuite/systemtap.examples/wait4time.meta b/testsuite/systemtap.examples/process/wait4time.meta
index a939d466..a939d466 100644
--- a/testsuite/systemtap.examples/wait4time.meta
+++ b/testsuite/systemtap.examples/process/wait4time.meta
diff --git a/testsuite/systemtap.examples/wait4time.stp b/testsuite/systemtap.examples/process/wait4time.stp
index ba300ea7..ba300ea7 100755
--- a/testsuite/systemtap.examples/wait4time.stp
+++ b/testsuite/systemtap.examples/process/wait4time.stp
diff --git a/testsuite/systemtap.examples/functioncallcount.meta b/testsuite/systemtap.examples/profiling/functioncallcount.meta
index 4d419528..4d419528 100644
--- a/testsuite/systemtap.examples/functioncallcount.meta
+++ b/testsuite/systemtap.examples/profiling/functioncallcount.meta
diff --git a/testsuite/systemtap.examples/functioncallcount.stp b/testsuite/systemtap.examples/profiling/functioncallcount.stp
index e393b612..e393b612 100644
--- a/testsuite/systemtap.examples/functioncallcount.stp
+++ b/testsuite/systemtap.examples/profiling/functioncallcount.stp
diff --git a/testsuite/systemtap.examples/thread-times.meta b/testsuite/systemtap.examples/profiling/thread-times.meta
index fcbf062e..fcbf062e 100644
--- a/testsuite/systemtap.examples/thread-times.meta
+++ b/testsuite/systemtap.examples/profiling/thread-times.meta
diff --git a/testsuite/systemtap.examples/thread-times.stp b/testsuite/systemtap.examples/profiling/thread-times.stp
index 1aeb2037..1aeb2037 100644
--- a/testsuite/systemtap.examples/thread-times.stp
+++ b/testsuite/systemtap.examples/profiling/thread-times.stp
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/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/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/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 ()
-}
-