fix(cli): synchronize async stdio/file reads and writes

cli/tests/integration/run_tests.rs

@@ -6,8 +6,14 @@ use test_util as util;
 use test_util::TempDir;
 
 itest!(stdout_write_all {
-  args: "run --quiet stdout_write_all.ts",
-  output: "stdout_write_all.out",
+  args: "run --quiet run/stdout_write_all.ts",
+  output: "run/stdout_write_all.out",
+});
+
+itest!(stdin_read_all {
+  args: "run --quiet run/stdin_read_all.ts",
+  output: "run/stdin_read_all.out",
+  input: Some("01234567890123456789012345678901234567890123456789"),
 });
 
 itest!(_001_hello {

cli/tests/testdata/run/stdin_read_all.out

@@ -0,0 +1 @@
+01234567890123456789012345678901234567890123456789

cli/tests/testdata/run/stdin_read_all.ts

@@ -0,0 +1,17 @@
+const encoder = new TextEncoder();
+
+const pending = [];
+
+// do this a bunch of times to ensure it doesn't race
+// and everything happens in order
+for (let i = 0; i < 50; i++) {
+  const buf = new Uint8Array(1);
+  pending.push(
+    Deno.stdin.read(buf).then(() => {
+      return Deno.stdout.write(buf);
+    }),
+  );
+}
+
+await Promise.all(pending);
+await Deno.stdout.write(encoder.encode("\n"));

cli/tests/testdata/run/stdout_write_all.out

@@ -0,0 +1,100 @@
+Hello, world! 0
+Hello, world! 1
+Hello, world! 2
+Hello, world! 3
+Hello, world! 4
+Hello, world! 5
+Hello, world! 6
+Hello, world! 7
+Hello, world! 8
+Hello, world! 9
+Hello, world! 10
+Hello, world! 11
+Hello, world! 12
+Hello, world! 13
+Hello, world! 14
+Hello, world! 15
+Hello, world! 16
+Hello, world! 17
+Hello, world! 18
+Hello, world! 19
+Hello, world! 20
+Hello, world! 21
+Hello, world! 22
+Hello, world! 23
+Hello, world! 24
+Hello, world! 25
+Hello, world! 26
+Hello, world! 27
+Hello, world! 28
+Hello, world! 29
+Hello, world! 30
+Hello, world! 31
+Hello, world! 32
+Hello, world! 33
+Hello, world! 34
+Hello, world! 35
+Hello, world! 36
+Hello, world! 37
+Hello, world! 38
+Hello, world! 39
+Hello, world! 40
+Hello, world! 41
+Hello, world! 42
+Hello, world! 43
+Hello, world! 44
+Hello, world! 45
+Hello, world! 46
+Hello, world! 47
+Hello, world! 48
+Hello, world! 49
+Hello, world! 50
+Hello, world! 51
+Hello, world! 52
+Hello, world! 53
+Hello, world! 54
+Hello, world! 55
+Hello, world! 56
+Hello, world! 57
+Hello, world! 58
+Hello, world! 59
+Hello, world! 60
+Hello, world! 61
+Hello, world! 62
+Hello, world! 63
+Hello, world! 64
+Hello, world! 65
+Hello, world! 66
+Hello, world! 67
+Hello, world! 68
+Hello, world! 69
+Hello, world! 70
+Hello, world! 71
+Hello, world! 72
+Hello, world! 73
+Hello, world! 74
+Hello, world! 75
+Hello, world! 76
+Hello, world! 77
+Hello, world! 78
+Hello, world! 79
+Hello, world! 80
+Hello, world! 81
+Hello, world! 82
+Hello, world! 83
+Hello, world! 84
+Hello, world! 85
+Hello, world! 86
+Hello, world! 87
+Hello, world! 88
+Hello, world! 89
+Hello, world! 90
+Hello, world! 91
+Hello, world! 92
+Hello, world! 93
+Hello, world! 94
+Hello, world! 95
+Hello, world! 96
+Hello, world! 97
+Hello, world! 98
+Hello, world! 99

cli/tests/testdata/run/stdout_write_all.ts

@@ -0,0 +1,13 @@
+const encoder = new TextEncoder();
+
+const pending = [];
+
+// do this a bunch of times to ensure it doesn't race
+// and everything happens in order
+for (let i = 0; i < 100; i++) {
+  pending.push(Deno.stdout.write(encoder.encode("Hello, ")));
+  pending.push(Deno.stdout.write(encoder.encode(`world! ${i}`)));
+  pending.push(Deno.stdout.write(encoder.encode("\n")));
+}
+
+await Promise.all(pending);

runtime/ops/fs.rs

@@ -322,10 +322,9 @@ fn seek_helper(args: SeekArgs) -> Result<(u32, SeekFrom), AnyError> {
 #[op]
 fn op_seek_sync(state: &mut OpState, args: SeekArgs) -> Result<u64, AnyError> {
   let (rid, seek_from) = seek_helper(args)?;
-  let pos = StdFileResource::with_file(state, rid, |std_file| {
+  StdFileResource::with_file(state, rid, |std_file| {
     std_file.seek(seek_from).map_err(AnyError::from)
-  })?;
-  Ok(pos)
+  })
 }
 
 #[op]
@@ -335,19 +334,10 @@ async fn op_seek_async(
 ) -> Result<u64, AnyError> {
   let (rid, seek_from) = seek_helper(args)?;
 
-  let resource = state
-    .borrow_mut()
-    .resource_table
-    .get::<StdFileResource>(rid)?;
-
-  let std_file = resource.std_file();
-
-  tokio::task::spawn_blocking(move || {
-    let mut std_file = std_file.lock();
-    std_file.seek(seek_from)
+  StdFileResource::with_file_blocking_task(state, rid, move |std_file| {
+    std_file.seek(seek_from).map_err(AnyError::from)
   })
-  .await?
-  .map_err(AnyError::from)
+  .await
 }
 
 #[op]
@@ -357,56 +347,36 @@ fn op_fdatasync_sync(
 ) -> Result<(), AnyError> {
   StdFileResource::with_file(state, rid, |std_file| {
     std_file.sync_data().map_err(AnyError::from)
-  })?;
-  Ok(())
+  })
 }
 
 #[op]
 async fn op_fdatasync_async(
   state: Rc<RefCell<OpState>>,
   rid: ResourceId,
 ) -> Result<(), AnyError> {
-  let resource = state
-    .borrow_mut()
-    .resource_table
-    .get::<StdFileResource>(rid)?;
-
-  let std_file = resource.std_file();
-
-  tokio::task::spawn_blocking(move || {
-    let std_file = std_file.lock();
-    std_file.sync_data()
+  StdFileResource::with_file_blocking_task(state, rid, move |std_file| {
+    std_file.sync_data().map_err(AnyError::from)
   })
-  .await?
-  .map_err(AnyError::from)
+  .await
 }
 
 #[op]
 fn op_fsync_sync(state: &mut OpState, rid: ResourceId) -> Result<(), AnyError> {
   StdFileResource::with_file(state, rid, |std_file| {
     std_file.sync_all().map_err(AnyError::from)
-  })?;
-  Ok(())
+  })
 }
 
 #[op]
 async fn op_fsync_async(
   state: Rc<RefCell<OpState>>,
   rid: ResourceId,
 ) -> Result<(), AnyError> {
-  let resource = state
-    .borrow_mut()
-    .resource_table
-    .get::<StdFileResource>(rid)?;
-
-  let std_file = resource.std_file();
-
-  tokio::task::spawn_blocking(move || {
-    let std_file = std_file.lock();
-    std_file.sync_all()
+  StdFileResource::with_file_blocking_task(state, rid, move |std_file| {
+    std_file.sync_all().map_err(AnyError::from)
   })
-  .await?
-  .map_err(AnyError::from)
+  .await
 }
 
 #[op]
@@ -425,19 +395,11 @@ async fn op_fstat_async(
   state: Rc<RefCell<OpState>>,
   rid: ResourceId,
 ) -> Result<FsStat, AnyError> {
-  let resource = state
-    .borrow_mut()
-    .resource_table
-    .get::<StdFileResource>(rid)?;
-
-  let std_file = resource.std_file();
-
-  let metadata = tokio::task::spawn_blocking(move || {
-    let std_file = std_file.lock();
-    std_file.metadata()
-  })
-  .await?
-  .map_err(AnyError::from)?;
+  let metadata =
+    StdFileResource::with_file_blocking_task(state, rid, move |std_file| {
+      std_file.metadata().map_err(AnyError::from)
+    })
+    .await?;
   Ok(get_stat(metadata))
 }
 
@@ -469,23 +431,15 @@ async fn op_flock_async(
   use fs3::FileExt;
   super::check_unstable2(&state, "Deno.flock");
 
-  let resource = state
-    .borrow_mut()
-    .resource_table
-    .get::<StdFileResource>(rid)?;
-
-  let std_file = resource.std_file();
-
-  tokio::task::spawn_blocking(move || -> Result<(), AnyError> {
-    let std_file = std_file.lock();
+  StdFileResource::with_file_blocking_task(state, rid, move |std_file| {
     if exclusive {
       std_file.lock_exclusive()?;
     } else {
       std_file.lock_shared()?;
     }
     Ok(())
   })
-  .await?
+  .await
 }
 
 #[op]
@@ -510,19 +464,11 @@ async fn op_funlock_async(
   use fs3::FileExt;
   super::check_unstable2(&state, "Deno.funlock");
 
-  let resource = state
-    .borrow_mut()
-    .resource_table
-    .get::<StdFileResource>(rid)?;
-
-  let std_file = resource.std_file();
-
-  tokio::task::spawn_blocking(move || -> Result<(), AnyError> {
-    let std_file = std_file.lock();
+  StdFileResource::with_file_blocking_task(state, rid, move |std_file| {
     std_file.unlock()?;
     Ok(())
   })
-  .await?
+  .await
 }
 
 #[op]
@@ -1592,19 +1538,11 @@ async fn op_ftruncate_async(
   let rid = args.rid;
   let len = args.len as u64;
 
-  let resource = state
-    .borrow_mut()
-    .resource_table
-    .get::<StdFileResource>(rid)?;
-
-  let std_file = resource.std_file();
-
-  tokio::task::spawn_blocking(move || {
-    let std_file = std_file.lock();
-    std_file.set_len(len)
+  StdFileResource::with_file_blocking_task(state, rid, move |std_file| {
+    std_file.set_len(len)?;
+    Ok(())
   })
-  .await?
-  .map_err(AnyError::from)
+  .await
 }
 
 #[derive(Deserialize)]
@@ -1884,19 +1822,11 @@ async fn op_futime_async(
   let atime = filetime::FileTime::from_unix_time(args.atime.0, args.atime.1);
   let mtime = filetime::FileTime::from_unix_time(args.mtime.0, args.mtime.1);
 
-  let resource = state
-    .borrow_mut()
-    .resource_table
-    .get::<StdFileResource>(rid)?;
-
-  let std_file = resource.std_file();
-  tokio::task::spawn_blocking(move || {
-    let std_file = std_file.lock();
-    filetime::set_file_handle_times(&std_file, Some(atime), Some(mtime))?;
+  StdFileResource::with_file_blocking_task(state, rid, move |std_file| {
+    filetime::set_file_handle_times(std_file, Some(atime), Some(mtime))?;
     Ok(())
   })
   .await
-  .unwrap()
 }
 
 #[derive(Deserialize)]