naskya/napi-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(napi): ThreadsafeFunctionHandle never being dropped (#1530)

Browse source
This commit is contained in:
LongYinan 2023-03-20 18:01:09 +08:00 committed by GitHub
parent c8bd8924e2
commit 5605bdf7fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/napi/src/threadsafe_function.rs
View file

@ -117,9 +117,7 @@ impl ThreadsafeFunctionHandle {
} }
fn get_raw(&self) -> sys::napi_threadsafe_function { fn get_raw(&self) -> sys::napi_threadsafe_function {
let raw = self.raw.load(Ordering::SeqCst); self.raw.load(Ordering::SeqCst)
assert!(!raw.is_null());
raw
} }
fn set_raw(&self, raw: sys::napi_threadsafe_function) { fn set_raw(&self, raw: sys::napi_threadsafe_function) {
@ -133,7 +131,7 @@ impl Drop for ThreadsafeFunctionHandle {
.aborted .aborted
.read() .read()
.expect("Threadsafe Function aborted lock failed"); .expect("Threadsafe Function aborted lock failed");
if !*aborted_guard && self.referred.load(Ordering::Acquire) { if !*aborted_guard {
let release_status = unsafe { let release_status = unsafe {
sys::napi_release_threadsafe_function( sys::napi_release_threadsafe_function(
self.get_raw(), self.get_raw(),
@ -358,9 +356,9 @@ impl<T: 'static, ES: ErrorStrategy::T> ThreadsafeFunction<T, ES> {
.aborted .aborted
.read() .read()
.expect("Threadsafe Function aborted lock failed"); .expect("Threadsafe Function aborted lock failed");
if !*aborted_guard && !self.handle.referred.load(Ordering::Acquire) { if !*aborted_guard && !self.handle.referred.load(Ordering::Relaxed) {
check_status!(unsafe { sys::napi_ref_threadsafe_function(env.0, self.handle.get_raw()) })?; check_status!(unsafe { sys::napi_ref_threadsafe_function(env.0, self.handle.get_raw()) })?;
self.handle.referred.store(true, Ordering::Release); self.handle.referred.store(true, Ordering::Relaxed);
} }
Ok(()) Ok(())
} }
@ -373,9 +371,9 @@ impl<T: 'static, ES: ErrorStrategy::T> ThreadsafeFunction<T, ES> {
.aborted .aborted
.read() .read()
.expect("Threadsafe Function aborted lock failed"); .expect("Threadsafe Function aborted lock failed");
if !*aborted_guard && self.handle.referred.load(Ordering::Acquire) { if !*aborted_guard && self.handle.referred.load(Ordering::Relaxed) {
check_status!(unsafe { sys::napi_unref_threadsafe_function(env.0, self.handle.get_raw()) })?; check_status!(unsafe { sys::napi_unref_threadsafe_function(env.0, self.handle.get_raw()) })?;
self.handle.referred.store(false, Ordering::Release); self.handle.referred.store(false, Ordering::Relaxed);
} }
Ok(()) Ok(())
} }