mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 23:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

progress: update progress only every 10 ms

Browse source 
In the Linux repo, this speeds up `jj diff` in a clean working copy
from 1.41 s to 881 ms.
This commit is contained in:
Martin von Zweigbergk 2023-05-26 09:01:22 -07:00 committed by Martin von Zweigbergk
parent 1fa88dbad0
commit 7bf1ab712a
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/progress.rs
View file

@ -173,22 +173,31 @@ pub fn snapshot_progress(ui: &mut Ui) -> Option<impl Fn(&RepoPath) + '_> {
struct State<'a> {
guard: Option<OutputGuard>,
ui: &'a mut Ui,
next_display_time: Instant,
}
if !ui.use_progress_indicator() {
return None;
}
let start = Instant::now();
let state = Mutex::new(State { guard: None, ui });
// Don't clutter the output during fast operations.
let next_display_time = Instant::now() + Duration::from_millis(250);
let state = Mutex::new(State {
guard: None,
ui,
next_display_time,
});
Some(move |path: &RepoPath| {
if start.elapsed() < Duration::from_millis(250) {
// Don't clutter the output during fast operations. Future work: Display current
// path after exactly 250ms has elapsed, to better handle large single files
let mut state = state.lock().unwrap();
let now = Instant::now();
if now < state.next_display_time {
// Future work: Display current path after exactly, say, 250ms has elapsed, to
// better handle large single files
return;
}
let mut state = state.lock().unwrap();
state.next_display_time = now + Duration::from_millis(10);
if state.guard.is_none() {
state.guard = Some(
state