From 814c91a8ca94dda5e987e98ded36343b0ef036f7 Mon Sep 17 00:00:00 2001 From: Keith Randall Date: Thu, 23 Jan 2014 12:47:30 -0800 Subject: runtime: Print elision message if we skipped frames on traceback. Fixes bug 7180 R=golang-codereviews, dvyukov CC=golang-codereviews, gri https://codereview.appspot.com/55810044 --- src/pkg/runtime/traceback_arm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/pkg/runtime/traceback_arm.c') diff --git a/src/pkg/runtime/traceback_arm.c b/src/pkg/runtime/traceback_arm.c index 8a3685e76..3c23cd9fc 100644 --- a/src/pkg/runtime/traceback_arm.c +++ b/src/pkg/runtime/traceback_arm.c @@ -231,6 +231,8 @@ runtime·printcreatedby(G *gp) void runtime·traceback(uintptr pc, uintptr sp, uintptr lr, G *gp) { + int32 n; + if(gp->status == Gsyscall) { // Override signal registers if blocked in system call. pc = gp->syscallpc; @@ -240,8 +242,11 @@ runtime·traceback(uintptr pc, uintptr sp, uintptr lr, G *gp) // Print traceback. By default, omits runtime frames. // If that means we print nothing at all, repeat forcing all frames printed. - if(runtime·gentraceback(pc, sp, lr, gp, 0, nil, 100, nil, nil, false) == 0) - runtime·gentraceback(pc, sp, lr, gp, 0, nil, 100, nil, nil, true); + n = runtime·gentraceback(pc, sp, lr, gp, 0, nil, TracebackMaxFrames, nil, nil, false); + if(n == 0) + runtime·gentraceback(pc, sp, lr, gp, 0, nil, TracebackMaxFrames, nil, nil, true); + if(n == TracebackMaxFrames) + runtime·printf("...additional frames elided...\n"); runtime·printcreatedby(gp); } -- cgit v1.2.1