Merge branch 'master' into pr6866

Conflicts:
	ChangeLog: Removed
	runtime/ChangeLog: Removed
	runtime/sym.c: Merged
	runtime/task_finder.c: Merged
	tapset/ChangeLog: Removed
	testsuite/ChangeLog: Removed

1 files changed, 0 insertions, 32 deletions

diff --git a/testsuite/systemtap.samples/queue_demo.stp b/testsuite/systemtap.samples/queue_demo.stp
deleted file mode 100644
index 61a3b6d1..00000000
--- a/testsuite/systemtap.samples/queue_demo.stp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-probe begin {
-  qsq_start ("block-read")
-  qsq_start ("block-write")
-}
-
-probe timer.ms(3500), end {
-  qsq_print ("block-read")
-  qsq_start ("block-read")
-  qsq_print ("block-write")
-  qsq_start ("block-write")
-}
-
-probe timer.ms(10000) { exit () }
-
-
-# synthesize queue work/service using three randomized "threads" for each queue.
-
-global tc
-function qs_doit (thread, name) {
-  n = tc[thread] = (tc[thread]+1) % 3 # per-thread state counter
-  if (n==1) qs_wait (name)
-  else if (n==2) qs_run (name)
-  else if (n==0) qs_done (name)
-}
-
-probe timer.ms(100).randomize(100) { qs_doit (0, "block-read") }
-probe timer.ms(100).randomize(100) { qs_doit (1, "block-read") }
-probe timer.ms(100).randomize(100) { qs_doit (2, "block-read") }
-probe timer.ms(100).randomize(100) { qs_doit (3, "block-write") }
-probe timer.ms(100).randomize(100) { qs_doit (4, "block-write") }
-probe timer.ms(100).randomize(100) { qs_doit (5, "block-write") }