foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00
Code Issues Packages 1 Wiki Activity

chore(ext/node): cleanup zlib state ops (#24300)

Browse source
This commit is contained in:
Divy Srivastava 2024-06-21 13:11:52 +05:30 committed by GitHub
parent 496428b82e
commit 5683ca4070
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
ext/node/ops/zlib/mod.rs
View file

@ -2,8 +2,6 @@
use deno_core::error::type_error; use deno_core::error::type_error;
use deno_core::error::AnyError; use deno_core::error::AnyError;
use deno_core::op2; use deno_core::op2;
use std::borrow::Cow;
use std::cell::RefCell;
use zlib::*; use zlib::*;
mod alloc; mod alloc;
@ -230,17 +228,17 @@ impl ZlibInner {
} }
struct Zlib { struct Zlib {
inner: RefCell<Option<ZlibInner>>, inner: Option<ZlibInner>,
}
impl Zlib {
fn as_mut(&mut self) -> Option<&mut ZlibInner> {
self.inner.as_mut()
}
} }
impl deno_core::GcResource for Zlib {} impl deno_core::GcResource for Zlib {}
impl deno_core::Resource for Zlib {
fn name(&self) -> Cow<str> {
"zlib".into()
}
}
#[op2] #[op2]
#[cppgc] #[cppgc]
pub fn op_zlib_new(#[smi] mode: i32) -> Result<Zlib, AnyError> { pub fn op_zlib_new(#[smi] mode: i32) -> Result<Zlib, AnyError> {
@ -251,15 +249,12 @@ pub fn op_zlib_new(#[smi] mode: i32) -> Result<Zlib, AnyError> {
..Default::default() ..Default::default()
}; };
Ok(Zlib { Ok(Zlib { inner: Some(inner) })
inner: RefCell::new(Some(inner)),
})
} }
#[op2(fast)] #[op2(fast)]
pub fn op_zlib_close(#[cppgc] resource: &Zlib) -> Result<(), AnyError> { pub fn op_zlib_close(#[cppgc] zlib: &mut Zlib) -> Result<(), AnyError> {
let mut resource = resource.inner.borrow_mut(); let zlib = zlib
let zlib = resource
.as_mut() .as_mut()
.ok_or_else(|| type_error("zlib not initialized"))?; .ok_or_else(|| type_error("zlib not initialized"))?;
@ -273,7 +268,7 @@ pub fn op_zlib_close(#[cppgc] resource: &Zlib) -> Result<(), AnyError> {
#[op2(fast)] #[op2(fast)]
#[smi] #[smi]
pub fn op_zlib_write( pub fn op_zlib_write(
#[cppgc] resource: &Zlib, #[cppgc] zlib: &mut Zlib,
#[smi] flush: i32, #[smi] flush: i32,
#[buffer] input: &[u8], #[buffer] input: &[u8],
#[smi] in_off: u32, #[smi] in_off: u32,
@ -283,7 +278,6 @@ pub fn op_zlib_write(
#[smi] out_len: u32, #[smi] out_len: u32,
#[buffer] result: &mut [u32], #[buffer] result: &mut [u32],
) -> Result<i32, AnyError> { ) -> Result<i32, AnyError> {
let mut zlib = resource.inner.borrow_mut();
let zlib = zlib let zlib = zlib
.as_mut() .as_mut()
.ok_or_else(|| type_error("zlib not initialized"))?; .ok_or_else(|| type_error("zlib not initialized"))?;
@ -301,14 +295,13 @@ pub fn op_zlib_write(
#[op2(fast)] #[op2(fast)]
#[smi] #[smi]
pub fn op_zlib_init( pub fn op_zlib_init(
#[cppgc] resource: &Zlib, #[cppgc] zlib: &mut Zlib,
#[smi] level: i32, #[smi] level: i32,
#[smi] window_bits: i32, #[smi] window_bits: i32,
#[smi] mem_level: i32, #[smi] mem_level: i32,
#[smi] strategy: i32, #[smi] strategy: i32,
#[buffer] dictionary: &[u8], #[buffer] dictionary: &[u8],
) -> Result<i32, AnyError> { ) -> Result<i32, AnyError> {
let mut zlib = resource.inner.borrow_mut();
let zlib = zlib let zlib = zlib
.as_mut() .as_mut()
.ok_or_else(|| type_error("zlib not initialized"))?; .ok_or_else(|| type_error("zlib not initialized"))?;
@ -348,8 +341,7 @@ pub fn op_zlib_init(
#[op2(fast)] #[op2(fast)]
#[smi] #[smi]
pub fn op_zlib_reset(#[cppgc] resource: &Zlib) -> Result<i32, AnyError> { pub fn op_zlib_reset(#[cppgc] zlib: &mut Zlib) -> Result<i32, AnyError> {
let mut zlib = resource.inner.borrow_mut();
let zlib = zlib let zlib = zlib
.as_mut() .as_mut()
.ok_or_else(|| type_error("zlib not initialized"))?; .ok_or_else(|| type_error("zlib not initialized"))?;
@ -361,10 +353,9 @@ pub fn op_zlib_reset(#[cppgc] resource: &Zlib) -> Result<i32, AnyError> {
#[op2(fast)] #[op2(fast)]
pub fn op_zlib_close_if_pending( pub fn op_zlib_close_if_pending(
#[cppgc] resource: &Zlib, #[cppgc] zlib: &mut Zlib,
) -> Result<(), AnyError> { ) -> Result<(), AnyError> {
let pending_close = { let pending_close = {
let mut zlib = resource.inner.borrow_mut();
let zlib = zlib let zlib = zlib
.as_mut() .as_mut()
.ok_or_else(|| type_error("zlib not initialized"))?; .ok_or_else(|| type_error("zlib not initialized"))?;
@ -373,7 +364,7 @@ pub fn op_zlib_close_if_pending(
zlib.pending_close zlib.pending_close
}; };
if pending_close { if pending_close {
if let Some(mut res) = resource.inner.borrow_mut().take() { if let Some(mut res) = zlib.inner.take() {
let _ = res.close(); let _ = res.close();
} }
} }