mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Entry API in set_dtors_running.

Browse Source
This commit is contained in:
Vytautas Astrauskas 2020-04-29 15:12:09 -07:00
parent 46b03174d0
commit 0e052ab897
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/shims/tls.rs
View File

@ -1,7 +1,8 @@
//! Implement thread-local storage.
use std::collections::BTreeMap;
use std::collections::btree_map::Entry;
use std::collections::btree_map::Entry as BTreeEntry;
use std::collections::hash_map::Entry as HashMapEntry;
use log::trace;
@ -186,7 +187,7 @@ fn fetch_tls_dtor(
thread_local.range_mut((start, Unbounded))
{
match data.entry(thread_id) {
Entry::Occupied(entry) => {
BTreeEntry::Occupied(entry) => {
if let Some(dtor) = dtor {
// Set TLS data to NULL, and call dtor with old value.
let data_scalar = entry.remove();
@ -194,7 +195,7 @@ fn fetch_tls_dtor(
return ret;
}
}
Entry::Vacant(_) => {}
BTreeEntry::Vacant(_) => {}
}
}
None
@ -204,16 +205,14 @@ fn fetch_tls_dtor(
/// the existing values stored in `dtors_running` for this thread. Returns
/// `true` if dtors for `thread` are already running.
fn set_dtors_running_for_thread(&mut self, thread: ThreadId) -> bool {
if self.dtors_running.contains_key(&thread) {
true
} else {
// We need to guard this `insert` with a check because otherwise we
// would risk to overwrite `last_dtor_key` with `None`.
self.dtors_running.insert(
thread,
RunningDtorsState { last_dtor_key: None }
);
false
match self.dtors_running.entry(thread) {
HashMapEntry::Occupied(_) => true,
HashMapEntry::Vacant(entry) => {
// We cannot just do `self.dtors_running.insert` because that
// would overwrite `last_dtor_key` with `None`.
entry.insert(RunningDtorsState { last_dtor_key: None });
false
}
}
}