KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pager history buffer: alloc buffer progressively

Browse Source 
Realloc buffer 1MB at a time until the configured size is reached
This commit is contained in:
Dominique Martinet 2018-09-17 11:01:24 +09:00
parent c421d3bb59
commit f76c8ad30b
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/data-types.h
View File

@ -174,7 +174,7 @@ typedef struct {
} HistoryBufSegment; } HistoryBufSegment;
typedef struct { typedef struct {
index_type bufsize; index_type bufsize, maxsz;
Py_UCS4 *buffer; Py_UCS4 *buffer;
index_type start, end; index_type start, end;
index_type bufend; index_type bufend;

19
kitty/history.c
View File

@ -60,12 +60,23 @@ alloc_pagerhist(unsigned int pagerhist_sz) {
if (!pagerhist_sz) return NULL; if (!pagerhist_sz) return NULL;
pagerhist_sz *= 1024*1024; pagerhist_sz *= 1024*1024;
ph = PyMem_Calloc(1, sizeof(PagerHistoryBuf)); ph = PyMem_Calloc(1, sizeof(PagerHistoryBuf));
ph->bufsize = pagerhist_sz / sizeof(Py_UCS4); ph->maxsz = pagerhist_sz / sizeof(Py_UCS4);
ph->buffer = PyMem_RawMalloc(pagerhist_sz); ph->bufsize = 1024*1024 / sizeof(Py_UCS4);
ph->buffer = PyMem_RawMalloc(1024*1024);
if (!ph->buffer) { PyMem_Free(ph); return NULL; } if (!ph->buffer) { PyMem_Free(ph); return NULL; }
return ph; return ph;
} }
static inline bool
pagerhist_extend(PagerHistoryBuf *ph) {
if (ph->bufsize >= ph->maxsz) return false;
void *newbuf = PyMem_Realloc(ph->buffer, ph->bufsize * sizeof(Py_UCS4) + 1024*1024);
if (!newbuf) return false;
ph->buffer = newbuf;
ph->bufsize += 1024*1024 / sizeof(Py_UCS4);
return true;
}
static PyObject * static PyObject *
new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) { new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) {
HistoryBuf *self; HistoryBuf *self;
@ -156,7 +167,9 @@ pagerhist_push(HistoryBuf *self) {
if (ph->start != ph->end && !l.continued) { if (ph->start != ph->end && !l.continued) {
ph->buffer[ph->end++] = '\n'; ph->buffer[ph->end++] = '\n';
} }
if (ph->bufsize - ph->end < 1024) { ph->bufend = ph->end; ph->end = 0; } if (ph->bufsize - ph->end < 1024 && !pagerhist_extend(ph)) {
ph->bufend = ph->end; ph->end = 0;
}
ph->end += line_as_ansi(&l, ph->buffer + ph->end, 1023); ph->end += line_as_ansi(&l, ph->buffer + ph->end, 1023);
ph->buffer[ph->end++] = '\r'; ph->buffer[ph->end++] = '\r';
if (ph->bufend) { if (ph->bufend) {