Merge commit 'origin/master' into pr7043

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

1 files changed, 13 insertions, 0 deletions

diff --git a/testsuite/systemtap.examples/network/tcp.stp b/testsuite/systemtap.examples/network/tcp.stp
new file mode 100755
index 00000000..01db9d2d
--- /dev/null
+++ b/testsuite/systemtap.examples/network/tcp.stp
@@ -0,0 +1,13 @@
+#! /usr/bin/env stap
+
+//A simple TCP tapset example
+
+probe begin {
+	printf("Expected IP 7.91.205.21 .... %s\n", ip_ntop(123456789))
+	printf("Expected IP 58.222.104.177 .... %s\n", ip_ntop(987654321))
+	printf("Expected IP 9.3.191.111 ... %s\n", ip_ntop(151240559))
+}
+
+probe tcp.recvmsg {
+	printf("received a message from %s on port %d from port %d\n", saddr, dport, sport)
+}