foster/denoland-rusty-v8
0
0
Fork 0
mirror of https://github.com/denoland/rusty_v8.git synced 2024-11-21 15:04:33 -05:00
Code Issues Activity

Explicitly drop slots when disposing an isolate (#364)

Browse source
This commit is contained in:
Bert Belder 2020-04-23 19:48:07 +02:00
parent ce54d39929
commit cc626550b1
No known key found for this signature in database
GPG key ID: 7A77887B2E2ED461
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/isolate.rs
View file

@ -352,7 +352,22 @@ impl Isolate {
/// Disposes the isolate. The isolate must not be entered by any
/// thread to be disposable.
unsafe fn dispose(&mut self) {
IsolateHandle::dispose_isolate(self);
let annex = self.get_annex_mut();
// Set the `isolate` pointer inside the annex struct to null, so any
// IsolateHandle that outlives the isolate will know that it can't call
// methods on the isolate.
{
let _lock = annex.isolate_mutex.lock().unwrap();
annex.isolate = null_mut();
}
// Clear slots.
annex.slots.clear();
// Subtract one from the Arc<IsolateAnnex> reference count.
Arc::from_raw(annex);
self.set_data(0, null_mut());
// No test case in rusty_v8 show this, but there have been situations in
// deno where dropping Annex before the states causes a segfault.
@ -429,16 +444,6 @@ impl IsolateHandle {
Self(isolate.get_annex_arc())
}
fn dispose_isolate(isolate: &mut Isolate) {
let annex = isolate.get_annex_mut();
{
let _lock = annex.isolate_mutex.lock().unwrap();
annex.isolate = null_mut();
}
unsafe { Arc::from_raw(annex) };
unsafe { isolate.set_data(0, null_mut()) };
}
/// Forcefully terminate the current thread of JavaScript execution
/// in the given isolate.
///

4
tests/slots.rs
View file

@ -128,6 +128,9 @@ impl DerefMut for EsIsolate {
fn slots_layer1() {
let drop_count = Rc::new(AtomicUsize::new(0));
let mut core_isolate = CoreIsolate::new(drop_count.clone());
// The existence of a IsolateHandle that outlives the isolate should not
// inhibit dropping of slot contents.
let isolate_handle = core_isolate.thread_safe_handle();
assert!(core_isolate.execute("1 + 1"));
assert!(!core_isolate.execute("throw 'foo'"));
assert_eq!(0, core_isolate.get_i());
@ -138,6 +141,7 @@ fn slots_layer1() {
core_isolate.run_microtasks();
drop(core_isolate);
assert_eq!(drop_count.load(Ordering::SeqCst), 1);
drop(isolate_handle);
}
#[test]