From 04e9d8cedd9dc356d116c5387eac8c1ea9d547f7 Mon Sep 17 00:00:00 2001 From: Andrew Donnellan Date: Tue, 2 Apr 2019 13:55:57 +1100 Subject: 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 --- pkg/report/linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/report/linux.go') 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,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", -- cgit mrf-deployment