diff options
| -rw-r--r-- | cli/flags.rs | 26 | ||||
| -rw-r--r-- | cli/main.rs | 8 | ||||
| -rw-r--r-- | cli/tokio_util.rs | 7 | ||||
| -rw-r--r-- | tests/037_current_thread.test | 2 | ||||
| -rwxr-xr-x | tools/http_benchmark.py | 11 |
5 files changed, 53 insertions, 1 deletions
diff --git a/cli/flags.rs b/cli/flags.rs index 978b0409f..194e254ec 100644 --- a/cli/flags.rs +++ b/cli/flags.rs @@ -43,6 +43,8 @@ pub struct DenoFlags { pub v8_flags: Option<Vec<String>>, pub xeval_replvar: Option<String>, pub xeval_delim: Option<String>, + // Use tokio::runtime::current_thread + pub current_thread: bool, } static ENV_VARIABLES_HELP: &str = "ENVIRONMENT VARIABLES: @@ -158,6 +160,12 @@ To get help on the another subcommands (run in this case): .help("Load compiler configuration file") .takes_value(true) .global(true), + ) + .arg( + Arg::with_name("current-thread") + .long("current-thread") + .global(true) + .help("Use tokio::runtime::current_thread"), ).arg( Arg::with_name("importmap") .long("importmap") @@ -443,6 +451,9 @@ pub fn parse_flags( ) -> DenoFlags { let mut flags = maybe_flags.unwrap_or_default(); + if matches.is_present("current-thread") { + flags.current_thread = true; + } if matches.is_present("log-level") { flags.log_level = match matches.value_of("log-level").unwrap() { "debug" => Some(Level::Debug), @@ -1620,4 +1631,19 @@ mod tests { assert_eq!(subcommand, DenoSubcommand::Run); assert_eq!(argv, svec!["deno", "script.ts"]) } + + #[test] + fn test_flags_from_vec_35() { + let (flags, subcommand, argv) = + flags_from_vec(svec!["deno", "--current-thread", "script.ts"]); + assert_eq!( + flags, + DenoFlags { + current_thread: true, + ..DenoFlags::default() + } + ); + assert_eq!(subcommand, DenoSubcommand::Run); + assert_eq!(argv, svec!["deno", "script.ts"]) + } } diff --git a/cli/main.rs b/cli/main.rs index 8dbd27e54..452cdfa65 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -329,6 +329,7 @@ fn run_repl(flags: DenoFlags, argv: Vec<String>) { } fn run_script(flags: DenoFlags, argv: Vec<String>) { + let use_current_thread = flags.current_thread; let (mut worker, state) = create_worker_and_state(flags, argv); let main_module = state.main_module().unwrap(); @@ -348,7 +349,12 @@ fn run_script(flags: DenoFlags, argv: Vec<String>) { }) }).map_err(print_err_and_exit) }); - tokio_util::run(main_future); + + if use_current_thread { + tokio_util::run_on_current_thread(main_future); + } else { + tokio_util::run(main_future); + } } fn main() { diff --git a/cli/tokio_util.rs b/cli/tokio_util.rs index 4c4b36d5e..7bbfeee65 100644 --- a/cli/tokio_util.rs +++ b/cli/tokio_util.rs @@ -26,6 +26,13 @@ where rt.block_on_all(future).unwrap(); } +pub fn run_on_current_thread<F>(future: F) +where + F: Future<Item = (), Error = ()> + Send + 'static, +{ + tokio::runtime::current_thread::run(future); +} + /// THIS IS A HACK AND SHOULD BE AVOIDED. /// /// This creates a new tokio runtime, with many new threads, to execute the diff --git a/tests/037_current_thread.test b/tests/037_current_thread.test new file mode 100644 index 000000000..8cc8e37a3 --- /dev/null +++ b/tests/037_current_thread.test @@ -0,0 +1,2 @@ +args: run --current-thread --reload tests/034_onload/main.ts +output: tests/034_onload.out diff --git a/tools/http_benchmark.py b/tools/http_benchmark.py index 63f3e4ce5..e3674d095 100755 --- a/tools/http_benchmark.py +++ b/tools/http_benchmark.py @@ -32,6 +32,16 @@ def deno_tcp(deno_exe): return run(deno_cmd, addr) +def deno_tcp_current_thread(deno_exe): + addr = get_addr() + deno_cmd = [ + deno_exe, "run", "--current-thread", "--allow-net", + "tools/deno_tcp.ts", addr + ] + print "http_benchmark testing DENO." + return run(deno_cmd, addr) + + def deno_http(deno_exe): addr = get_addr() deno_cmd = [ @@ -146,6 +156,7 @@ 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), |