Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix frame-pointer stackwalking

Browse source
This commit is contained in:
Gregory Terzian 2019-01-06 22:39:35 +08:00
parent aaf2c5ad64
commit dcccceff24
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/background_hang_monitor/sampler_mac.rs
View file

@ -96,7 +96,9 @@ unsafe fn frame_pointer_stack_walk(regs: Registers) -> NativeStack {
// --dev,
// or --with-frame-pointer.
let stackaddr = libc::pthread_get_stackaddr_np(libc::pthread_self());
let pthread_t = libc::pthread_self();
let stackaddr = libc::pthread_get_stackaddr_np(pthread_t);
let stacksize = libc::pthread_get_stacksize_np(pthread_t);
let mut native_stack = NativeStack::new();
let pc = regs.instruction_ptr as *mut std::ffi::c_void;
let stack = regs.stack_ptr as *mut std::ffi::c_void;
@ -104,6 +106,12 @@ unsafe fn frame_pointer_stack_walk(regs: Registers) -> NativeStack {
let mut current = regs.frame_ptr as *mut *mut std::ffi::c_void;
while !current.is_null() {
if (current as usize) < stackaddr as usize {
// Reached the end of the stack.
break;
}
if current as usize >= stackaddr.add(stacksize * 8) as usize {
// Reached the beginning of the stack.
// Assumining 64 bit mac(see the stacksize * 8).
break;
}
let next = *current as *mut *mut std::ffi::c_void;
@ -112,6 +120,9 @@ unsafe fn frame_pointer_stack_walk(regs: Registers) -> NativeStack {
if let Err(()) = native_stack.process_register(*pc, *stack) {
break;
}
if (next <= current) || (next as usize & 3 != 0) {
break;
}
current = next;
}
native_stack