Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

1 files changed, 100 insertions, 0 deletions

diff --git a/man/stapprobes.iosched.3stap.in b/man/stapprobes.iosched.3stap.in
new file mode 100644
index 00000000..873251ac
--- /dev/null
+++ b/man/stapprobes.iosched.3stap.in
@@ -0,0 +1,100 @@
+.\" -*- nroff -*-
+.TH STAPPROBES.IOSCHED 3stap @DATE@ "IBM"
+.SH NAME
+stapprobes.iosched \- systemtap IO scheduler probe points
+
+.\" macros
+.de SAMPLE
+.br
+.RS
+.nf
+.nh
+..
+.de ESAMPLE
+.hy
+.fi
+.RE
+..
+
+.SH DESCRIPTION
+
+This family of probe points is used to probe the IO scheduler 
+activities.  It contains the following probe points:
+
+.P
+.TP 
+.B ioscheduler.elv_next_request
+Fires when retrieves a request from request queue
+
+.B Arguments:
+
+.I elevator_name
+  The elevator name
+
+.P
+.TP 
+.B ioscheduler.elv_next_request.return
+Fires when return from retrieving a request
+
+.B Arguments:
+
+.I req
+  Address of the request
+
+.I req_flags
+  request flags
+
+.I disk_major
+  disk major number of the request
+
+.I disk_minor
+  disk minor number of the request
+
+.P
+.TP 
+.B ioscheduler.elv_add_request
+Fires when add a request into request queue
+
+.B Arguments:
+
+.I elevator_name
+  The elevator name
+
+.I req
+  Address of the request
+
+.I req_flags
+  request flags
+
+.I disk_major
+  disk major number of the request
+
+.I disk_minor
+  disk minor number of the request
+
+.P
+.TP 
+.B ioscheduler.elv_completed_request
+Fires when a request is completed
+
+.B Arguments:
+
+.I elevator_name
+  The elevator name
+
+.I req
+  Address of the request
+
+.I req_flags
+  request flags
+
+.I disk_major
+  disk major number of the request
+
+.I disk_minor
+  disk minor number of the request
+
+.SH SEE ALSO
+.IR stap (1),
+.IR stapprobes (3stap)
+