mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-07 11:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Share a single pool of LineWrappers across all threads

Browse source 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
Nathan Sobo 2021-08-24 18:16:13 -06:00
parent 3ac489a8b6
commit 0187ac8fde
2 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
zed/src/editor/display_map/line_wrapper.rs
View file

@ -1,15 +1,16 @@
use crate::Settings;
use gpui::{fonts::FontId, FontCache, FontSystem};
use lazy_static::lazy_static;
use parking_lot::Mutex;
use std::{
cell::RefCell,
collections::HashMap,
iter,
ops::{Deref, DerefMut},
sync::Arc,
};
thread_local! {
static WRAPPERS: RefCell<Vec<LineWrapper>> = Default::default();
lazy_static! {
static ref POOL: Mutex<Vec<LineWrapper>> = Default::default();
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
@ -35,25 +36,24 @@ pub struct LineWrapper {
impl LineWrapper {
pub const MAX_INDENT: u32 = 256;
pub fn thread_local(
pub fn acquire(
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)
};
let wrapper = if let Some(mut wrapper) = POOL.lock().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))
}
@ -163,6 +163,7 @@ impl LineWrapper {
}
fn compute_width_for_char(&self, c: char) -> f32 {
log::info!("cache miss {}", c);
self.font_system
.layout_line(
&c.to_string(),
@ -178,7 +179,7 @@ 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))
POOL.lock().push(wrapper)
}
}

6
zed/src/editor/display_map/wrap_map.rs
View file

@ -119,8 +119,7 @@ impl WrapMap {
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 mut line_wrapper = LineWrapper::acquire(font_system, &font_cache, settings);
let tab_snapshot = new_snapshot.tab_snapshot.clone();
let range = TabPoint::zero()..tab_snapshot.max_point();
new_snapshot
@ -194,8 +193,7 @@ impl WrapMap {
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);
let mut line_wrapper = LineWrapper::acquire(font_system, &font_cache, settings);
for (tab_snapshot, edits) in pending_edits {
snapshot
.update(tab_snapshot, &edits, wrap_width, &mut line_wrapper)