shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-27 18:50:07 +03:00
Code

parser: Optimize buffer shrinking

Browse Source 
Remove checks now that we can shrink memory buffers efficiently.

Shrink more aggressively.
This commit is contained in:
Nick Wellnhofer 2024-07-07 03:02:11 +02:00
parent a221cd7849
commit 92f30711de
2 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
parserInternals.c
View File

@ -652,35 +652,27 @@ void
xmlParserShrink(xmlParserCtxtPtr ctxt) {
xmlParserInputPtr in = ctxt->input;
xmlParserInputBufferPtr buf = in->buf;
size_t used;
size_t used, res;
if (buf == NULL)
return;
/* Don't shrink pull parser memory buffers. */
if ((!PARSER_PROGRESSIVE(ctxt)) &&
(buf->encoder == NULL) &&
(buf->readcallback == NULL))
return;
used = in->cur - in->base;
/*
* Do not shrink on large buffers whose only a tiny fraction
* was consumed
*/
if (used > INPUT_CHUNK) {
size_t res = xmlBufShrink(buf->buffer, used - LINE_LEN);
if (res > 0) {
if (used > LINE_LEN) {
res = xmlBufShrink(buf->buffer, used - LINE_LEN);
if (res > 0) {
used -= res;
if ((res > ULONG_MAX) ||
(in->consumed > ULONG_MAX - (unsigned long)res))
in->consumed = ULONG_MAX;
else
in->consumed += res;
}
}
}
xmlBufUpdateInput(buf->buffer, in, used);
xmlBufUpdateInput(buf->buffer, in, used);
}
}
/**
@ -703,11 +695,8 @@ xmlParserInputShrink(xmlParserInputPtr in) {
if (in->buf->buffer == NULL) return;
used = in->cur - in->base;
/*
* Do not shrink on large buffers whose only a tiny fraction
* was consumed
*/
if (used > INPUT_CHUNK) {
if (used > LINE_LEN) {
ret = xmlBufShrink(in->buf->buffer, used - LINE_LEN);
if (ret > 0) {
used -= ret;
@ -717,22 +706,9 @@ xmlParserInputShrink(xmlParserInputPtr in) {
else
in->consumed += ret;
}
}
if (xmlBufUse(in->buf->buffer) <= INPUT_CHUNK) {
xmlParserInputBufferRead(in->buf, 2 * INPUT_CHUNK);
xmlBufUpdateInput(in->buf->buffer, in, used);
}
in->base = xmlBufContent(in->buf->buffer);
if (in->base == NULL) {
/* TODO: raise error */
in->base = BAD_CAST "";
in->cur = in->base;
in->end = in->base;
return;
}
in->cur = in->base + used;
in->end = xmlBufEnd(in->buf->buffer);
}
/************************************************************************

15
xmlreader.c
View File

@ -836,15 +836,12 @@ xmlTextReaderPushData(xmlTextReaderPtr reader) {
* Discard the consumed input when needed and possible
*/
if (reader->mode == XML_TEXTREADER_MODE_INTERACTIVE) {
if (reader->input->readcallback != NULL) {
if ((reader->cur >= 4096) &&
(xmlBufUse(inbuf) - reader->cur <= CHUNK_SIZE)) {
val = xmlBufShrink(inbuf, reader->cur);
if (val >= 0) {
reader->cur -= val;
}
}
}
if (reader->cur > 80 /* LINE_LEN */) {
val = xmlBufShrink(inbuf, reader->cur - 80);
if (val >= 0) {
reader->cur -= val;
}
}
}
/*