diff options
| author | Divy Srivastava <dj.srivastava23@gmail.com> | 2023-03-06 08:58:04 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 08:58:04 +0530 |
| commit | 4451fa857bf4e9f021c8c63d3944774e8c9b337f (patch) | |
| tree | 55124c2049048f375700a8aea2c0301bfde2709c | |
| parent | 76b173b60c975fe7540d04aac5b7a40be67fe466 (diff) | |
perf(ext/node): improve createHash performance (#18033)
```
> deno run -A ../test.mjs
cpu: unknown
runtime: deno 1.31.1 (aarch64-apple-darwin)
benchmark time (avg) (min … max) p75 p99 p995
------------------------------------------------- -----------------------------
2.22 µs/iter (2.2 µs … 2.28 µs) 2.22 µs 2.28 µs 2.28 µs
> target/release/deno run -A test.mjs
cpu: unknown
runtime: deno 1.31.1 (aarch64-apple-darwin)
benchmark time (avg) (min … max) p75 p99 p995
------------------------------------------------- -----------------------------
864.9 ns/iter (825.05 ns … 1.22 µs) 864.93 ns 1.22 µs 1.22 µs
```
| -rw-r--r-- | Cargo.lock | 7 | ||||
| -rw-r--r-- | ext/node/Cargo.toml | 1 | ||||
| -rw-r--r-- | ext/node/crypto/mod.rs | 55 | ||||
| -rw-r--r-- | ext/node/lib.rs | 2 | ||||
| -rw-r--r-- | ext/node/polyfills/internal/crypto/hash.ts | 32 |
5 files changed, 70 insertions, 27 deletions
diff --git a/Cargo.lock b/Cargo.lock index 9c6c30f3d..8b9dd991f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1228,6 +1228,7 @@ version = "0.28.0" dependencies = [ "deno_core", "digest 0.10.6", + "hex", "idna 0.3.0", "indexmap", "md-5", @@ -2242,6 +2243,12 @@ dependencies = [ ] [[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] name = "hexf-parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml index e21c8c304..1ce6dd443 100644 --- a/ext/node/Cargo.toml +++ b/ext/node/Cargo.toml @@ -16,6 +16,7 @@ path = "lib.rs" [dependencies] deno_core.workspace = true digest = { version = "0.10.5", features = ["core-api", "std"] } +hex = "0.4.3" idna = "0.3.0" indexmap.workspace = true md-5 = "0.10.5" diff --git a/ext/node/crypto/mod.rs b/ext/node/crypto/mod.rs index 597779328..f9a61b456 100644 --- a/ext/node/crypto/mod.rs +++ b/ext/node/crypto/mod.rs @@ -17,23 +17,38 @@ use rsa::RsaPublicKey; mod digest; -#[op] -pub fn op_node_create_hash( - state: &mut OpState, - algorithm: String, -) -> Result<ResourceId, AnyError> { - Ok(state.resource_table.add(digest::Context::new(&algorithm)?)) +#[op(fast)] +pub fn op_node_create_hash(state: &mut OpState, algorithm: &str) -> u32 { + state + .resource_table + .add(match digest::Context::new(algorithm) { + Ok(context) => context, + Err(_) => return 0, + }) } -#[op] -pub fn op_node_hash_update( - state: &mut OpState, - rid: ResourceId, - data: &[u8], -) -> Result<(), AnyError> { - let context = state.resource_table.get::<digest::Context>(rid)?; +#[op(fast)] +pub fn op_node_hash_update(state: &mut OpState, rid: u32, data: &[u8]) -> bool { + let context = match state.resource_table.get::<digest::Context>(rid) { + Ok(context) => context, + _ => return false, + }; context.update(data); - Ok(()) + true +} + +#[op(fast)] +pub fn op_node_hash_update_str( + state: &mut OpState, + rid: u32, + data: &str, +) -> bool { + let context = match state.resource_table.get::<digest::Context>(rid) { + Ok(context) => context, + _ => return false, + }; + context.update(data.as_bytes()); + true } #[op] @@ -48,6 +63,18 @@ pub fn op_node_hash_digest( } #[op] +pub fn op_node_hash_digest_hex( + state: &mut OpState, + rid: ResourceId, +) -> Result<String, AnyError> { + let context = state.resource_table.take::<digest::Context>(rid)?; + let context = Rc::try_unwrap(context) + .map_err(|_| type_error("Hash context is already in use"))?; + let digest = context.digest()?; + Ok(hex::encode(digest)) +} + +#[op] pub fn op_node_hash_clone( state: &mut OpState, rid: ResourceId, diff --git a/ext/node/lib.rs b/ext/node/lib.rs index 6df408ffd..725567cc3 100644 --- a/ext/node/lib.rs +++ b/ext/node/lib.rs @@ -328,7 +328,9 @@ pub fn init_polyfill() -> Extension { .ops(vec