diff options
| author | hiramatu <hiramatu> | 2008-02-06 22:07:42 +0000 |
|---|---|---|
| committer | hiramatu <hiramatu> | 2008-02-06 22:07:42 +0000 |
| commit | 47683be64546814f9bf7f48e62c916d7901e336e (patch) | |
| tree | 1c4068f2f32134b00c1d202cca45532344506d43 | |
| parent | 983aeb407de6b516a794d750d329b3780149ed4f (diff) | |
| download | systemtap-steved-47683be64546814f9bf7f48e62c916d7901e336e.tar.gz systemtap-steved-47683be64546814f9bf7f48e62c916d7901e336e.tar.xz systemtap-steved-47683be64546814f9bf7f48e62c916d7901e336e.zip | |
2008-02-06 Masami Hiramatsu <mhiramat@redhat.com>
* stack-ia64.c (__stp_show_stack_sym): Skip printing symbol if (ip ==
REG_IP(regs)).
2008-02-06 Masami Hiramatsu <mhiramat@redhat.com>
* systemtap.context/backtrace.tcl: Fixed regular expressions and Added
new expression for return probe on ia64.
* systemtap.context/backtrace.stp(print_all_trace_info): Added
trace point output before calling print_stack().
| -rw-r--r-- | runtime/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/stack-ia64.c | 4 | ||||
| -rw-r--r-- | testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | testsuite/systemtap.context/backtrace.stp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.context/backtrace.tcl | 12 |
5 files changed, 24 insertions, 6 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 0a8ac63a..b501c1ef 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,8 @@ +2008-02-06 Masami Hiramatsu <mhiramat@redhat.com> + + * stack-ia64.c (__stp_show_stack_sym): Skip printing symbol if (ip == + REG_IP(regs)). + 2008-01-29 Martin Hunt <hunt@redhat.com> * io.c (_stp_vlog): Use get_cpu() instead diff --git a/runtime/stack-ia64.c b/runtime/stack-ia64.c index cab25a0b..ca9d25a6 100644 --- a/runtime/stack-ia64.c +++ b/runtime/stack-ia64.c @@ -23,8 +23,8 @@ static void __stp_show_stack_sym(struct unw_frame_info *info, void *arg) if (skip){ if (ip == REG_IP(regs)) skip = 0; - else continue; - } + continue; + } _stp_print_char(' '); _stp_symbol_print(ip); _stp_print_char('\n'); diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 3156de54..9f82e039 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2008-02-06 Masami Hiramatsu <mhiramat@redhat.com> + * systemtap.context/backtrace.tcl: Fixed regular expressions and Added + new expression for checking return probe's stacktrace on ia64. + * systemtap.context/backtrace.stp (print_all_trace_info): Added + trace point output before calling print_stack(). + +2008-02-06 Masami Hiramatsu <mhiramat@redhat.com> + * systemtap.base/cmd_parse.exp: Added 'wait' between tests for preventing unexpected EOF. diff --git a/testsuite/systemtap.context/backtrace.stp b/testsuite/systemtap.context/backtrace.stp index 73781371..c14d071c 100644 --- a/testsuite/systemtap.context/backtrace.stp +++ b/testsuite/systemtap.context/backtrace.stp @@ -4,7 +4,7 @@ function print_all_trace_info(point:string) { print("--------\n") bt = backtrace() printf("the %s stack is %s\n", point, bt) - print("--------\n") + printf("--<%s>--\n", point) print_stack(bt); print("--------\n") } diff --git a/testsuite/systemtap.context/backtrace.tcl b/testsuite/systemtap.context/backtrace.tcl index e35832ee..409cf693 100644 --- a/testsuite/systemtap.context/backtrace.tcl +++ b/testsuite/systemtap.context/backtrace.tcl @@ -5,6 +5,12 @@ set m4 0 set m5 0 set m6 0 +if {[istarget ia64-*-*]} { + set retexp {.*return\>--\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n} +} else { + set retexp {.*return\>--\r\n 0x[a-f0-9]+ : kretprobe_trampoline_holder[^\r\n]+\r\n} +} + spawn stap backtrace.stp #exp_internal 1 expect { @@ -36,7 +42,7 @@ expect { incr m2 expect { -timeout 5 - -re {.*---\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n} { + -re {.*call\>--\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n} { if {$m2 == 1} {incr m2} exp_continue } @@ -76,7 +82,7 @@ expect { incr m4 expect { -timeout 5 - -re {.*0x[a-f0-9]+ : kretprobe_trampoline_holder[^\[]+\[\]\r\n} { + -re $retexp { if {$m4 == 1} {incr m4} exp_continue } @@ -104,7 +110,7 @@ expect { incr m6 expect { -timeout 5 - -re {.*---\r\n 0x[a-f0-9]+[^\r\n]+\r\n} { + -re {.*profile>--\r\n 0x[a-f0-9]+[^\r\n]+\r\n} { if {$m6 == 1} {incr m6} } } |