From ca2f1c07f2a6bb48582b990868976b45d3663605 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Thu, 12 Sep 2019 15:28:04 +0200 Subject: acid/kernel: for stacktraces, try to use context from error stack when process is not sleeping when a process state has not been saved (Proc.mach != nil) then the contents of Proc.sched should be considered invalid. to approximate a stacktrace in this case, we use the error stack and get a stacktrace from the last waserror() call. --- sys/lib/acid/kernel | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/lib/acid/kernel b/sys/lib/acid/kernel index 4cf57ba71..c6433b9da 100644 --- a/sys/lib/acid/kernel +++ b/sys/lib/acid/kernel @@ -271,12 +271,23 @@ defn procstksize(p) { defn procstk(p) { complex Proc p; + local l, n; if p.state != 0 then { // 0 is Dead + if p.mach == 0 then { + l = p.sched; + } else { + n = p.nerrlab; + if n == 0 then { + return 0; + } + l = p.errlab + (n-1)*sizeofLabel; + } + complex Label l; if objtype=="386" || objtype=="amd64" then - _stk(gotolabel, p.sched.sp, linkreg(0), 0); + _stk(gotolabel, l.sp, linkreg(0), 0); else - _stk(p.sched.pc, p.sched.sp, linkreg(0), 0); + _stk(l.pc, l.sp, linkreg(0), 0); } } -- cgit v1.2.3