oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use LineWrapper in a thread-local fashion

Browse Source 
This removes the critical section from a hot code path, yielding a 2x
speedup to rewrap an entire file.
This commit is contained in:
Antonio Scandurra
2021-07-30 09:50:28 -07:00
committed by Max Brunsfeld
parent 2dcf04cfb9
commit 2f1a5c48d3
2 changed files with 84 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed/src/editor/display_map/line_wrapper.rs
+68 -15
View File
@@ -1,17 +1,47 @@
use crate::Settings;
use gpui::{fonts::FontId, FontCache, FontSystem};
use parking_lot::Mutex;
use std::{collections::HashMap, sync::Arc};
use std::{
cell::RefCell,
collections::HashMap,
ops::{Deref, DerefMut},
sync::Arc,
};
thread_local! {
static WRAPPERS: RefCell<Vec<LineWrapper>> = Default::default();
}
pub struct LineWrapper {
font_system: Arc<dyn FontSystem>,
font_id: FontId,
font_size: f32,
cached_ascii_char_widths: Mutex<[f32; 128]>,
cached_other_char_widths: Mutex<HashMap<char, f32>>,
cached_ascii_char_widths: [f32; 128],
cached_other_char_widths: HashMap<char, f32>,
}
impl LineWrapper {
pub fn thread_local(
font_system: Arc<dyn FontSystem>,
font_cache: &FontCache,
settings: Settings,
) -> LineWrapperHandle {
let wrapper =
if let Some(mut wrapper) = WRAPPERS.with(|wrappers| wrappers.borrow_mut().pop()) {
let font_id = font_cache
.select_font(settings.buffer_font_family, &Default::default())
.unwrap();
let font_size = settings.buffer_font_size;
if wrapper.font_id != font_id || wrapper.font_size != font_size {
wrapper.cached_ascii_char_widths = [f32::NAN; 128];
wrapper.cached_other_char_widths.clear();
}
wrapper
} else {
LineWrapper::new(font_system, font_cache, settings)
};
LineWrapperHandle(Some(wrapper))
}
pub fn new(
font_system: Arc<dyn FontSystem>,
font_cache: &FontCache,
@@ -25,8 +55,8 @@ impl LineWrapper {
font_system,
font_id,
font_size,
cached_ascii_char_widths: Mutex::new([f32::NAN; 128]),
cached_other_char_widths: Mutex::new(HashMap::new()),
cached_ascii_char_widths: [f32::NAN; 128],
cached_other_char_widths: HashMap::new(),
}
}
@@ -37,7 +67,7 @@ impl LineWrapper {
}
pub fn wrap_line<'a>(
&'a self,
&'a mut self,
line: &'a str,
wrap_width: f32,
) -> impl Iterator<Item = usize> + 'a {
@@ -81,24 +111,24 @@ impl LineWrapper {
false
}
fn width_for_char(&self, c: char) -> f32 {
#[inline(always)]
fn width_for_char(&mut self, c: char) -> f32 {
if (c as u32) < 128 {
let mut cached_ascii_char_widths = self.cached_ascii_char_widths.lock();
let mut width = cached_ascii_char_widths[c as usize];
let mut width = self.cached_ascii_char_widths[c as usize];
if width.is_nan() {
width = self.compute_width_for_char(c);
cached_ascii_char_widths[c as usize] = width;
self.cached_ascii_char_widths[c as usize] = width;
}
width
} else {
let mut cached_other_char_widths = self.cached_other_char_widths.lock();
let mut width = cached_other_char_widths
let mut width = self
.cached_other_char_widths
.get(&c)
.copied()
.unwrap_or(f32::NAN);
if width.is_nan() {
width = self.compute_width_for_char(c);
cached_other_char_widths.insert(c, width);
self.cached_other_char_widths.insert(c, width);
}
width
}
@@ -115,6 +145,29 @@ impl LineWrapper {
}
}
pub struct LineWrapperHandle(Option<LineWrapper>);
impl Drop for LineWrapperHandle {
fn drop(&mut self) {
let wrapper = self.0.take().unwrap();
WRAPPERS.with(|wrappers| wrappers.borrow_mut().push(wrapper))
}
}
impl Deref for LineWrapperHandle {
type Target = LineWrapper;
fn deref(&self) -> &Self::Target {
self.0.as_ref().unwrap()
}
}
impl DerefMut for LineWrapperHandle {
fn deref_mut(&mut self) -> &mut Self::Target {
self.0.as_mut().unwrap()
}
}
#[cfg(test)]
mod tests {
use super::*;
@@ -130,7 +183,7 @@ mod tests {
..Settings::new(&font_cache).unwrap()
};
let wrapper = LineWrapper::new(font_system, &font_cache, settings);
let mut wrapper = LineWrapper::new(font_system, &font_cache, settings);
assert_eq!(
wrapper.wrap_line_with_shaping("aa bbb cccc ddddd eeee", 72.0),
zed/src/editor/display_map/wrap_map.rs
+16 -13
View File
@@ -12,14 +12,14 @@ use crate::{
};
use gpui::{Entity, ModelContext, Task};
use smol::future::yield_now;
use std::{collections::VecDeque, ops::Range, sync::Arc, time::Duration};
use std::{collections::VecDeque, ops::Range, time::Duration};
pub struct WrapMap {
snapshot: Snapshot,
pending_edits: VecDeque<(TabSnapshot, Vec<TabEdit>)>,
wrap_width: Option<f32>,
background_task: Option<Task<()>>,
line_wrapper: Arc<LineWrapper>,
settings: Settings,
}
impl Entity for WrapMap {
@@ -84,11 +84,7 @@ impl WrapMap {
wrap_width: None,
pending_edits: Default::default(),
snapshot: Snapshot::new(tab_snapshot),
line_wrapper: Arc::new(LineWrapper::new(
cx.platform().fonts(),
cx.font_cache(),
settings,
)),
settings,
};
this.set_wrap_width(wrap_width, cx);
this
@@ -120,8 +116,12 @@ impl WrapMap {
if let Some(wrap_width) = wrap_width {
let mut new_snapshot = self.snapshot.clone();
let line_wrapper = self.line_wrapper.clone();
let font_system = cx.platform().fonts();
let font_cache = cx.font_cache().clone();
let settings = self.settings.clone();
let task = cx.background().spawn(async move {
let mut line_wrapper =
LineWrapper::thread_local(font_system, &font_cache, settings);
let tab_snapshot = new_snapshot.tab_snapshot.clone();
let range = TabPoint::zero()..tab_snapshot.max_point();
new_snapshot
@@ -132,7 +132,7 @@ impl WrapMap {
new_lines: range.clone(),
}],
wrap_width,
line_wrapper.as_ref(),
&mut line_wrapper,
)
.await;
new_snapshot
@@ -191,12 +191,15 @@ impl WrapMap {
if self.background_task.is_none() {
let pending_edits = self.pending_edits.clone();
let mut snapshot = self.snapshot.clone();
let line_wrapper = self.line_wrapper.clone();
let font_system = cx.platform().fonts();
let font_cache = cx.font_cache().clone();
let settings = self.settings.clone();
let update_task = cx.background().spawn(async move {
let mut line_wrapper =
LineWrapper::thread_local(font_system, &font_cache, settings);
for (tab_snapshot, edits) in pending_edits {
snapshot
.update(tab_snapshot, &edits, wrap_width, &line_wrapper)
.update(tab_snapshot, &edits, wrap_width, &mut line_wrapper)
.await;
}
snapshot
@@ -317,7 +320,7 @@ impl Snapshot {
new_tab_snapshot: TabSnapshot,
edits: &[TabEdit],
wrap_width: f32,
line_wrapper: &LineWrapper,
line_wrapper: &mut LineWrapper,
) {
#[derive(Debug)]
struct RowEdit {