archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Optimize and reduce memory usage of XML serialization (#14204)

Browse source 
The serialization process uses the system allocator and requires a copy
to request allocated memory once finished. This patch improves this by
using smart_str to build the resulting string, reducing the number of
copies and reducing total peak memory usage.
This commit is contained in:
Niels Dossche 2024-05-12 01:57:29 +02:00 • committed by GitHub
parent 8776561581
commit aa3e6eec50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 35 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ext/dom/xml_document.c
View file

@ -250,42 +250,38 @@ PHP_METHOD(Dom_XMLDocument, createFromFile)
load_from_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
}
static int php_new_dom_write_smart_str(void *context, const char *buffer, int len)
{
smart_str *str = context;
smart_str_appendl(str, buffer, len);
return len;
}
static zend_string *php_new_dom_dump_node_to_str(xmlDocPtr doc, xmlNodePtr node, bool format, const char *encoding)
{
xmlBufferPtr buf = xmlBufferCreate();
if (!buf) {
return NULL;
}
smart_str str = {0};
int status = -1;
xmlSaveCtxtPtr ctxt = xmlSaveToBuffer(buf, encoding, XML_SAVE_AS_XML);
xmlSaveCtxtPtr ctxt = xmlSaveToIO(php_new_dom_write_smart_str, NULL, &str, encoding, XML_SAVE_AS_XML);
if (EXPECTED(ctxt != NULL)) {
xmlCharEncodingHandlerPtr handler = xmlFindCharEncodingHandler(encoding);
xmlOutputBufferPtr out = xmlOutputBufferCreateBuffer(buf, handler);
xmlOutputBufferPtr out = xmlOutputBufferCreateIO(php_new_dom_write_smart_str, NULL, &str, handler);
if (EXPECTED(out != NULL)) {
status = dom_xml_serialize(ctxt, out, node, format);
status |= xmlOutputBufferFlush(out);
status |= xmlOutputBufferClose(out);
} else {
xmlCharEncCloseFunc(handler);
}
(void) xmlSaveClose(ctxt);
xmlCharEncCloseFunc(handler);
}
if (UNEXPECTED(status < 0)) {
xmlBufferFree(buf);
smart_str_free_ex(&str, false);
return NULL;
}
const xmlChar *content = xmlBufferContent(buf);
if (!content) {
xmlBufferFree(buf);
return NULL;
}
int size = xmlBufferLength(buf);
zend_string *res = zend_string_init((const char *) content, size, false);
xmlBufferFree(buf);
return res;
return smart_str_extract(&str);
}
static zend_string *php_new_dom_dump_doc_to_str(xmlDocPtr doc, int options, const char *encoding)