Deno/rusty_v8
1
0
Fork 0
mirror of https://github.com/denoland/rusty_v8.git synced 2024-11-22 04:40:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clarify the purpose of the mutex in struct IsolateAnnex (#363)

Browse Source
This commit is contained in:
Bert Belder 2020-04-23 19:18:06 +02:00
parent 3aa1c961dc
commit ce54d39929
No known key found for this signature in database
GPG Key ID: 7A77887B2E2ED461
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/isolate.rs
View File

@ -389,17 +389,24 @@ impl Isolate {
} }
pub(crate) struct IsolateAnnex { pub(crate) struct IsolateAnnex {
isolate: *mut Isolate,
mutex: Mutex<()>,
slots: HashMap<TypeId, RefCell<Box<dyn Any>>>, slots: HashMap<TypeId, RefCell<Box<dyn Any>>>,
// The `isolate` and `isolate_mutex` fields are there so an `IsolateHandle`
// (which may outlive the isolate itself) can determine whether the isolate is
// still alive, and if so, get a reference to it. Safety rules:
// - The 'main thread' must lock the mutex and reset `isolate` to null just
// before the isolate is disposed.
// - Any other thread must lock the mutex while it's reading/using the
// `isolate` pointer.
isolate: *mut Isolate,
isolate_mutex: Mutex<()>,
} }
impl IsolateAnnex { impl IsolateAnnex {
fn new(isolate: &mut Isolate) -> Self { fn new(isolate: &mut Isolate) -> Self {
Self { Self {
isolate,
mutex: Mutex::new(()),
slots: HashMap::new(), slots: HashMap::new(),
isolate,
isolate_mutex: Mutex::new(()),
} }
} }
} }
@ -425,7 +432,7 @@ impl IsolateHandle {
fn dispose_isolate(isolate: &mut Isolate) { fn dispose_isolate(isolate: &mut Isolate) {
let annex = isolate.get_annex_mut(); let annex = isolate.get_annex_mut();
{ {
let _lock = annex.mutex.lock().unwrap(); let _lock = annex.isolate_mutex.lock().unwrap();
annex.isolate = null_mut(); annex.isolate = null_mut();
} }
unsafe { Arc::from_raw(annex) }; unsafe { Arc::from_raw(annex) };
@ -440,7 +447,7 @@ impl IsolateHandle {
/// ///
/// Returns false if Isolate was already destroyed. /// Returns false if Isolate was already destroyed.
pub fn terminate_execution(&self) -> bool { pub fn terminate_execution(&self) -> bool {
let _lock = self.0.mutex.lock().unwrap(); let _lock = self.0.isolate_mutex.lock().unwrap();
if self.0.isolate.is_null() { if self.0.isolate.is_null() {
false false
} else { } else {
@ -464,7 +471,7 @@ impl IsolateHandle {
/// ///
/// Returns false if Isolate was already destroyed. /// Returns false if Isolate was already destroyed.
pub fn cancel_terminate_execution(&self) -> bool { pub fn cancel_terminate_execution(&self) -> bool {
let _lock = self.0.mutex.lock().unwrap(); let _lock = self.0.isolate_mutex.lock().unwrap();
if self.0.isolate.is_null() { if self.0.isolate.is_null() {
false false
} else { } else {
@ -482,7 +489,7 @@ impl IsolateHandle {
/// ///
/// Returns false if Isolate was already destroyed. /// Returns false if Isolate was already destroyed.
pub fn is_execution_terminating(&self) -> bool { pub fn is_execution_terminating(&self) -> bool {
let _lock = self.0.mutex.lock().unwrap(); let _lock = self.0.isolate_mutex.lock().unwrap();
if self.0.isolate.is_null() { if self.0.isolate.is_null() {
false false
} else { } else {
@ -506,7 +513,7 @@ impl IsolateHandle {
callback: InterruptCallback, callback: InterruptCallback,
data: *mut c_void, data: *mut c_void,
) -> bool { ) -> bool {
let _lock = self.0.mutex.lock().unwrap(); let _lock = self.0.isolate_mutex.lock().unwrap();
if self.0.isolate.is_null() { if self.0.isolate.is_null() {
false false
} else { } else {