bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

For backtrace, use StaticMutex instead of a raw sys Mutex.

Browse source
This commit is contained in:
Mara Bos 2020-10-07 13:54:16 +02:00
parent 5ded394553
commit 54a71e8954
2 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/std/src/backtrace.rs
View file

@ -303,7 +303,8 @@ impl Backtrace {
// Capture a backtrace which start just before the function addressed by
// `ip`
fn create(ip: usize) -> Backtrace {
let _lock = lock();
// SAFETY: We don't attempt to lock this reentrantly.
let _lock = unsafe { lock() };
let mut frames = Vec::new();
let mut actual_start = None;
unsafe {
@ -408,7 +409,8 @@ impl Capture {
// Use the global backtrace lock to synchronize this as it's a
// requirement of the `backtrace` crate, and then actually resolve
// everything.
let _lock = lock();
// SAFETY: We don't attempt to lock this reentrantly.
let _lock = unsafe { lock() };
for frame in self.frames.iter_mut() {
let symbols = &mut frame.symbols;
let frame = match &frame.frame {