Mercurial > public > mercurial-scm > hg-stable

comparison rust/hg-core/src/utils/files.rs @ 43271:99394e6c5d12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-dirstate-status: add first Rust implementation of `dirstate.status` Note: This patch also added the rayon crate as a Cargo dependency. It will help us immensely in making Rust code parallel and easy to maintain. It is a stable, well-known, and supported crate maintained by people on the Rust team. The current `dirstate.status` method has grown over the years through bug reports and new features to the point where it got too big and too complex. This series does not yet improve the logic, but adds a Rust fast-path to speed up certain cases. Tested on mozilla-try-2019-02-18 with zstd compression: - `hg diff` on an empty working copy: - c: 1.64(+-)0.04s - rust+c before this change: 2.84(+-)0.1s - rust+c: 849(+-)40ms - `hg commit` when creating a file: - c: 5.960s - rust+c before this change: 5.828s - rust+c: 4.668s - `hg commit` when updating a file: - c: 4.866s - rust+c before this change: 4.371s - rust+c: 3.855s - `hg status -mard` - c: 1.82(+-)0.04s - rust+c before this change: 2.64(+-)0.1s - rust+c: 896(+-)30ms The numbers are clear: the current Rust `dirstatemap` implementation is super slow, its performance needs to be addressed. This will be done in a future series, immediately after this one, with the goal of getting Rust to be at least to the speed of the Python + C implementation in all cases before the 5.2 freeze. At worse, we gate dirstatemap to only be used in those cases. Cases where the fast-path is not executed: - for commands that need ignore support (`status`, for example) - if subrepos are found (should not be hard to add, but winter is coming) - any other matcher than an `alwaysmatcher`, like patterns, etc. - with extensions like `sparse` and `fsmonitor` The next step after this is to rethink the logic to be closer to Jane Street's Valentin Gatien-Baron's Rust fast-path which does a lot less work when possible. Differential Revision: https://phab.mercurial-scm.org/D7058
author Rapha?l Gom?s <rgomes@octobus.net>
date Fri, 11 Oct 2019 13:39:57 +0200
parents 98d996a138de
children b06cf2809ec3 0b7733719d21
comparison
equal deleted inserted replaced
43270:6a8c166a93a6 43271:99394e6c5d12
10 //! Functions for fiddling with files. 10 //! Functions for fiddling with files.
11 11
12 use crate::utils::hg_path::{HgPath, HgPathBuf}; 12 use crate::utils::hg_path::{HgPath, HgPathBuf};
13 use std::iter::FusedIterator; 13 use std::iter::FusedIterator;
14 14
15 use std::fs::Metadata;
15 use std::path::Path; 16 use std::path::Path;
16 17
17 pub fn get_path_from_bytes(bytes: &[u8]) -> &Path { 18 pub fn get_path_from_bytes(bytes: &[u8]) -> &Path {
18 let os_str; 19 let os_str;
19 #[cfg(unix)] 20 #[cfg(unix)]
74 return path.to_ascii_uppercase(); 75 return path.to_ascii_uppercase();
75 #[cfg(unix)] 76 #[cfg(unix)]
76 path.to_ascii_lowercase() 77 path.to_ascii_lowercase()
77 } 78 }
78 79
80 #[derive(Eq, PartialEq, Ord, PartialOrd, Copy, Clone)]
81 pub struct HgMetadata {
82 pub st_dev: u64,
83 pub st_mode: u32,
84 pub st_nlink: u64,
85 pub st_size: u64,
86 pub st_mtime: i64,
87 pub st_ctime: i64,
88 }
89
90 // TODO support other plaforms
91 #[cfg(unix)]
92 impl HgMetadata {
93 pub fn from_metadata(metadata: Metadata) -> Self {
94 use std::os::unix::fs::MetadataExt;
95 Self {
96 st_dev: metadata.dev(),
97 st_mode: metadata.mode(),
98 st_nlink: metadata.nlink(),
99 st_size: metadata.size(),
100 st_mtime: metadata.mtime(),
101 st_ctime: metadata.ctime(),
102 }
103 }
104 }
105
79 #[cfg(test)] 106 #[cfg(test)]
80 mod tests { 107 mod tests {
81 use super::*; 108 use super::*;
82 109
83 #[test] 110 #[test]