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

Use a different frame arena for each window

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-12-18 18:58:40 +01:00
parent 5c7de103a9
commit cef9aa3590
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/gpui2/src/window.rs
View file

@ -99,12 +99,12 @@ struct FocusEvent {
slotmap::new_key_type! { pub struct FocusId; } slotmap::new_key_type! { pub struct FocusId; }
thread_local! { thread_local! {
pub static FRAME_ARENA: RefCell<Arena> = RefCell::new(Arena::new(16 * 1024 * 1024)); pub static FRAME_ARENA: RefCell<Option<Arena>> = RefCell::new(None);
} }
#[inline(always)] #[inline(always)]
pub(crate) fn frame_alloc<T>(f: impl FnOnce() -> T) -> ArenaRef<T> { pub(crate) fn frame_alloc<T>(f: impl FnOnce() -> T) -> ArenaRef<T> {
FRAME_ARENA.with_borrow_mut(|arena| arena.alloc(f)) FRAME_ARENA.with_borrow_mut(|arena| arena.as_mut().unwrap().alloc(f))
} }
impl FocusId { impl FocusId {
@ -254,6 +254,7 @@ pub struct Window {
pub(crate) element_id_stack: GlobalElementId, pub(crate) element_id_stack: GlobalElementId,
pub(crate) rendered_frame: Frame, pub(crate) rendered_frame: Frame,
pub(crate) next_frame: Frame, pub(crate) next_frame: Frame,
frame_arena: Option<Arena>,
pub(crate) focus_handles: Arc<RwLock<SlotMap<FocusId, AtomicUsize>>>, pub(crate) focus_handles: Arc<RwLock<SlotMap<FocusId, AtomicUsize>>>,
focus_listeners: SubscriberSet<(), AnyWindowFocusListener>, focus_listeners: SubscriberSet<(), AnyWindowFocusListener>,
blur_listeners: SubscriberSet<(), AnyObserver>, blur_listeners: SubscriberSet<(), AnyObserver>,
@ -397,6 +398,7 @@ impl Window {
element_id_stack: GlobalElementId::default(), element_id_stack: GlobalElementId::default(),
rendered_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())), rendered_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
next_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())), next_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
frame_arena: Some(Arena::new(16 * 1024 * 1024)),
focus_handles: Arc::new(RwLock::new(SlotMap::with_key())), focus_handles: Arc::new(RwLock::new(SlotMap::with_key())),
focus_listeners: SubscriberSet::new(), focus_listeners: SubscriberSet::new(),
blur_listeners: SubscriberSet::new(), blur_listeners: SubscriberSet::new(),
@ -1278,7 +1280,9 @@ impl<'a> WindowContext<'a> {
self.window.platform_window.clear_input_handler(); self.window.platform_window.clear_input_handler();
self.window.layout_engine.as_mut().unwrap().clear(); self.window.layout_engine.as_mut().unwrap().clear();
self.window.next_frame.clear(); self.window.next_frame.clear();
FRAME_ARENA.with_borrow_mut(|arena| arena.clear()); let mut frame_arena = self.window.frame_arena.take().unwrap();
frame_arena.clear();
FRAME_ARENA.replace(Some(frame_arena));
let root_view = self.window.root_view.take().unwrap(); let root_view = self.window.root_view.take().unwrap();
self.with_z_index(0, |cx| { self.with_z_index(0, |cx| {
@ -1364,6 +1368,7 @@ impl<'a> WindowContext<'a> {
} }
self.window.drawing = false; self.window.drawing = false;
self.window.frame_arena = Some(FRAME_ARENA.take().unwrap());
scene scene
} }