Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
@liuchengxu
liuchengxu committed Apr 21, 2024
1 parent a13cd83 commit e1ca781
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 73 deletions.
14 changes: 4 additions & 10 deletions crates/maple_core/src/searcher/grep/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pub use self::stoppable_searcher::search;
use self::stoppable_searcher::{FileResult, StoppableSearchImpl, UPDATE_INTERVAL};
use matcher::Matcher;
use std::path::PathBuf;
use std::sync::atomic::{AtomicBool, AtomicUsize};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
use std::time::Instant;
use tokio::sync::mpsc::unbounded_channel;
Expand All @@ -23,9 +23,7 @@ pub async fn cli_search(paths: Vec<PathBuf>, matcher: Matcher) -> SearchResult {

let stop_signal = Arc::new(AtomicBool::new(false));

let search_info = SearchInfo {
total_processed: Arc::new(AtomicUsize::new(0)),
};
let search_info = SearchInfo::new();

{
let search_info = search_info.clone();
Expand All @@ -45,9 +43,7 @@ pub async fn cli_search(paths: Vec<PathBuf>, matcher: Matcher) -> SearchResult {
while let Some(file_result) = receiver.recv().await {
matches.push(file_result);
total_matched += 1;
let total_processed = search_info
.total_processed
.load(std::sync::atomic::Ordering::Relaxed);
let total_processed = search_info.total_processed.load(Ordering::Relaxed);

if total_matched % 16 == 0 || total_processed % 16 == 0 {
let now = Instant::now();
Expand All @@ -58,9 +54,7 @@ pub async fn cli_search(paths: Vec<PathBuf>, matcher: Matcher) -> SearchResult {
}
}

let total_processed = search_info
.total_processed
.load(std::sync::atomic::Ordering::SeqCst) as u64;
let total_processed = search_info.total_processed.load(Ordering::SeqCst) as u64;

SearchResult {
matches,
Expand Down
94 changes: 51 additions & 43 deletions crates/maple_core/src/searcher/grep/stoppable_searcher.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use icon::Icon;
use ignore::{DirEntry, WalkState};
use matcher::Matcher;
use std::path::PathBuf;
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
use std::time::{Duration, Instant};
use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
Expand Down Expand Up @@ -137,8 +137,13 @@ impl StoppableSearchImpl {
});

if let Some(file_result) = maybe_file_result {
// Discontinue if the sender has been dropped.
return Ok(sender.send(file_result).is_ok());
search_info.total_matched.fetch_add(1, Ordering::Relaxed);

// Only send the item when its rank is higher than the lowest rank.
if file_result.rank > *search_info.lowest_rank.read() {
// Discontinue if the sender has been dropped.
return Ok(sender.send(file_result).is_ok());
}
}

Ok(true)
Expand Down Expand Up @@ -182,6 +187,12 @@ impl BestFileResults {
fn sort(&mut self) {
self.results.sort_unstable_by(|a, b| b.rank.cmp(&a.rank));
}

#[inline]
fn replace_last(&mut self, new: FileResult) {
let index = self.results.len() - 1;
self.results[index] = new;
}
}

pub async fn search(query: String, matcher: Matcher, search_context: SearchContext) {
Expand All @@ -202,9 +213,7 @@ pub async fn search(query: String, matcher: Matcher, search_context: SearchConte

let (sender, mut receiver) = unbounded_channel();

let search_info = SearchInfo {
total_processed: Arc::new(AtomicUsize::new(0)),
};
let search_info = SearchInfo::new();

std::thread::Builder::new()
.name("grep-worker".into())
Expand Down Expand Up @@ -287,50 +296,48 @@ pub async fn search(query: String, matcher: Matcher, search_context: SearchConte
best_results.past = now;
}
} else {
let last = best_results
.results
.last_mut()
.expect("Max capacity is non-zero; qed");

let new = file_result;
if new.rank > last.rank {
*last = new;
best_results.sort();
}
best_results.replace_last(file_result);
best_results.sort();

let total_matched = search_info.total_matched.load(Ordering::Relaxed);
let total_processed = search_info.total_processed.load(Ordering::Relaxed);

if total_matched % 16 == 0 || total_processed % 16 == 0 {
let now = Instant::now();
if now > best_results.past + UPDATE_INTERVAL {
let display_lines = to_display_lines(&best_results.results, icon);

let visible_highlights = display_lines
.indices
.iter()
.map(|line_highlights| {
line_highlights
.iter()
.copied()
.filter(|&x| x <= line_width)
.collect::<Vec<_>>()
})
.collect::<Vec<_>>();

if best_results.last_lines != display_lines.lines.as_slice()
|| best_results.last_visible_highlights != visible_highlights
{
progressor.update_all(&display_lines, total_matched, total_processed);
best_results.last_lines = display_lines.lines;
best_results.last_visible_highlights = visible_highlights;
} else {
progressor.quick_update(total_matched, total_processed)
}
let now = Instant::now();
if now > best_results.past + UPDATE_INTERVAL {
let display_lines = to_display_lines(&best_results.results, icon);

best_results.past = now;
let visible_highlights = display_lines
.indices
.iter()
.map(|line_highlights| {
line_highlights
.iter()
.copied()
.filter(|&x| x <= line_width)
.collect::<Vec<_>>()
})
.collect::<Vec<_>>();

if best_results.last_lines != display_lines.lines.as_slice()
|| best_results.last_visible_highlights != visible_highlights
{
progressor.update_all(&display_lines, total_matched, total_processed);
best_results.last_lines = display_lines.lines;
best_results.last_visible_highlights = visible_highlights;
} else {
progressor.quick_update(total_matched, total_processed)
}

best_results.past = now;
}
}

// best_results list is sorted now.
*search_info.lowest_rank.write() = best_results
.results
.last()
.expect("results must not be empty; qed")
.rank;
}

if stop_signal.load(Ordering::SeqCst) {
Expand All @@ -341,6 +348,7 @@ pub async fn search(query: String, matcher: Matcher, search_context: SearchConte

let display_lines = to_display_lines(&best_results.results, icon);

let total_matched = search_info.total_matched.load(Ordering::SeqCst);
let total_processed = search_info.total_processed.load(Ordering::SeqCst);
progressor.on_finished(display_lines, total_matched, total_processed);

Expand Down
14 changes: 14 additions & 0 deletions crates/maple_core/src/searcher/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,32 @@ pub mod tagfiles;
use crate::stdio_server::Vim;
use icon::Icon;
use ignore::{WalkBuilder, WalkParallel};
use parking_lot::RwLock;
use paths::AbsPathBuf;
use serde::{Deserialize, Serialize};
use std::path::PathBuf;
use std::sync::atomic::{AtomicBool, AtomicUsize};
use std::sync::Arc;
use types::Rank;

// Shareable searching info.
#[derive(Clone, Debug)]
pub struct SearchInfo {
pub lowest_rank: Arc<RwLock<Rank>>,
pub total_matched: Arc<AtomicUsize>,
pub total_processed: Arc<AtomicUsize>,
}

impl SearchInfo {
pub fn new() -> Self {
Self {
lowest_rank: Arc::new(RwLock::new(Rank::default())),
total_matched: Arc::new(AtomicUsize::new(0)),
total_processed: Arc::new(AtomicUsize::new(0)),
}
}

Check failure on line 32 in crates/maple_core/src/searcher/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

you should consider adding a `Default` implementation for `SearchInfo` 

error: you should consider adding a `Default` implementation for `SearchInfo`
  --> crates/maple_core/src/searcher/mod.rs:26:5
   |
26 | /     pub fn new() -> Self {
27 | |         Self {
28 | |             lowest_rank: Arc::new(RwLock::new(Rank::default())),
29 | |             total_matched: Arc::new(AtomicUsize::new(0)),
30 | |             total_processed: Arc::new(AtomicUsize::new(0)),
31 | |         }
32 | |     }
   | |_____^
   |
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#new_without_default
   = note: `-D clippy::new-without-default` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(clippy::new_without_default)]`
help: try adding this
   |
25 + impl Default for SearchInfo {
26 +     fn default() -> Self {
27 +         Self::new()
28 +     }
29 + }
   |
}

#[derive(Debug, Clone)]
pub struct SearchContext {
pub icon: Icon,
Expand Down
20 changes: 0 additions & 20 deletions crates/types/src/matcher.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,6 @@ impl From<[Score; 4]> for Rank {
}
}

impl Rank {
/// Packs four i32 values into a single u64.
pub fn as_u64(&self) -> u64 {
let a = self.0[0] as u64 & 0xFFFF_FFFF;
let b = self.0[1] as u64 & 0xFFFF_FFFF;
let c = self.0[2] as u64 & 0xFFFF_FFFF;
let d = self.0[3] as u64 & 0xFFFF_FFFF;
(a << 48) | (b << 32) | (c << 16) | d
}

/// Unpacks a u64 into four i32 values.
pub fn from_u64(value: u64) -> Self {
let a = (value >> 48) as i32;
let b = ((value >> 32) & 0xFFFF_FFFF) as i32;
let c = ((value >> 16) & 0xFFFF_FFFF) as i32;
let d = (value & 0xFFFF_FFFF) as i32;
Self([a, b, c, d])
}
}

#[derive(Debug, Clone)]
pub struct RankCalculator {
criteria: Vec<RankCriterion>,
Expand Down

0 comments on commit e1ca781

Please sign in to comment.