diff --git a/cli/bench/stdio/README.md b/cli/bench/stdio/README.md new file mode 100644 index 0000000000..b2d4875ac7 --- /dev/null +++ b/cli/bench/stdio/README.md @@ -0,0 +1,9 @@ +## `stdio` benchmarks + +Compile the C baseline and run the benchmark: + +```bash +cc stdio.c -o stdio -O3 +time dd if=/dev/zero bs=65536 count=500000 | ./stdio +time dd if=/dev/zero bs=65536 count=500000 | deno run stdio.js +``` diff --git a/cli/bench/stdio/stdio.c b/cli/bench/stdio/stdio.c new file mode 100644 index 0000000000..8125a0d00f --- /dev/null +++ b/cli/bench/stdio/stdio.c @@ -0,0 +1,29 @@ +// From https://github.com/just-js/benchmarks/tree/main/01-stdio +// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. + +#include +#include +#include +#include +#include + +int main(int argc, char *argv[]) { + unsigned int blocksize = 65536; + if (argc == 2) { + blocksize = atoi(argv[1]); + } + char buf[blocksize]; + unsigned long size = 0; + unsigned int reads = 0; + int n = read(STDIN_FILENO, buf, blocksize); + while (n > 0) { + reads++; + size += n; + n = read(STDIN_FILENO, buf, blocksize); + } + if (n < 0) { + fprintf(stderr, "read: %s (%i)\n", strerror(errno), errno); + exit(1); + } + fprintf(stdout, "size %lu reads %u blocksize %u\n", size, reads, blocksize); +} \ No newline at end of file diff --git a/cli/bench/stdio/stdio.js b/cli/bench/stdio/stdio.js new file mode 100644 index 0000000000..0663d6fd7d --- /dev/null +++ b/cli/bench/stdio/stdio.js @@ -0,0 +1,16 @@ +// From https://github.com/just-js/benchmarks/tree/main/01-stdio +// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. + +const blocksize = parseInt(Deno.args[0] || 65536); +const buf = new Uint8Array(blocksize); +let size = 0; +let reads = 0; + +let n = Deno.stdin.readSync(buf); +while (n > 0) { + reads++; + size += n; + n = Deno.stdin.readSync(buf); +} +if (n < 0) throw new Error("Bad Read"); +console.log(`size ${size} reads ${reads} blocksize ${blocksize}`); diff --git a/runtime/ops/io.rs b/runtime/ops/io.rs index fd5b8a9622..186052afe6 100644 --- a/runtime/ops/io.rs +++ b/runtime/ops/io.rs @@ -16,7 +16,6 @@ use deno_core::OpState; use deno_core::RcRef; use deno_core::Resource; use deno_core::ResourceId; -use deno_core::ZeroCopyBuf; use once_cell::sync::Lazy; use std::borrow::Cow; use std::cell::RefCell; @@ -683,32 +682,32 @@ pub fn op_print( }) } -#[op] +#[op(fast)] fn op_read_sync( state: &mut OpState, - rid: ResourceId, - mut buf: ZeroCopyBuf, + rid: u32, + buf: &mut [u8], ) -> Result { StdFileResource::with_resource(state, rid, move |resource| { resource.with_inner_and_metadata(|inner, _| { inner - .read(&mut buf) + .read(buf) .map(|n: usize| n as u32) .map_err(AnyError::from) }) }) } -#[op] +#[op(fast)] fn op_write_sync( state: &mut OpState, - rid: ResourceId, - buf: ZeroCopyBuf, + rid: u32, + buf: &mut [u8], ) -> Result { StdFileResource::with_resource(state, rid, move |resource| { resource.with_inner_and_metadata(|inner, _| { inner - .write_and_maybe_flush(&buf) + .write_and_maybe_flush(buf) .map(|nwritten: usize| nwritten as u32) .map_err(AnyError::from) })