From 5193834cf23e3521b3afd3f5f54eb00daa23c88d Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Fri, 23 Feb 2024 11:11:15 -0700 Subject: refactor(cli): clean up test runner channels (#22422) Gets us closer to solving #20707. Rewrites the `TestEventSender`: - Allow for explicit creation of multiple streams. This will allow for one-std{out,err}-per-worker - All test events are received along with a worker ID, allowing for eventual, proper parallel threading of test events. In theory this should open up proper interleaving of test output, however that is left for a future PR. I had some plans for a better performing synchronization primitive, but the inter-thread communication is tricky. This does, however, speed up the processing of large numbers of tests 15-25% (possibly even more on 100,000+). Before ``` ok | 1000 passed | 0 failed (32ms) ok | 10000 passed | 0 failed (276ms) ``` After ``` ok | 1000 passed | 0 failed (25ms) ok | 10000 passed | 0 failed (230ms) ``` --- cli/tools/repl/mod.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'cli/tools/repl/mod.rs') diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs index e40c6362a..98519b60d 100644 --- a/cli/tools/repl/mod.rs +++ b/cli/tools/repl/mod.rs @@ -16,7 +16,6 @@ use deno_core::unsync::spawn_blocking; use deno_runtime::permissions::Permissions; use deno_runtime::permissions::PermissionsContainer; use rustyline::error::ReadlineError; -use tokio::sync::mpsc::unbounded_channel; mod channel; mod editor; @@ -32,8 +31,7 @@ pub use session::EvaluationOutput; pub use session::ReplSession; pub use session::REPL_INTERNALS_NAME; -use super::test::TestEvent; -use super::test::TestEventSender; +use super::test::create_single_test_event_channel; struct Repl { session: ReplSession, @@ -168,9 +166,8 @@ pub async fn run(flags: Flags, repl_flags: ReplFlags) -> Result { .deno_dir() .ok() .and_then(|dir| dir.repl_history_file_path()); - let (test_event_sender, test_event_receiver) = - unbounded_channel::(); - let test_event_sender = TestEventSender::new(test_event_sender); + let (worker, test_event_receiver) = create_single_test_event_channel(); + let test_event_sender = worker.sender; let mut worker = worker_factory .create_custom_worker( main_module.clone(), -- cgit v1.2.3