bufsize was bigger than the actual allocated memory
Fixes: b9e6557f729f ("Allow arbitrary sized lines in the secondary scrollback buffer")
471 lines
16 KiB
C
471 lines
16 KiB
C
/*
|
|
* history.c
|
|
* Copyright (C) 2016 Kovid Goyal <kovid at kovidgoyal.net>
|
|
*
|
|
* Distributed under terms of the GPL3 license.
|
|
*/
|
|
|
|
#include "data-types.h"
|
|
#include "lineops.h"
|
|
#include <structmember.h>
|
|
|
|
extern PyTypeObject Line_Type;
|
|
#define SEGMENT_SIZE 2048
|
|
|
|
static inline void
|
|
add_segment(HistoryBuf *self) {
|
|
self->num_segments += 1;
|
|
self->segments = PyMem_Realloc(self->segments, sizeof(HistoryBufSegment) * self->num_segments);
|
|
if (self->segments == NULL) fatal("Out of memory allocating new history buffer segment");
|
|
HistoryBufSegment *s = self->segments + self->num_segments - 1;
|
|
s->cpu_cells = PyMem_Calloc(self->xnum * SEGMENT_SIZE, sizeof(CPUCell));
|
|
s->gpu_cells = PyMem_Calloc(self->xnum * SEGMENT_SIZE, sizeof(GPUCell));
|
|
s->line_attrs = PyMem_Calloc(SEGMENT_SIZE, sizeof(line_attrs_type));
|
|
if (s->cpu_cells == NULL || s->gpu_cells == NULL || s->line_attrs == NULL) fatal("Out of memory allocating new history buffer segment");
|
|
}
|
|
|
|
static inline index_type
|
|
segment_for(HistoryBuf *self, index_type y) {
|
|
index_type seg_num = y / SEGMENT_SIZE;
|
|
while (UNLIKELY(seg_num >= self->num_segments && SEGMENT_SIZE * self->num_segments < self->ynum)) add_segment(self);
|
|
if (UNLIKELY(seg_num >= self->num_segments)) fatal("Out of bounds access to history buffer line number: %u", y);
|
|
return seg_num;
|
|
}
|
|
|
|
#define seg_ptr(which, stride) { \
|
|
index_type seg_num = segment_for(self, y); \
|
|
y -= seg_num * SEGMENT_SIZE; \
|
|
return self->segments[seg_num].which + y * stride; \
|
|
}
|
|
|
|
static inline CPUCell*
|
|
cpu_lineptr(HistoryBuf *self, index_type y) {
|
|
seg_ptr(cpu_cells, self->xnum);
|
|
}
|
|
|
|
static inline GPUCell*
|
|
gpu_lineptr(HistoryBuf *self, index_type y) {
|
|
seg_ptr(gpu_cells, self->xnum);
|
|
}
|
|
|
|
|
|
static inline line_attrs_type*
|
|
attrptr(HistoryBuf *self, index_type y) {
|
|
seg_ptr(line_attrs, 1);
|
|
}
|
|
|
|
static inline PagerHistoryBuf*
|
|
alloc_pagerhist(unsigned int pagerhist_sz) {
|
|
PagerHistoryBuf *ph;
|
|
if (!pagerhist_sz) return NULL;
|
|
ph = PyMem_Calloc(1, sizeof(PagerHistoryBuf));
|
|
ph->maxsz = pagerhist_sz / sizeof(Py_UCS4);
|
|
ph->bufsize = 1024*1024 / sizeof(Py_UCS4);
|
|
ph->buffer = PyMem_RawMalloc(1024*1024);
|
|
if (!ph->buffer) { PyMem_Free(ph); return NULL; }
|
|
return ph;
|
|
}
|
|
|
|
static inline bool
|
|
pagerhist_extend(PagerHistoryBuf *ph, size_t minsz) {
|
|
if (ph->bufsize >= ph->maxsz) return false;
|
|
size_t newsz = ph->bufsize + MAX(1024 * 1024, minsz);
|
|
void *newbuf = PyMem_Realloc(ph->buffer, newsz * sizeof(Py_UCS4));
|
|
if (!newbuf) return false;
|
|
ph->buffer = newbuf;
|
|
ph->bufsize = newsz;
|
|
return true;
|
|
}
|
|
|
|
static PyObject *
|
|
new(PyTypeObject *type, PyObject *args, PyObject UNUSED *kwds) {
|
|
HistoryBuf *self;
|
|
unsigned int xnum = 1, ynum = 1, pagerhist_sz = 0;
|
|
|
|
if (!PyArg_ParseTuple(args, "II|I", &ynum, &xnum, &pagerhist_sz)) return NULL;
|
|
|
|
if (xnum == 0 || ynum == 0) {
|
|
PyErr_SetString(PyExc_ValueError, "Cannot create an empty history buffer");
|
|
return NULL;
|
|
}
|
|
|
|
self = (HistoryBuf *)type->tp_alloc(type, 0);
|
|
if (self != NULL) {
|
|
self->xnum = xnum;
|
|
self->ynum = ynum;
|
|
self->num_segments = 0;
|
|
add_segment(self);
|
|
self->line = alloc_line();
|
|
self->line->xnum = xnum;
|
|
self->pagerhist = alloc_pagerhist(pagerhist_sz);
|
|
}
|
|
|
|
return (PyObject*)self;
|
|
}
|
|
|
|
static void
|
|
dealloc(HistoryBuf* self) {
|
|
Py_CLEAR(self->line);
|
|
for (size_t i = 0; i < self->num_segments; i++) {
|
|
PyMem_Free(self->segments[i].cpu_cells);
|
|
PyMem_Free(self->segments[i].gpu_cells);
|
|
PyMem_Free(self->segments[i].line_attrs);
|
|
}
|
|
PyMem_Free(self->segments);
|
|
if (self->pagerhist) PyMem_Free(self->pagerhist->buffer);
|
|
PyMem_Free(self->pagerhist);
|
|
Py_TYPE(self)->tp_free((PyObject*)self);
|
|
}
|
|
|
|
static inline index_type
|
|
index_of(HistoryBuf *self, index_type lnum) {
|
|
// The index (buffer position) of the line with line number lnum
|
|
// This is reverse indexing, i.e. lnum = 0 corresponds to the *last* line in the buffer.
|
|
if (self->count == 0) return 0;
|
|
index_type idx = self->count - 1 - MIN(self->count - 1, lnum);
|
|
return (self->start_of_data + idx) % self->ynum;
|
|
}
|
|
|
|
static inline void
|
|
init_line(HistoryBuf *self, index_type num, Line *l) {
|
|
// Initialize the line l, setting its pointer to the offsets for the line at index (buffer position) num
|
|
l->cpu_cells = cpu_lineptr(self, num);
|
|
l->gpu_cells = gpu_lineptr(self, num);
|
|
l->continued = *attrptr(self, num) & CONTINUED_MASK;
|
|
l->has_dirty_text = *attrptr(self, num) & TEXT_DIRTY_MASK ? true : false;
|
|
}
|
|
|
|
void
|
|
historybuf_init_line(HistoryBuf *self, index_type lnum, Line *l) {
|
|
init_line(self, index_of(self, lnum), l);
|
|
}
|
|
|
|
void
|
|
historybuf_mark_line_clean(HistoryBuf *self, index_type y) {
|
|
line_attrs_type *p = attrptr(self, index_of(self, y));
|
|
*p &= ~TEXT_DIRTY_MASK;
|
|
}
|
|
|
|
void
|
|
historybuf_mark_line_dirty(HistoryBuf *self, index_type y) {
|
|
line_attrs_type *p = attrptr(self, index_of(self, y));
|
|
*p |= TEXT_DIRTY_MASK;
|
|
}
|
|
|
|
inline void
|
|
historybuf_clear(HistoryBuf *self) {
|
|
self->count = 0;
|
|
self->start_of_data = 0;
|
|
}
|
|
|
|
static inline void
|
|
pagerhist_push(HistoryBuf *self) {
|
|
PagerHistoryBuf *ph = self->pagerhist;
|
|
if (!ph) return;
|
|
bool truncated;
|
|
Line l = {.xnum=self->xnum};
|
|
init_line(self, self->start_of_data, &l);
|
|
#define EXPAND_IF_FULL(sz) { \
|
|
if (ph->bufsize - ph->end < sz && !pagerhist_extend(ph, sz)) { \
|
|
ph->bufend = ph->end; ph->end = 0; \
|
|
} \
|
|
}
|
|
size_t sz = MAX(1024, ph->bufsize - ph->end);
|
|
sz = MAX(sz, self->xnum + self->xnum);
|
|
EXPAND_IF_FULL(sz);
|
|
if (ph->start != ph->end && !l.continued) {
|
|
ph->buffer[ph->end++] = '\n';
|
|
}
|
|
while(sz < ph->maxsz - 2) {
|
|
size_t num = line_as_ansi(&l, ph->buffer + ph->end, ph->bufsize - ph->end - 2, &truncated);
|
|
if (!truncated) {
|
|
ph->end += num;
|
|
ph->buffer[ph->end++] = '\r';
|
|
if (ph->bufend) {
|
|
ph->start = ph->end + 1 < ph->bufend ? ph->end + 1 : 0;
|
|
}
|
|
break;
|
|
}
|
|
// check if sz is too large too fit in buffer
|
|
if (ph->bufsize > ph->maxsz && !ph->end) break;
|
|
sz *= 2;
|
|
EXPAND_IF_FULL(sz);
|
|
}
|
|
#undef EXPAND_IF_FULL
|
|
}
|
|
|
|
static inline index_type
|
|
historybuf_push(HistoryBuf *self) {
|
|
index_type idx = (self->start_of_data + self->count) % self->ynum;
|
|
init_line(self, idx, self->line);
|
|
if (self->count == self->ynum) {
|
|
pagerhist_push(self);
|
|
self->start_of_data = (self->start_of_data + 1) % self->ynum;
|
|
} else self->count++;
|
|
return idx;
|
|
}
|
|
|
|
void
|
|
historybuf_add_line(HistoryBuf *self, const Line *line) {
|
|
index_type idx = historybuf_push(self);
|
|
copy_line(line, self->line);
|
|
*attrptr(self, idx) = (line->continued & CONTINUED_MASK) | (line->has_dirty_text ? TEXT_DIRTY_MASK : 0);
|
|
}
|
|
|
|
static PyObject*
|
|
line(HistoryBuf *self, PyObject *val) {
|
|
#define line_doc "Return the line with line number val. This buffer grows upwards, i.e. 0 is the most recently added line"
|
|
if (self->count == 0) { PyErr_SetString(PyExc_IndexError, "This buffer is empty"); return NULL; }
|
|
index_type lnum = PyLong_AsUnsignedLong(val);
|
|
if (lnum >= self->count) { PyErr_SetString(PyExc_IndexError, "Out of bounds"); return NULL; }
|
|
init_line(self, index_of(self, lnum), self->line);
|
|
Py_INCREF(self->line);
|
|
return (PyObject*)self->line;
|
|
}
|
|
|
|
static PyObject*
|
|
__str__(HistoryBuf *self) {
|
|
PyObject *lines = PyTuple_New(self->count);
|
|
if (lines == NULL) return PyErr_NoMemory();
|
|
for (index_type i = 0; i < self->count; i++) {
|
|
init_line(self, index_of(self, i), self->line);
|
|
PyObject *t = line_as_unicode(self->line);
|
|
if (t == NULL) { Py_CLEAR(lines); return NULL; }
|
|
PyTuple_SET_ITEM(lines, i, t);
|
|
}
|
|
PyObject *sep = PyUnicode_FromString("\n");
|
|
PyObject *ans = PyUnicode_Join(sep, lines);
|
|
Py_CLEAR(lines); Py_CLEAR(sep);
|
|
return ans;
|
|
}
|
|
|
|
static PyObject*
|
|
push(HistoryBuf *self, PyObject *args) {
|
|
#define push_doc "Push a line into this buffer, removing the oldest line, if necessary"
|
|
Line *line;
|
|
if (!PyArg_ParseTuple(args, "O!", &Line_Type, &line)) return NULL;
|
|
historybuf_add_line(self, line);
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static PyObject*
|
|
as_ansi(HistoryBuf *self, PyObject *callback) {
|
|
#define as_ansi_doc "as_ansi(callback) -> The contents of this buffer as ANSI escaped text. callback is called with each successive line."
|
|
static Py_UCS4 t[5120];
|
|
Line l = {.xnum=self->xnum};
|
|
bool truncated;
|
|
for(unsigned int i = 0; i < self->count; i++) {
|
|
init_line(self, i, &l);
|
|
if (i < self->count - 1) {
|
|
l.continued = *attrptr(self, index_of(self, i + 1)) & CONTINUED_MASK;
|
|
} else l.continued = false;
|
|
index_type num = line_as_ansi(&l, t, 5120, &truncated);
|
|
if (!(l.continued) && num < 5119) t[num++] = 10; // 10 = \n
|
|
PyObject *ans = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, t, num);
|
|
if (ans == NULL) return PyErr_NoMemory();
|
|
PyObject *ret = PyObject_CallFunctionObjArgs(callback, ans, NULL);
|
|
Py_CLEAR(ans);
|
|
if (ret == NULL) return NULL;
|
|
Py_CLEAR(ret);
|
|
}
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static inline Line*
|
|
get_line(HistoryBuf *self, index_type y, Line *l) { init_line(self, index_of(self, self->count - y - 1), l); return l; }
|
|
|
|
static void
|
|
pagerhist_rewrap(PagerHistoryBuf *ph, index_type xnum) {
|
|
Py_UCS4 *buf = PyMem_RawMalloc(ph->bufsize * sizeof(Py_UCS4));
|
|
if (!buf) return;
|
|
index_type s = ph->start, i = s, dest = 0, dest_bufend = 0, x = 0;
|
|
index_type end = ph->bufend ? ph->bufend : ph->end;
|
|
index_type lastmod_s = 0, lastmod_len = 0;
|
|
#define CPY(_s, _l) { if (dest + (_l) >= ph->bufsize - 1) { dest_bufend = dest; dest = 0; } \
|
|
memcpy(buf + dest, ph->buffer + (_s), (_l) * sizeof(Py_UCS4)); dest += (_l); }
|
|
while (i < end) {
|
|
switch (ph->buffer[i]) {
|
|
case '\n':
|
|
CPY(s, i - s + 1);
|
|
x = 0; s = i + 1; lastmod_len = 0;
|
|
break;
|
|
case '\r':
|
|
CPY(s, i - s);
|
|
if (!memcmp(ph->buffer + lastmod_s, ph->buffer + i + 1, lastmod_len * sizeof(Py_UCS4)))
|
|
i += lastmod_len;
|
|
s = i + 1;
|
|
break;
|
|
case '\x1b':
|
|
if (ph->buffer[i+1] != '[') break;
|
|
lastmod_s = i;
|
|
while (ph->buffer[++i] != 'm');
|
|
lastmod_len = i - lastmod_s + 1;
|
|
break;
|
|
default:
|
|
x++; break;
|
|
}
|
|
i++;
|
|
if (ph->bufend && i == ph->bufend) {
|
|
if (s != i) CPY(s, i - s);
|
|
end = ph->end; i = s = 0;
|
|
}
|
|
if (x == xnum) {
|
|
CPY(s, i - s); buf[dest++] = '\r'; s = i; x = 0;
|
|
if (!(ph->buffer[i] == '\x1b' && ph->buffer[i+1] == '[') && lastmod_len)
|
|
CPY(lastmod_s, lastmod_len);
|
|
}
|
|
}
|
|
#undef CPY
|
|
PyMem_Free(ph->buffer);
|
|
ph->buffer = buf;
|
|
ph->end = dest; ph->bufend = dest_bufend;
|
|
ph->start = dest_bufend ? dest + 1 : 0;
|
|
ph->rewrap_needed = false;
|
|
}
|
|
|
|
static PyObject *
|
|
pagerhist_as_text(HistoryBuf *self, PyObject *callback) {
|
|
PagerHistoryBuf *ph = self->pagerhist;
|
|
PyObject *ret = NULL, *t = NULL;
|
|
Py_UCS4 *buf = NULL;
|
|
index_type num;
|
|
if (!ph) Py_RETURN_NONE;
|
|
|
|
if (ph->rewrap_needed) pagerhist_rewrap(ph, self->xnum);
|
|
|
|
#define CALLBACK { \
|
|
if (t == NULL) goto end; \
|
|
ret = PyObject_CallFunctionObjArgs(callback, t, NULL); \
|
|
Py_DECREF(t); \
|
|
if (ret == NULL) goto end; \
|
|
Py_DECREF(ret); \
|
|
}
|
|
|
|
num = (ph->bufend ? ph->bufend : ph->end) - ph->start;
|
|
buf = ph->buffer + ph->start;
|
|
t = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buf, num);
|
|
CALLBACK;
|
|
if (ph->bufend) {
|
|
num = ph->end; buf = ph->buffer;
|
|
t = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buf, num);
|
|
CALLBACK;
|
|
}
|
|
Line l = {.xnum=self->xnum}; get_line(self, 0, &l);
|
|
if (!l.continued) {
|
|
t = PyUnicode_FromString("\n");
|
|
CALLBACK;
|
|
}
|
|
#undef CALLBACK
|
|
end:
|
|
if (PyErr_Occurred()) return NULL;
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static PyObject*
|
|
as_text(HistoryBuf *self, PyObject *args) {
|
|
Line l = {.xnum=self->xnum};
|
|
#define gl(self, y) get_line(self, y, &l);
|
|
as_text_generic(args, self, gl, self->count, self->xnum);
|
|
#undef gl
|
|
}
|
|
|
|
|
|
static PyObject*
|
|
dirty_lines(HistoryBuf *self, PyObject *a UNUSED) {
|
|
#define dirty_lines_doc "dirty_lines() -> Line numbers of all lines that have dirty text."
|
|
PyObject *ans = PyList_New(0);
|
|
for (index_type i = 0; i < self->count; i++) {
|
|
if (*attrptr(self, i) & TEXT_DIRTY_MASK) {
|
|
PyList_Append(ans, PyLong_FromUnsignedLong(i));
|
|
}
|
|
}
|
|
return ans;
|
|
}
|
|
|
|
|
|
// Boilerplate {{{
|
|
static PyObject* rewrap(HistoryBuf *self, PyObject *args);
|
|
#define rewrap_doc ""
|
|
|
|
static PyMethodDef methods[] = {
|
|
METHOD(line, METH_O)
|
|
METHOD(as_ansi, METH_O)
|
|
METHODB(pagerhist_as_text, METH_O),
|
|
METHODB(as_text, METH_VARARGS),
|
|
METHOD(dirty_lines, METH_NOARGS)
|
|
METHOD(push, METH_VARARGS)
|
|
METHOD(rewrap, METH_VARARGS)
|
|
{NULL, NULL, 0, NULL} /* Sentinel */
|
|
};
|
|
|
|
static PyMemberDef members[] = {
|
|
{"xnum", T_UINT, offsetof(HistoryBuf, xnum), READONLY, "xnum"},
|
|
{"ynum", T_UINT, offsetof(HistoryBuf, ynum), READONLY, "ynum"},
|
|
{"count", T_UINT, offsetof(HistoryBuf, count), READONLY, "count"},
|
|
{NULL} /* Sentinel */
|
|
};
|
|
|
|
PyTypeObject HistoryBuf_Type = {
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
.tp_name = "fast_data_types.HistoryBuf",
|
|
.tp_basicsize = sizeof(HistoryBuf),
|
|
.tp_dealloc = (destructor)dealloc,
|
|
.tp_flags = Py_TPFLAGS_DEFAULT,
|
|
.tp_doc = "History buffers",
|
|
.tp_methods = methods,
|
|
.tp_members = members,
|
|
.tp_str = (reprfunc)__str__,
|
|
.tp_new = new
|
|
};
|
|
|
|
INIT_TYPE(HistoryBuf)
|
|
|
|
HistoryBuf *alloc_historybuf(unsigned int lines, unsigned int columns, unsigned int pagerhist_sz) {
|
|
return (HistoryBuf*)new(&HistoryBuf_Type, Py_BuildValue("III", lines, columns, pagerhist_sz), NULL);
|
|
}
|
|
// }}}
|
|
|
|
#define BufType HistoryBuf
|
|
|
|
#define map_src_index(y) ((src->start_of_data + y) % src->ynum)
|
|
|
|
#define init_src_line(src_y) init_line(src, map_src_index(src_y), src->line);
|
|
|
|
#define is_src_line_continued(src_y) (map_src_index(src_y) < src->ynum - 1 ? (*attrptr(src, map_src_index(src_y + 1)) & CONTINUED_MASK) : false)
|
|
|
|
#define next_dest_line(cont) *attrptr(dest, historybuf_push(dest)) = cont & CONTINUED_MASK; dest->line->continued = cont;
|
|
|
|
#define first_dest_line next_dest_line(false);
|
|
|
|
#include "rewrap.h"
|
|
|
|
void historybuf_rewrap(HistoryBuf *self, HistoryBuf *other) {
|
|
while(other->num_segments < self->num_segments) add_segment(other);
|
|
if (other->xnum == self->xnum && other->ynum == self->ynum) {
|
|
// Fast path
|
|
for (index_type i = 0; i < self->num_segments; i++) {
|
|
memcpy(other->segments[i].cpu_cells, self->segments[i].cpu_cells, SEGMENT_SIZE * self->xnum * sizeof(CPUCell));
|
|
memcpy(other->segments[i].gpu_cells, self->segments[i].gpu_cells, SEGMENT_SIZE * self->xnum * sizeof(GPUCell));
|
|
memcpy(other->segments[i].line_attrs, self->segments[i].line_attrs, SEGMENT_SIZE * sizeof(line_attrs_type));
|
|
}
|
|
other->count = self->count; other->start_of_data = self->start_of_data;
|
|
return;
|
|
}
|
|
if (other->pagerhist && other->xnum != self->xnum && other->pagerhist->end != other->pagerhist->start)
|
|
other->pagerhist->rewrap_needed = true;
|
|
other->count = 0; other->start_of_data = 0;
|
|
index_type x = 0, y = 0;
|
|
if (self->count > 0) {
|
|
rewrap_inner(self, other, self->count, NULL, &x, &y);
|
|
for (index_type i = 0; i < other->count; i++) *attrptr(other, (other->start_of_data + i) % other->ynum) |= TEXT_DIRTY_MASK;
|
|
}
|
|
}
|
|
|
|
static PyObject*
|
|
rewrap(HistoryBuf *self, PyObject *args) {
|
|
HistoryBuf *other;
|
|
if (!PyArg_ParseTuple(args, "O!", &HistoryBuf_Type, &other)) return NULL;
|
|
historybuf_rewrap(self, other);
|
|
Py_RETURN_NONE;
|
|
}
|