Merge branch 'master' of git://sources.redhat.com/git/systemtap

2 files changed, 12 insertions, 15 deletions

diff --git a/tapset/context-unwind.stp b/tapset/context-unwind.stp
index f1e99dc8..d6654d25 100644
--- a/tapset/context-unwind.stp
+++ b/tapset/context-unwind.stp
@@ -51,16 +51,13 @@ function backtrace:string () %{ /* pure */
  * sfunction caller - Return name and address of calling function
  *
  *  Return the address and name of the calling function. 
+ *  This is equivalent to calling:
+ *  sprintf("%s 0x%x", symname(caller_addr(), caller_addr()))
  *  <emphasis>Works only for return probes at this time.</emphasis>
  */
-function caller:string() %{ /* pure */
-        if (CONTEXT->pi) 
-		_stp_symbol_snprint( THIS->__retvalue, MAXSTRINGLEN, 
-			(unsigned long)_stp_ret_addr_r(CONTEXT->pi),
-                        current, 0);
-        else
-		strlcpy(THIS->__retvalue,"unknown",MAXSTRINGLEN);
-%}
+function caller:string() {
+	return sprintf("%s 0x%x", symname(caller_addr()), caller_addr());
+}
 
 /**
  * sfunction caller_addr -  Return caller address
diff --git a/testsuite/buildok/tcp_test.stp b/testsuite/buildok/tcp_test.stp
index a262ab29..a5e3bafb 100755
--- a/testsuite/buildok/tcp_test.stp
+++ b/testsuite/buildok/tcp_test.stp
@@ -8,16 +8,16 @@ function print_report()
 }
 
 probe tcp.sendmsg {
-	ports   = inet_get_local_port(sk)
-	src_ips = inet_get_ip_source(sk)
-	rtos    = tcp_get_info_rto(sk)
+	ports   = inet_get_local_port(sock)
+	src_ips = inet_get_ip_source(sock)
+	rtos    = tcp_get_info_rto(sock)
 }
 
 probe tcp.recvmsg {
-        cwnd     = tcp_get_info_snd_cwnd(sk)
-        mss      = tcp_ts_get_info_rcv_mss(sk)      
-        ssthresh = tcp_ts_get_info_snd_ssthresh(sk)       
-        state    =  tcp_ts_get_info_state(sk)
+        cwnd     = tcp_get_info_snd_cwnd(sock)
+        mss      = tcp_ts_get_info_rcv_mss(sock)
+        ssthresh = tcp_ts_get_info_snd_ssthresh(sock)
+        state    =  tcp_ts_get_info_state(sock)
 }
 
 probe tcp.sendmsg.return {