pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(grid): memory leak with unfocused tabs (#2745)

Browse source 
* use hashset instead of vec for changed lines

avoid output buffer growring indefinitely if tab does not get rendered

* tidy up

- improve hashset -> vec conversion
- remove now unnecessary dedup

* use copied instead of cloned on iter
This commit is contained in:
Thomas Linford 2023-08-30 10:46:06 +02:00 • committed by GitHub
parent 1988206792
commit 15737d7d10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
zellij-server/src/output/mod.rs
View file

@ -829,14 +829,14 @@ impl CharacterChunk {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct OutputBuffer { pub struct OutputBuffer {
pub changed_lines: Vec<usize>, // line index pub changed_lines: HashSet<usize>, // line index
pub should_update_all_lines: bool, pub should_update_all_lines: bool,
} }
impl Default for OutputBuffer { impl Default for OutputBuffer {
fn default() -> Self { fn default() -> Self {
OutputBuffer { OutputBuffer {
changed_lines: vec![], changed_lines: HashSet::new(),
should_update_all_lines: true, // first time we should do a full render should_update_all_lines: true, // first time we should do a full render
} }
} }
@ -845,14 +845,14 @@ impl Default for OutputBuffer {
impl OutputBuffer { impl OutputBuffer {
pub fn update_line(&mut self, line_index: usize) { pub fn update_line(&mut self, line_index: usize) {
if !self.should_update_all_lines { if !self.should_update_all_lines {
self.changed_lines.push(line_index); self.changed_lines.insert(line_index);
} }
} }
pub fn update_lines(&mut self, start: usize, end: usize) { pub fn update_lines(&mut self, start: usize, end: usize) {
if !self.should_update_all_lines { if !self.should_update_all_lines {
for idx in start..=end { for idx in start..=end {
if !self.changed_lines.contains(&idx) { if !self.changed_lines.contains(&idx) {
self.changed_lines.push(idx); self.changed_lines.insert(idx);
} }
} }
} }
@ -885,9 +885,8 @@ impl OutputBuffer {
} }
changed_chunks changed_chunks
} else { } else {
let mut line_changes = self.changed_lines.to_vec(); let mut line_changes: Vec<_> = self.changed_lines.iter().copied().collect();
line_changes.sort_unstable(); line_changes.sort_unstable();
line_changes.dedup();
let mut changed_chunks = Vec::new(); let mut changed_chunks = Vec::new();
for line_index in line_changes { for line_index in line_changes {
let terminal_characters = let terminal_characters =