diff options
| author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2019-04-02 13:55:57 +1100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-05-07 08:41:33 +0200 |
| commit | 04e9d8cedd9dc356d116c5387eac8c1ea9d547f7 (patch) | |
| tree | bbb6b74640a5a5fe75074f8e735226e28e9aaff0 /pkg/report/linux.go | |
| parent | 148296f4787895d1b148d29a2f48140bcfd245a3 (diff) | |
pkg/report: Handle powerpc stack traces correctly
powerpc stack traces are printed a bit differently from x86 stack traces.
Adjust the regexes accordingly to cope with this format.
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Diffstat (limited to 'pkg/report/linux.go')
| -rw-r--r-- | pkg/report/linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/report/linux.go b/pkg/report/linux.go index bb0d90e81..2652f4513 100644 --- a/pkg/report/linux.go +++ b/pkg/report/linux.go @@ -652,7 +652,7 @@ var linuxStallAnchorFrames = []*regexp.Regexp{ var ( linuxSymbolizeRe = regexp.MustCompile(`(?:\[\<(?:[0-9a-f]+)\>\])?[ \t]+(?:[0-9]+:)?([a-zA-Z0-9_.]+)\+0x([0-9a-f]+)/0x([0-9a-f]+)`) - stackFrameRe = regexp.MustCompile(`^ *(?:\[\<(?:[0-9a-f]+)\>\])?[ \t]+(?:[0-9]+:)?([a-zA-Z0-9_.]+)\+0x([0-9a-f]+)/0x([0-9a-f]+)`) + stackFrameRe = regexp.MustCompile(`^ *(?:\[\<?(?:[0-9a-f]+)\>?\] ?){0,2}[ \t]+(?:[0-9]+:)?([a-zA-Z0-9_.]+)\+0x([0-9a-f]+)/0x([0-9a-f]+)`) linuxRcuStall = compile("INFO: rcu_(?:preempt|sched|bh) (?:self-)?detected(?: expedited)? stall") linuxRipFrame = compile(`IP: (?:(?:[0-9]+:)?(?:{{PC}} +){0,2}{{FUNC}}|[0-9]+:0x[0-9a-f]+|(?:[0-9]+:)?{{PC}} +\[< *\(null\)>\] +\(null\)|[0-9]+: +\(null\))`) ) @@ -675,7 +675,7 @@ var linuxStackKeywords = []*regexp.Regexp{ var linuxStackParams = &stackParams{ stackStartRes: linuxStackKeywords, frameRes: []*regexp.Regexp{ - compile("^ +(?:{{PC}} )?{{FUNC}}"), + compile("^ *(?:{{PC}} ){0,2}{{FUNC}}"), }, skipPatterns: []string{ "__sanitizer", |