diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2020-01-30 10:49:33 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-30 10:49:33 -0500 |
commit | 2338e7679c8840314642dbf3ea838908f5f35d3c (patch) | |
tree | fd8a56d12bc84167e306fb7fdf71a32ab86362ad | |
parent | 51089836eb835d6b4cc03653dcb0b7a281017157 (diff) |
Remove --current-thread flag (#3830)
This flag was added to evaluate performance relative to tokio's threaded
runtime. Although it's faster in the HTTP benchmark, it's clear the runtime
is not the only perf problem.
Removing this flag will simplify further refactors, in particular
adopting the #[tokio::main] macro. This will be done in a follow up.
Ultimately we expect to move to the current thread runtime with Isolates
pinned to specific threads, but that will be a much larger refactor. The
--current-thread just complicates that effort.
-rw-r--r-- | cli/flags.rs | 25 | ||||
-rw-r--r-- | cli/lib.rs | 7 | ||||
-rw-r--r-- | cli/tests/integration_tests.rs | 5 | ||||
-rw-r--r-- | cli/tokio_util.rs | 13 | ||||
-rw-r--r-- | std/manual.md | 3 | ||||
-rwxr-xr-x | tools/http_benchmark.py | 12 |
6 files changed, 1 insertions, 64 deletions
diff --git a/cli/flags.rs b/cli/flags.rs index eaf9b7fc5..d7a95d79e 100644 --- a/cli/flags.rs +++ b/cli/flags.rs @@ -85,8 +85,6 @@ pub struct DenoFlags { pub cached_only: bool, pub seed: Option<u64>, pub v8_flags: Option<Vec<String>>, - // Use tokio::runtime::current_thread - pub current_thread: bool, pub bundle_output: Option<String>, @@ -438,10 +436,6 @@ fn run_test_args_parse(flags: &mut DenoFlags, matches: &clap::ArgMatches) { flags.cached_only = true; } - if matches.is_present("current-thread") { - flags.current_thread = true; - } - if matches.is_present("seed") { let seed_string = matches.value_of("seed").unwrap(); let seed = seed_string.parse::<u64>().unwrap(); @@ -755,11 +749,6 @@ fn run_test_args<'a, 'b>(app: App<'a, 'b>) -> App<'a, 'b> { .help("Require that remote dependencies are already cached"), ) .arg( - Arg::with_name("current-thread") - .long("current-thread") - .help("Use tokio::runtime::current_thread"), - ) - .arg( Arg::with_name("seed") .long("seed") .value_name("NUMBER") @@ -1874,20 +1863,6 @@ mod tests { } #[test] - fn current_thread() { - let r = flags_from_vec_safe(svec!["deno", "--current-thread", "script.ts"]); - assert_eq!( - r.unwrap(), - DenoFlags { - subcommand: DenoSubcommand::Run, - argv: svec!["deno", "script.ts"], - current_thread: true, - ..DenoFlags::default() - } - ); - } - - #[test] fn allow_net_whitelist_with_ports() { let r = flags_from_vec_safe(svec diff --git a/tools/http_benchmark.py b/tools/http_benchmark.py index 03f9f4365..d46d8a33d 100755 --- a/tools/http_benchmark.py +++ b/tools/http_benchmark.py @@ -42,17 +42,6 @@ def deno_tcp(deno_exe): return run(deno_cmd, port) -def deno_tcp_current_thread(deno_exe): - port = get_port() - deno_cmd = [ - deno_exe, "run", "--current-thread", "--allow-net", - "tools/deno_tcp.ts", - server_addr(port) - ] - print "http_benchmark testing DENO tcp (single-thread)." - return run(deno_cmd, port) - - def deno_http(deno_exe): port = get_port() deno_cmd = [ @@ -154,7 +143,6 @@ def http_benchmark(build_dir): return { # "deno_tcp" was once called "deno" "deno_tcp": deno_tcp(deno_exe), - "deno_tcp_current_thread": deno_tcp_current_thread(deno_exe), # "deno_http" was once called "deno_net_http" "deno_http": deno_http(deno_exe), "deno_proxy": deno_http_proxy(deno_exe, hyper_hello_exe), |