summaryrefslogtreecommitdiffstats
path: root/tapset/context-unwind.stp
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-05-13 11:12:01 -0400
committerDave Brolley <brolley@redhat.com>2009-05-13 11:12:01 -0400
commite9cb523875a37b2d809afbbe0fffae980d8080a1 (patch)
tree76e4175490b8d61a174b28643eab6dafe12adb0e /tapset/context-unwind.stp
parent8109bb63fcecd70d05455ebe26e4ad970a983609 (diff)
parent90562d7d561c26b25aa73082bd33eaa399688187 (diff)
downloadsystemtap-steved-e9cb523875a37b2d809afbbe0fffae980d8080a1.tar.gz
systemtap-steved-e9cb523875a37b2d809afbbe0fffae980d8080a1.tar.xz
systemtap-steved-e9cb523875a37b2d809afbbe0fffae980d8080a1.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapset/context-unwind.stp')
-rw-r--r--tapset/context-unwind.stp13
1 files changed, 5 insertions, 8 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