summaryrefslogtreecommitdiff
path: root/cli/util
diff options
context:
space:
mode:
authorNathan Whitaker <17734409+nathanwhit@users.noreply.github.com>2024-05-28 11:59:17 -0700
committerGitHub <noreply@github.com>2024-05-28 11:59:17 -0700
commit3e8f29ae4123abaddd9544a87e16448219fdd5f7 (patch)
tree767e5d66848aa675f79f4add980e5993a861f3b8 /cli/util
parent448fe67b7a2142f62332b651f9d215534dceb1f5 (diff)
perf(cli): Optimize setting up `node_modules` on macOS (#23980)
Hard linking (`linkat`) is ridiculously slow on mac. `copyfile` is better, but what's even faster is `clonefile`. It doesn't have the space savings that comes with hardlinking, but the performance difference is worth it imo. ``` ❯ hyperfine -i -p 'rm -rf node_modules/' '../../d7/target/release/deno cache npm:@11ty/eleventy' 'deno cache npm:@11ty/eleventy' Benchmark 1: ../../d7/target/release/deno cache npm:@11ty/eleventy Time (mean ± σ): 115.4 ms ± 1.2 ms [User: 27.2 ms, System: 87.3 ms] Range (min … max): 113.7 ms … 117.5 ms 10 runs Benchmark 2: deno cache npm:@11ty/eleventy Time (mean ± σ): 619.3 ms ± 6.4 ms [User: 34.3 ms, System: 575.6 ms] Range (min … max): 612.2 ms … 633.3 ms 10 runs Summary ../../d7/target/release/deno cache npm:@11ty/eleventy ran 5.37 ± 0.08 times faster than deno cache npm:@11ty/eleventy ```
Diffstat (limited to 'cli/util')
-rw-r--r--cli/util/fs.rs68
1 files changed, 68 insertions, 0 deletions
diff --git a/cli/util/fs.rs b/cli/util/fs.rs
index fdc7855e6..9bdb1d014 100644
--- a/cli/util/fs.rs
+++ b/cli/util/fs.rs
@@ -492,6 +492,74 @@ pub async fn remove_dir_all_if_exists(path: &Path) -> std::io::Result<()> {
}
}
+mod clone_dir_imp {
+
+ #[cfg(target_vendor = "apple")]
+ mod apple {
+ use super::super::copy_dir_recursive;
+ use deno_core::error::AnyError;
+ use std::os::unix::ffi::OsStrExt;
+ use std::path::Path;
+ fn clonefile(from: &Path, to: &Path) -> std::io::Result<()> {
+ let from = std::ffi::CString::new(from.as_os_str().as_bytes())?;
+ let to = std::ffi::CString::new(to.as_os_str().as_bytes())?;
+ // SAFETY: `from` and `to` are valid C strings.
+ let ret = unsafe { libc::clonefile(from.as_ptr(), to.as_ptr(), 0) };
+ if ret != 0 {
+ return Err(std::io::Error::last_os_error());
+ }
+ Ok(())
+ }
+
+ pub fn clone_dir_recursive(from: &Path, to: &Path) -> Result<(), AnyError> {
+ if let Some(parent) = to.parent() {
+ std::fs::create_dir_all(parent)?;
+ }
+ // Try to clone the whole directory
+ if let Err(err) = clonefile(from, to) {
+ if err.kind() != std::io::ErrorKind::AlreadyExists {
+ log::warn!(
+ "Failed to clone dir {:?} to {:?} via clonefile: {}",
+ from,
+ to,
+ err
+ );
+ }
+ // clonefile won't overwrite existing files, so if the dir exists
+ // we need to handle it recursively.
+ copy_dir_recursive(from, to)?;
+ }
+
+ Ok(())
+ }
+ }
+
+ #[cfg(target_vendor = "apple")]
+ pub(super) use apple::clone_dir_recursive;
+
+ #[cfg(not(target_vendor = "apple"))]
+ pub(super) fn clone_dir_recursive(
+ from: &std::path::Path,
+ to: &std::path::Path,
+ ) -> Result<(), deno_core::error::AnyError> {
+ if let Err(e) = super::hard_link_dir_recursive(from, to) {
+ log::debug!("Failed to hard link dir {:?} to {:?}: {}", from, to, e);
+ super::copy_dir_recursive(from, to)?;
+ }
+
+ Ok(())
+ }
+}
+
+/// Clones a directory to another directory. The exact method
+/// is not guaranteed - it may be a hardlink, copy, or other platform-specific
+/// operation.
+///
+/// Note: Does not handle symlinks.
+pub fn clone_dir_recursive(from: &Path, to: &Path) -> Result<(), AnyError> {
+ clone_dir_imp::clone_dir_recursive(from, to)
+}
+
/// Copies a directory to another directory.
///
/// Note: Does not handle symlinks.