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, 49 deletions

diff --git a/testsuite/systemtap.samples/tcp_connections.stp b/testsuite/systemtap.samples/tcp_connections.stp
deleted file mode 100644
index a4449b60..00000000
--- a/testsuite/systemtap.samples/tcp_connections.stp
+++ /dev/null
@@ -1,49 +0,0 @@
-#! stap
-
-%{
-#include <linux/version.h>
-#include <net/sock.h>
-#include <net/tcp.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) 
-#define LPORT	(inet->inet.num)
-#define DADDR	(&inet->inet.daddr)
-#else 
-#define LPORT 	(inet->num)
-#define DADDR	(&inet->daddr)
-#endif
-%}
-
-function get_local_port:long(sock) 
-%{
-	unsigned long ptr = (unsigned long) THIS->sock;
-
-	struct inet_sock *inet = (struct inet_sock *) ptr;
-	THIS->__retvalue = (long long) LPORT;
-%}
-
-function get_ip_source:string(sock)
-%{
-	unsigned long ptr = (unsigned long) THIS->sock;
-	struct inet_sock *inet = (struct inet_sock *) ptr;
-	unsigned char addr[4];
-	memcpy(addr, DADDR, sizeof(addr));
-	sprintf(THIS->__retvalue, "%d.%d.%d.%d", 
-		addr[0], addr[1],  addr[2], addr[3]); 
-
-%}
-
-
-probe begin {
-	log ("UID\tCMD\t\tPID\t\tPORT\tIP_SOURCE")
-}
-
-probe kernel.function("tcp_accept").return {
-	sock = $return
-	if (sock != 0)
-		log(sprint(uid())."\t".
-			execname()."\t\t".
-			sprint(pid())."\t\t ".
-			sprint(get_local_port(sock))."\t".
- 			get_ip_source(sock))
-}