External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize node printing by using raw pointers

Browse Source 
This lets us do fewer null pointer checks (making printing 2% faster with -O3)
and removes a lot of function calls (making printing 20% faster with -O0).
This commit is contained in:
Arseny Kapoulkine 2014-10-27 22:29:14 -07:00
parent c64d4820b1
commit 6229138d80
2 changed files with 92 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/pugixml.cpp
View File

@ -3452,36 +3452,37 @@ PUGI__NS_BEGIN
writer.write('-', '-', '>'); writer.write('-', '-', '>');
} }
PUGI__FN void node_output_attributes(xml_buffered_writer& writer, const xml_node node, unsigned int flags) PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
for (xml_attribute a = node.first_attribute(); a; a = a.next_attribute()) for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
{ {
writer.write(' '); writer.write(' ');
writer.write_string(a.name()[0] ? a.name() : default_name); writer.write_string(a->name ? a->name : default_name);
writer.write('=', '"'); writer.write('=', '"');
text_output(writer, a.value(), ctx_special_attr, flags); if (a->value)
text_output(writer, a->value, ctx_special_attr, flags);
writer.write('"'); writer.write('"');
} }
} }
PUGI__FN bool node_output_start(xml_buffered_writer& writer, const xml_node node, unsigned int flags) PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
const char_t* name = node.name()[0] ? node.name() : default_name; const char_t* name = node->name ? node->name : default_name;
writer.write('<'); writer.write('<');
writer.write_string(name); writer.write_string(name);
if (node.first_attribute()) if (node->first_attribute)
node_output_attributes(writer, node, flags); node_output_attributes(writer, node, flags);
if (flags & format_raw) if (flags & format_raw)
{ {
if (!node.first_child()) if (!node->first_child)
writer.write(' ', '/', '>'); writer.write(' ', '/', '>');
else else
{ {
@ -3492,18 +3493,20 @@ PUGI__NS_BEGIN
} }
else else
{ {
xml_node first = node.first_child(); xml_node_struct* first = node->first_child;
if (!first) if (!first)
writer.write(' ', '/', '>', '\n'); writer.write(' ', '/', '>', '\n');
else if (!first.next_sibling() && (first.type() == node_pcdata || first.type() == node_cdata)) else if (!first->next_sibling && (PUGI__NODETYPE(first) == node_pcdata || PUGI__NODETYPE(first) == node_cdata))
{ {
writer.write('>'); writer.write('>');
if (first.type() == node_pcdata) const char_t* value = first->value ? first->value : PUGIXML_TEXT("");
text_output(writer, first.value(), ctx_special_pcdata, flags);
if (PUGI__NODETYPE(first) == node_pcdata)
text_output(writer, value, ctx_special_pcdata, flags);
else else
text_output_cdata(writer, first.value()); text_output_cdata(writer, value);
writer.write('<', '/'); writer.write('<', '/');
writer.write_string(name); writer.write_string(name);
@ -3520,10 +3523,10 @@ PUGI__NS_BEGIN
return false; return false;
} }
PUGI__FN void node_output_end(xml_buffered_writer& writer, const xml_node node, unsigned int flags) PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
const char_t* name = node.name()[0] ? node.name() : default_name; const char_t* name = node->name ? node->name : default_name;
writer.write('<', '/'); writer.write('<', '/');
writer.write_string(name); writer.write_string(name);
@ -3534,35 +3537,35 @@ PUGI__NS_BEGIN
writer.write('>', '\n'); writer.write('>', '\n');
} }
PUGI__FN void node_output_simple(xml_buffered_writer& writer, const xml_node node, unsigned int flags) PUGI__FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
switch (node.type()) switch (PUGI__NODETYPE(node))
{ {
case node_pcdata: case node_pcdata:
text_output(writer, node.value(), ctx_special_pcdata, flags); text_output(writer, node->value ? node->value : PUGIXML_TEXT(""), ctx_special_pcdata, flags);
if ((flags & format_raw) == 0) writer.write('\n'); if ((flags & format_raw) == 0) writer.write('\n');
break; break;
case node_cdata: case node_cdata:
text_output_cdata(writer, node.value()); text_output_cdata(writer, node->value ? node->value : PUGIXML_TEXT(""));
if ((flags & format_raw) == 0) writer.write('\n'); if ((flags & format_raw) == 0) writer.write('\n');
break; break;
case node_comment: case node_comment:
node_output_comment(writer, node.value()); node_output_comment(writer, node->value ? node->value : PUGIXML_TEXT(""));
if ((flags & format_raw) == 0) writer.write('\n'); if ((flags & format_raw) == 0) writer.write('\n');
break; break;
case node_pi: case node_pi:
writer.write('<', '?'); writer.write('<', '?');
writer.write_string(node.name()[0] ? node.name() : default_name); writer.write_string(node->name ? node->name : default_name);
if (node.value()[0]) if (node->value)
{ {
writer.write(' '); writer.write(' ');
writer.write_string(node.value()); writer.write_string(node->value);
} }
writer.write('?', '>'); writer.write('?', '>');
@ -3571,7 +3574,7 @@ PUGI__NS_BEGIN
case node_declaration: case node_declaration:
writer.write('<', '?'); writer.write('<', '?');
writer.write_string(node.name()[0] ? node.name() : default_name); writer.write_string(node->name ? node->name : default_name);
node_output_attributes(writer, node, flags); node_output_attributes(writer, node, flags);
writer.write('?', '>'); writer.write('?', '>');
if ((flags & format_raw) == 0) writer.write('\n'); if ((flags & format_raw) == 0) writer.write('\n');
@ -3581,10 +3584,10 @@ PUGI__NS_BEGIN
writer.write('<', '!', 'D', 'O', 'C'); writer.write('<', '!', 'D', 'O', 'C');
writer.write('T', 'Y', 'P', 'E'); writer.write('T', 'Y', 'P', 'E');
if (node.value()[0]) if (node->value)
{ {
writer.write(' '); writer.write(' ');
writer.write_string(node.value()); writer.write_string(node->value);
} }
writer.write('>'); writer.write('>');
@ -3596,11 +3599,11 @@ PUGI__NS_BEGIN
} }
} }
PUGI__FN void node_output(xml_buffered_writer& writer, const xml_node root, const char_t* indent, unsigned int flags, unsigned int depth) PUGI__FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
{ {
size_t indent_length = ((flags & (format_indent | format_raw)) == format_indent) ? strlength(indent) : 0; size_t indent_length = ((flags & (format_indent | format_raw)) == format_indent) ? strlength(indent) : 0;
xml_node node = root; xml_node_struct* node = root;
do do
{ {
@ -3610,20 +3613,20 @@ PUGI__NS_BEGIN
if (indent_length) if (indent_length)
text_output_indent(writer, indent, indent_length, depth); text_output_indent(writer, indent, indent_length, depth);
if (node.type() == node_element) if (PUGI__NODETYPE(node) == node_element)
{ {
if (node_output_start(writer, node, flags)) if (node_output_start(writer, node, flags))
{ {
node = node.first_child(); node = node->first_child;
depth++; depth++;
continue; continue;
} }
} }
else if (node.type() == node_document) else if (PUGI__NODETYPE(node) == node_document)
{ {
if (node.first_child()) if (node->first_child)
{ {
node = node.first_child(); node = node->first_child;
continue; continue;
} }
} }
@ -3635,17 +3638,17 @@ PUGI__NS_BEGIN
// continue to the next node // continue to the next node
while (node != root) while (node != root)
{ {
if (node.next_sibling()) if (node->next_sibling)
{ {
node = node.next_sibling(); node = node->next_sibling;
break; break;
} }
node = node.parent(); node = node->parent;
depth--; depth--;
// write closing node // write closing node
if (node.type() == node_element) if (PUGI__NODETYPE(node) == node_element)
{ {
if (indent_length) if (indent_length)
text_output_indent(writer, indent, indent_length, depth); text_output_indent(writer, indent, indent_length, depth);
@ -5383,7 +5386,7 @@ namespace pugi
impl::xml_buffered_writer buffered_writer(writer, encoding); impl::xml_buffered_writer buffered_writer(writer, encoding);
impl::node_output(buffered_writer, *this, indent, flags, depth); impl::node_output(buffered_writer, _root, indent, flags, depth);
} }
#ifndef PUGIXML_NO_STL #ifndef PUGIXML_NO_STL
@ -6074,7 +6077,7 @@ namespace pugi
if (!(flags & format_raw)) buffered_writer.write('\n'); if (!(flags & format_raw)) buffered_writer.write('\n');
} }
impl::node_output(buffered_writer, *this, indent, flags, 0); impl::node_output(buffered_writer, _root, indent, flags, 0);
} }
#ifndef PUGIXML_NO_STL #ifndef PUGIXML_NO_STL

50
tests/test_write.cpp
View File

@ -51,6 +51,15 @@ TEST_XML(write_cdata_inner, "<node><![CDATA[value]]></node>")
CHECK_NODE_EX(doc, STR("<node><![CDATA[value]]></node>\n"), STR(""), 0); CHECK_NODE_EX(doc, STR("<node><![CDATA[value]]></node>\n"), STR(""), 0);
} }
TEST(write_cdata_null)
{
xml_document doc;
doc.append_child(node_cdata);
doc.append_child(STR("node")).append_child(node_cdata);
CHECK_NODE(doc, STR("<![CDATA[]]><node><![CDATA[]]></node>"));
}
TEST_XML_FLAGS(write_comment, "<!--text-->", parse_comments | parse_fragment) TEST_XML_FLAGS(write_comment, "<!--text-->", parse_comments | parse_fragment)
{ {
CHECK_NODE(doc, STR("<!--text-->")); CHECK_NODE(doc, STR("<!--text-->"));
@ -80,12 +89,32 @@ TEST(write_comment_invalid)
CHECK_NODE(doc, STR("<!--- ->- -->")); CHECK_NODE(doc, STR("<!--- ->- -->"));
} }
TEST(write_comment_null)
{
xml_document doc;
doc.append_child(node_comment);
CHECK_NODE(doc, STR("<!---->"));
}
TEST_XML_FLAGS(write_pi, "<?name value?>", parse_pi | parse_fragment) TEST_XML_FLAGS(write_pi, "<?name value?>", parse_pi | parse_fragment)
{ {
CHECK_NODE(doc, STR("<?name value?>")); CHECK_NODE(doc, STR("<?name value?>"));
CHECK_NODE_EX(doc, STR("<?name value?>\n"), STR(""), 0); CHECK_NODE_EX(doc, STR("<?name value?>\n"), STR(""), 0);
} }
TEST(write_pi_null)
{
xml_document doc;
xml_node node = doc.append_child(node_pi);
CHECK_NODE(doc, STR("<?:anonymous?>"));
node.set_value(STR("value"));
CHECK_NODE(doc, STR("<?:anonymous value?>"));
}
TEST_XML_FLAGS(write_declaration, "<?xml version='2.0'?>", parse_declaration | parse_fragment) TEST_XML_FLAGS(write_declaration, "<?xml version='2.0'?>", parse_declaration | parse_fragment)
{ {
CHECK_NODE(doc, STR("<?xml version=\"2.0\"?>")); CHECK_NODE(doc, STR("<?xml version=\"2.0\"?>"));
@ -98,6 +127,14 @@ TEST_XML_FLAGS(write_doctype, "<!DOCTYPE id [ foo ]>", parse_doctype | parse_fra
CHECK_NODE_EX(doc, STR("<!DOCTYPE id [ foo ]>\n"), STR(""), 0); CHECK_NODE_EX(doc, STR("<!DOCTYPE id [ foo ]>\n"), STR(""), 0);
} }
TEST(write_doctype_null)
{
xml_document doc;
doc.append_child(node_doctype);
CHECK_NODE(doc, STR("<!DOCTYPE>"));
}
TEST_XML(write_escape, "<node attr=''>text</node>") TEST_XML(write_escape, "<node attr=''>text</node>")
{ {
doc.child(STR("node")).attribute(STR("attr")) = STR("<>'\"&\x04\r\n\t"); doc.child(STR("node")).attribute(STR("attr")) = STR("<>'\"&\x04\r\n\t");
@ -460,3 +497,16 @@ TEST_XML(write_indent_custom, "<node attr='1'><child><sub>text</sub></child></no
CHECK_NODE_EX(doc, STR("<node attr=\"1\">\nABCD<child>\nABCDABCD<sub>text</sub>\nABCD</child>\n</node>\n"), STR("ABCD"), format_indent); CHECK_NODE_EX(doc, STR("<node attr=\"1\">\nABCD<child>\nABCDABCD<sub>text</sub>\nABCD</child>\n</node>\n"), STR("ABCD"), format_indent);
CHECK_NODE_EX(doc, STR("<node attr=\"1\">\nABCDE<child>\nABCDEABCDE<sub>text</sub>\nABCDE</child>\n</node>\n"), STR("ABCDE"), format_indent); CHECK_NODE_EX(doc, STR("<node attr=\"1\">\nABCDE<child>\nABCDEABCDE<sub>text</sub>\nABCDE</child>\n</node>\n"), STR("ABCDE"), format_indent);
} }
TEST(write_pcdata_null)
{
xml_document doc;
doc.append_child(STR("node")).append_child(node_pcdata);
CHECK_NODE(doc, STR("<node></node>"));
CHECK_NODE_EX(doc, STR("<node></node>\n"), STR("\t"), format_indent);
doc.first_child().append_child(node_pcdata);
CHECK_NODE_EX(doc, STR("<node>\n\t\n\t\n</node>\n"), STR("\t"), format_indent);
}