From 08bb8b3d53eb2445de9b5e2845ab8acf9d353800 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Sat, 10 Oct 2020 05:41:11 -0400
Subject: Fix 100% CPU idling problem by reverting #7672 (#7911)

* Revert "refactor: Worker is not a Future (#7895)"

This reverts commit f4357f0ff9d39411f22504fcc20db6bd5dec6ddb.

* Revert "refactor(core): JsRuntime is not a Future (#7855)"

This reverts commit d8879feb8c832dbb38649551b1cb0730874f7be6.

* Revert "fix(core): module execution with top level await (#7672)"

This reverts commit c7c767782538243ded64742dca9b34d6af74d62d.
---
 cli/main.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'cli/main.rs')

diff --git a/cli/main.rs b/cli/main.rs
index b6b92d7ba..fa755b783 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -275,7 +275,7 @@ async fn eval_command(
   debug!("main_module {}", &main_module);
   worker.execute_module(&main_module).await?;
   worker.execute("window.dispatchEvent(new Event('load'))")?;
-  worker.run_event_loop().await?;
+  (&mut *worker).await?;
   worker.execute("window.dispatchEvent(new Event('unload'))")?;
   Ok(())
 }
@@ -423,7 +423,7 @@ async fn run_repl(flags: Flags) -> Result<(), AnyError> {
     ModuleSpecifier::resolve_url_or_path("./$deno$repl.ts").unwrap();
   let global_state = GlobalState::new(flags)?;
   let mut worker = MainWorker::new(&global_state, main_module.clone());
-  worker.run_event_loop().await?;
+  (&mut *worker).await?;
 
   repl::run(&global_state, worker).await
 }
@@ -454,7 +454,7 @@ async fn run_from_stdin(flags: Flags) -> Result<(), AnyError> {
   debug!("main_module {}", main_module);
   worker.execute_module(&main_module).await?;
   worker.execute("window.dispatchEvent(new Event('load'))")?;
-  worker.run_event_loop().await?;
+  (&mut *worker).await?;
   worker.execute("window.dispatchEvent(new Event('unload'))")?;
   Ok(())
 }
@@ -500,7 +500,7 @@ async fn run_with_watch(flags: Flags, script: String) -> Result<(), AnyError> {
       debug!("main_module {}", main_module);
       worker.execute_module(&main_module).await?;
       worker.execute("window.dispatchEvent(new Event('load'))")?;
-      worker.run_event_loop().await?;
+      (&mut *worker).await?;
       worker.execute("window.dispatchEvent(new Event('unload'))")?;
       Ok(())
     }
@@ -525,7 +525,7 @@ async fn run_command(flags: Flags, script: String) -> Result<(), AnyError> {
   debug!("main_module {}", main_module);
   worker.execute_module(&main_module).await?;
   worker.execute("window.dispatchEvent(new Event('load'))")?;
-  worker.run_event_loop().await?;
+  (&mut *worker).await?;
   worker.execute("window.dispatchEvent(new Event('unload'))")?;
   Ok(())
 }
@@ -578,8 +578,12 @@ async fn test_command(
     .save_source_file_in_cache(&main_module, source_file);
 
   let mut maybe_coverage_collector = if flags.coverage {
-    let session = worker.create_inspector_session();
-    let mut coverage_collector = CoverageCollector::new(session);
+    let inspector = worker
+      .inspector
+      .as_mut()
+      .expect("Inspector is not created.");
+
+    let mut coverage_collector = CoverageCollector::new(&mut **inspector);
     coverage_collector.start_collecting().await?;
 
     Some(coverage_collector)
@@ -590,9 +594,9 @@ async fn test_command(
   let execute_result = worker.execute_module(&main_module).await;
   execute_result?;
   worker.execute("window.dispatchEvent(new Event('load'))")?;
-  worker.run_event_loop().await?;
+  (&mut *worker).await?;
   worker.execute("window.dispatchEvent(new Event('unload'))")?;
-  worker.run_event_loop().await?;
+  (&mut *worker).await?;
 
   if let Some(coverage_collector) = maybe_coverage_collector.as_mut() {
     let coverages = coverage_collector.collect().await?;
-- 
cgit v1.2.3