Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf(compile): improve FileBackedVfsFile #27299

Merged
merged 2 commits into from
Dec 10, 2024
Merged

perf(compile): improve FileBackedVfsFile #27299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3456cd8
perf(compile): improve FileBackedVfsFile
dsherret Dec 9, 2024
43ac0ca
update
dsherret Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions cli/standalone/virtual_fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.

use std::borrow::Cow;
use std::cell::RefCell;
use std::collections::HashMap;
use std::collections::HashSet;
use std::fs::File;
Expand Down Expand Up @@ -637,18 +638,17 @@ impl VfsRoot {
}
}

#[derive(Clone)]
struct FileBackedVfsFile {
file: VirtualFile,
pos: Arc<Mutex<u64>>,
pos: RefCell<u64>,
vfs: Arc<FileBackedVfs>,
}

impl FileBackedVfsFile {
fn seek(&self, pos: SeekFrom) -> FsResult<u64> {
match pos {
SeekFrom::Start(pos) => {
*self.pos.lock() = pos;
*self.pos.borrow_mut() = pos;
Ok(pos)
}
SeekFrom::End(offset) => {
Expand All @@ -659,7 +659,7 @@ impl FileBackedVfsFile {
.into(),
)
} else {
let mut current_pos = self.pos.lock();
let mut current_pos = self.pos.borrow_mut();
*current_pos = if offset >= 0 {
self.file.offset.len - (offset as u64)
} else {
Expand All @@ -669,7 +669,7 @@ impl FileBackedVfsFile {
}
}
SeekFrom::Current(offset) => {
let mut current_pos = self.pos.lock();
let mut current_pos = self.pos.borrow_mut();
if offset >= 0 {
*current_pos += offset as u64;
} else if -offset as u64 > *current_pos {
Expand All @@ -684,7 +684,7 @@ impl FileBackedVfsFile {

fn read_to_buf(&self, buf: &mut [u8]) -> FsResult<usize> {
let read_pos = {
let mut pos = self.pos.lock();
let mut pos = self.pos.borrow_mut();
let read_pos = *pos;
// advance the position due to the read
*pos = std::cmp::min(self.file.offset.len, *pos + buf.len() as u64);
Expand All @@ -698,7 +698,7 @@ impl FileBackedVfsFile {

fn read_to_end(&self) -> FsResult<Cow<'static, [u8]>> {
let read_pos = {
let mut pos = self.pos.lock();
let mut pos = self.pos.borrow_mut();
let read_pos = *pos;
// todo(dsherret): should this always set it to the end of the file?
if *pos < self.file.offset.len {
Expand Down Expand Up @@ -734,12 +734,9 @@ impl deno_io::fs::File for FileBackedVfsFile {
self: Rc<Self>,
mut buf: BufMutView,
) -> FsResult<(usize, BufMutView)> {
let inner = (*self).clone();
tokio::task::spawn(async move {
let nread = inner.read_to_buf(&mut buf)?;
Ok((nread, buf))
})
.await?
// this is fast, no need to spawn a task
let nread = self.read_to_buf(&mut buf)?;
Ok((nread, buf))
}

fn write_sync(self: Rc<Self>, _buf: &[u8]) -> FsResult<usize> {
Expand All @@ -763,8 +760,8 @@ impl deno_io::fs::File for FileBackedVfsFile {
self.read_to_end()
}
async fn read_all_async(self: Rc<Self>) -> FsResult<Cow<'static, [u8]>> {
let inner = (*self).clone();
tokio::task::spawn_blocking(move || inner.read_to_end()).await?
// this is fast, no need to spawn a task
self.read_to_end()
}

fn chmod_sync(self: Rc<Self>, _pathmode: u32) -> FsResult<()> {
Expand Down
Loading