mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-24 09:18:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Also release excess memory from pagerhist buffer when clearing

Browse Source
This commit is contained in:
Kovid Goyal
2021-11-09 10:21:47 +05:30
parent 57583d6b00
commit 4e736e83a3
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kitty/history.c
View File

@@ -63,13 +63,16 @@ attrptr(HistoryBuf *self, index_type y) {
seg_ptr(line_attrs, 1); seg_ptr(line_attrs, 1);
} }
static size_t
initial_pagerhist_ringbuf_sz(size_t pagerhist_sz) { return MIN(1024u * 1024u, pagerhist_sz); }
static PagerHistoryBuf* static PagerHistoryBuf*
alloc_pagerhist(size_t pagerhist_sz) { alloc_pagerhist(size_t pagerhist_sz) {
PagerHistoryBuf *ph; PagerHistoryBuf *ph;
if (!pagerhist_sz) return NULL; if (!pagerhist_sz) return NULL;
ph = calloc(1, sizeof(PagerHistoryBuf)); ph = calloc(1, sizeof(PagerHistoryBuf));
if (!ph) return NULL; if (!ph) return NULL;
size_t sz = MIN(1024u * 1024u, pagerhist_sz); size_t sz = initial_pagerhist_ringbuf_sz(pagerhist_sz);
ph->ringbuf = ringbuf_new(sz); ph->ringbuf = ringbuf_new(sz);
if (!ph->ringbuf) { free(ph); return NULL; } if (!ph->ringbuf) { free(ph); return NULL; }
ph->maximum_size = pagerhist_sz; ph->maximum_size = pagerhist_sz;
@@ -99,7 +102,15 @@ pagerhist_extend(PagerHistoryBuf *ph, size_t minsz) {
static void static void
pagerhist_clear(HistoryBuf *self) { pagerhist_clear(HistoryBuf *self) {
if (self->pagerhist && self->pagerhist->ringbuf) ringbuf_reset(self->pagerhist->ringbuf); if (self->pagerhist && self->pagerhist->ringbuf) {
ringbuf_reset(self->pagerhist->ringbuf);
size_t rsz = initial_pagerhist_ringbuf_sz(self->pagerhist->maximum_size);
void *rbuf = ringbuf_new(rsz);
if (rbuf) {
ringbuf_free((ringbuf_t*)&self->pagerhist->ringbuf);
self->pagerhist->ringbuf = rbuf;
}
}
} }
static HistoryBuf* static HistoryBuf*