From 8b8b21b553fba03124934363e77e636adaeb4745 Mon Sep 17 00:00:00 2001 From: Aaron O'Mullan Date: Wed, 27 Apr 2022 07:03:44 -0700 Subject: perf(runtime): read entire files in single ops (#14261) Co-authored-by: Divy Srivastava --- runtime/ops/fs.rs | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'runtime/ops') diff --git a/runtime/ops/fs.rs b/runtime/ops/fs.rs index ddd7f9ca2..501c2ac5f 100644 --- a/runtime/ops/fs.rs +++ b/runtime/ops/fs.rs @@ -95,6 +95,10 @@ pub fn init() -> Extension { op_futime_async::decl(), op_utime_sync::decl(), op_utime_async::decl(), + op_readfile_sync::decl(), + op_readfile_text_sync::decl(), + op_readfile_async::decl(), + op_readfile_text_async::decl(), ]) .build() } @@ -2008,3 +2012,79 @@ fn op_cwd(state: &mut OpState) -> Result { let path_str = into_string(path.into_os_string())?; Ok(path_str) } + +#[op] +fn op_readfile_sync( + state: &mut OpState, + path: String, +) -> Result { + let permissions = state.borrow_mut::(); + let path = Path::new(&path); + permissions.read.check(path)?; + Ok(std::fs::read(path)?.into()) +} + +#[op] +fn op_readfile_text_sync( + state: &mut OpState, + path: String, +) -> Result { + let permissions = state.borrow_mut::(); + let path = Path::new(&path); + permissions.read.check(path)?; + Ok(std::fs::read_to_string(path)?) +} + +#[op] +async fn op_readfile_async( + state: Rc>, + path: String, + cancel_rid: Option, +) -> Result { + { + let path = Path::new(&path); + let mut state = state.borrow_mut(); + state.borrow_mut::().read.check(path)?; + } + let fut = tokio::task::spawn_blocking(move || { + let path = Path::new(&path); + Ok(std::fs::read(path).map(ZeroCopyBuf::from)?) + }); + if let Some(cancel_rid) = cancel_rid { + let cancel_handle = state + .borrow_mut() + .resource_table + .get::(cancel_rid); + if let Ok(cancel_handle) = cancel_handle { + return fut.or_cancel(cancel_handle).await??; + } + } + fut.await? +} + +#[op] +async fn op_readfile_text_async( + state: Rc>, + path: String, + cancel_rid: Option, +) -> Result { + { + let path = Path::new(&path); + let mut state = state.borrow_mut(); + state.borrow_mut::().read.check(path)?; + } + let fut = tokio::task::spawn_blocking(move || { + let path = Path::new(&path); + Ok(String::from_utf8(std::fs::read(path)?)?) + }); + if let Some(cancel_rid) = cancel_rid { + let cancel_handle = state + .borrow_mut() + .resource_table + .get::(cancel_rid); + if let Ok(cancel_handle) = cancel_handle { + return fut.or_cancel(cancel_handle).await??; + } + } + fut.await? +} -- cgit v1.2.3