c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

xmllint: Always reuse parser context

Browse Source 
Simplifies "repeat" logic.
This commit is contained in:
Nick Wellnhofer 2025-01-07 18:55:35 +01:00
parent a5be2cc303
commit c0c69cb868
1 changed files with 71 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
xmllint.c
View File

@ -127,7 +127,7 @@ static xmlSchemaPtr wxschemas = NULL;
static const char *schematron = NULL; static const char *schematron = NULL;
static xmlSchematronPtr wxschematron = NULL; static xmlSchematronPtr wxschematron = NULL;
#endif #endif
static int repeat = 0; static int repeat = 1;
#if defined(LIBXML_HTML_ENABLED) #if defined(LIBXML_HTML_ENABLED)
static int html = 0; static int html = 0;
static int xmlout = 0; static int xmlout = 0;
@ -1429,7 +1429,7 @@ testSAX(const char *filename) {
ret = xmlSchemaValidateStream(vctxt, buf, 0, handler, ret = xmlSchemaValidateStream(vctxt, buf, 0, handler,
(void *)user_data); (void *)user_data);
if (repeat == 0) { if (repeat == 1) {
if (ret == 0) { if (ret == 0) {
if (!quiet) { if (!quiet) {
fprintf(ERR_STREAM, "%s validates\n", filename); fprintf(ERR_STREAM, "%s validates\n", filename);
@ -1606,7 +1606,7 @@ static void streamFile(const char *filename) {
#ifdef LIBXML_SCHEMAS_ENABLED #ifdef LIBXML_SCHEMAS_ENABLED
if (relaxng != NULL) { if (relaxng != NULL) {
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
ret = xmlTextReaderRelaxNGValidate(reader, relaxng); ret = xmlTextReaderRelaxNGValidate(reader, relaxng);
@ -1616,12 +1616,12 @@ static void streamFile(const char *filename) {
progresult = XMLLINT_ERR_SCHEMACOMP; progresult = XMLLINT_ERR_SCHEMACOMP;
relaxng = NULL; relaxng = NULL;
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Compiling the schemas"); endTimer("Compiling the schemas");
} }
} }
if (schema != NULL) { if (schema != NULL) {
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
ret = xmlTextReaderSchemaValidate(reader, schema); ret = xmlTextReaderSchemaValidate(reader, schema);
@ -1631,7 +1631,7 @@ static void streamFile(const char *filename) {
progresult = XMLLINT_ERR_SCHEMACOMP; progresult = XMLLINT_ERR_SCHEMACOMP;
schema = NULL; schema = NULL;
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Compiling the schemas"); endTimer("Compiling the schemas");
} }
} }
@ -1640,7 +1640,7 @@ static void streamFile(const char *filename) {
/* /*
* Process all nodes in sequence * Process all nodes in sequence
*/ */
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
ret = xmlTextReaderRead(reader); ret = xmlTextReaderRead(reader);
@ -1653,7 +1653,7 @@ static void streamFile(const char *filename) {
processNode(reader); processNode(reader);
ret = xmlTextReaderRead(reader); ret = xmlTextReaderRead(reader);
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
#ifdef LIBXML_SCHEMAS_ENABLED #ifdef LIBXML_SCHEMAS_ENABLED
if (relaxng != NULL) if (relaxng != NULL)
endTimer("Parsing and validating"); endTimer("Parsing and validating");
@ -1762,7 +1762,7 @@ static void walkDoc(xmlDocPtr doc) {
#endif /* LIBXML_PATTERN_ENABLED */ #endif /* LIBXML_PATTERN_ENABLED */
reader = xmlReaderWalker(doc); reader = xmlReaderWalker(doc);
if (reader != NULL) { if (reader != NULL) {
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
ret = xmlTextReaderRead(reader); ret = xmlTextReaderRead(reader);
@ -1775,7 +1775,7 @@ static void walkDoc(xmlDocPtr doc) {
processNode(reader); processNode(reader);
ret = xmlTextReaderRead(reader); ret = xmlTextReaderRead(reader);
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("walking through the doc"); endTimer("walking through the doc");
} }
xmlFreeTextReader(reader); xmlFreeTextReader(reader);
@ -1925,8 +1925,7 @@ error:
************************************************************************/ ************************************************************************/
static xmlDocPtr static xmlDocPtr
parseFile(const char *filename, xmlParserCtxtPtr rectxt) { parseFile(const char *filename, xmlParserCtxtPtr ctxt) {
xmlParserCtxtPtr ctxt;
xmlDocPtr doc = NULL; xmlDocPtr doc = NULL;
if ((generate) && (filename == NULL)) { if ((generate) && (filename == NULL)) {
@ -1996,13 +1995,7 @@ parseFile(const char *filename, xmlParserCtxtPtr rectxt) {
#endif /* LIBXML_PUSH_ENABLED */ #endif /* LIBXML_PUSH_ENABLED */
if (html) { if (html) {
ctxt = htmlNewParserCtxt();
if (ctxt == NULL) {
progresult = XMLLINT_ERR_MEM;
return(NULL);
}
doc = parseHtml(ctxt, filename); doc = parseHtml(ctxt, filename);
htmlFreeParserCtxt(ctxt);
return(doc); return(doc);
} }
#endif /* LIBXML_HTML_ENABLED */ #endif /* LIBXML_HTML_ENABLED */
@ -2053,16 +2046,6 @@ parseFile(const char *filename, xmlParserCtxtPtr rectxt) {
} else } else
#endif /* LIBXML_PUSH_ENABLED */ #endif /* LIBXML_PUSH_ENABLED */
{ {
if (rectxt == NULL) {
ctxt = xmlNewParserCtxt();
if (ctxt == NULL) {
progresult = XMLLINT_ERR_MEM;
return(NULL);
}
} else {
ctxt = rectxt;
}
doc = parseXml(ctxt, filename); doc = parseXml(ctxt, filename);
if (htmlout) if (htmlout)
@ -2081,27 +2064,24 @@ parseFile(const char *filename, xmlParserCtxtPtr rectxt) {
#endif /* LIBXML_VALID_ENABLED */ #endif /* LIBXML_VALID_ENABLED */
} }
if (ctxt != rectxt)
xmlFreeParserCtxt(ctxt);
return(doc); return(doc);
} }
static void static void
parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) { parseAndPrintFile(const char *filename, xmlParserCtxtPtr pctxt) {
xmlDocPtr doc; xmlDocPtr doc;
if ((timing) && (!repeat)) if ((timing) && (repeat == 1))
startTimer(); startTimer();
doc = parseFile(filename, rectxt); doc = parseFile(filename, pctxt);
if (doc == NULL) { if (doc == NULL) {
if (progresult == XMLLINT_RETURN_OK) if (progresult == XMLLINT_RETURN_OK)
progresult = XMLLINT_ERR_UNCLASS; progresult = XMLLINT_ERR_UNCLASS;
return; return;
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Parsing"); endTimer("Parsing");
} }
@ -2117,12 +2097,12 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
#ifdef LIBXML_XINCLUDE_ENABLED #ifdef LIBXML_XINCLUDE_ENABLED
if (xinclude) { if (xinclude) {
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
if (xmlXIncludeProcessFlags(doc, options) < 0) if (xmlXIncludeProcessFlags(doc, options) < 0)
progresult = XMLLINT_ERR_UNCLASS; progresult = XMLLINT_ERR_UNCLASS;
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Xinclude processing"); endTimer("Xinclude processing");
} }
} }
@ -2224,7 +2204,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
#ifdef LIBXML_DEBUG_ENABLED #ifdef LIBXML_DEBUG_ENABLED
if (!debug) { if (!debug) {
#endif #endif
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
#ifdef LIBXML_HTML_ENABLED #ifdef LIBXML_HTML_ENABLED
@ -2261,7 +2241,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
progresult = XMLLINT_ERR_OUT; progresult = XMLLINT_ERR_OUT;
} }
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Saving"); endTimer("Saving");
} }
} else } else
@ -2373,7 +2353,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
progresult = XMLLINT_ERR_OUT; progresult = XMLLINT_ERR_OUT;
} }
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Saving"); endTimer("Saving");
} }
#ifdef LIBXML_DEBUG_ENABLED #ifdef LIBXML_DEBUG_ENABLED
@ -2405,14 +2385,14 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
if ((dtdvalid != NULL) || (dtdvalidfpi != NULL)) { if ((dtdvalid != NULL) || (dtdvalidfpi != NULL)) {
xmlDtdPtr dtd; xmlDtdPtr dtd;
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
if (dtdvalid != NULL) if (dtdvalid != NULL)
dtd = xmlParseDTD(NULL, (const xmlChar *)dtdvalid); dtd = xmlParseDTD(NULL, (const xmlChar *)dtdvalid);
else else
dtd = xmlParseDTD((const xmlChar *)dtdvalidfpi, NULL); dtd = xmlParseDTD((const xmlChar *)dtdvalidfpi, NULL);
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Parsing DTD"); endTimer("Parsing DTD");
} }
if (dtd == NULL) { if (dtd == NULL) {
@ -2435,7 +2415,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
return; return;
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
if (!xmlValidateDtd(cvp, doc, dtd)) { if (!xmlValidateDtd(cvp, doc, dtd)) {
@ -2449,7 +2429,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
filename, dtdvalidfpi); filename, dtdvalidfpi);
progresult = XMLLINT_ERR_VALID; progresult = XMLLINT_ERR_VALID;
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Validating against DTD"); endTimer("Validating against DTD");
} }
xmlFreeValidCtxt(cvp); xmlFreeValidCtxt(cvp);
@ -2467,7 +2447,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
return; return;
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
if (!xmlValidateDocument(cvp, doc)) { if (!xmlValidateDocument(cvp, doc)) {
@ -2475,7 +2455,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
"Document %s does not validate\n", filename); "Document %s does not validate\n", filename);
progresult = XMLLINT_ERR_VALID; progresult = XMLLINT_ERR_VALID;
} }
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Validating"); endTimer("Validating");
} }
xmlFreeValidCtxt(cvp); xmlFreeValidCtxt(cvp);
@ -2487,7 +2467,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
int ret; int ret;
int flag; int flag;
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
@ -2517,7 +2497,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
progresult = XMLLINT_ERR_VALID; progresult = XMLLINT_ERR_VALID;
} }
xmlSchematronFreeValidCtxt(ctxt); xmlSchematronFreeValidCtxt(ctxt);
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Validating"); endTimer("Validating");
} }
} }
@ -2527,7 +2507,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
xmlRelaxNGValidCtxtPtr ctxt; xmlRelaxNGValidCtxtPtr ctxt;
int ret; int ret;
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
@ -2551,14 +2531,14 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
progresult = XMLLINT_ERR_VALID; progresult = XMLLINT_ERR_VALID;
} }
xmlRelaxNGFreeValidCtxt(ctxt); xmlRelaxNGFreeValidCtxt(ctxt);
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Validating"); endTimer("Validating");
} }
} else if (wxschemas != NULL) { } else if (wxschemas != NULL) {
xmlSchemaValidCtxtPtr ctxt; xmlSchemaValidCtxtPtr ctxt;
int ret; int ret;
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
@ -2582,7 +2562,7 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
progresult = XMLLINT_ERR_VALID; progresult = XMLLINT_ERR_VALID;
} }
xmlSchemaFreeValidCtxt(ctxt); xmlSchemaFreeValidCtxt(ctxt);
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Validating"); endTimer("Validating");
} }
} }
@ -2600,11 +2580,11 @@ parseAndPrintFile(const char *filename, xmlParserCtxtPtr rectxt) {
/* /*
* free it. * free it.
*/ */
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
startTimer(); startTimer();
} }
xmlFreeDoc(doc); xmlFreeDoc(doc);
if ((timing) && (!repeat)) { if ((timing) && (repeat == 1)) {
endTimer("Freeing"); endTimer("Freeing");
} }
} }
@ -2839,7 +2819,7 @@ skipArgs(const char *arg) {
static int static int
xmllintMain(int argc, const char **argv, xmlResourceLoader loader) { xmllintMain(int argc, const char **argv, xmlResourceLoader loader) {
int i, acount; int i, j;
int files = 0; int files = 0;
int version = 0; int version = 0;
int nowrap = 0; int nowrap = 0;
@ -2884,7 +2864,7 @@ xmllintMain(int argc, const char **argv, xmlResourceLoader loader) {
schematron = NULL; schematron = NULL;
wxschematron = NULL; wxschematron = NULL;
#endif #endif
repeat = 0; repeat = 1;
#if defined(LIBXML_HTML_ENABLED) #if defined(LIBXML_HTML_ENABLED)
html = 0; html = 0;
xmlout = 0; xmlout = 0;
@ -3065,7 +3045,7 @@ xmllintMain(int argc, const char **argv, xmlResourceLoader loader) {
generate++; generate++;
else if ((!strcmp(argv[i], "-repeat")) || else if ((!strcmp(argv[i], "-repeat")) ||
(!strcmp(argv[i], "--repeat"))) { (!strcmp(argv[i], "--repeat"))) {
if (repeat) if (repeat > 1)
repeat *= 10; repeat *= 10;
else else
repeat = 100; repeat = 100;
@ -3415,6 +3395,7 @@ xmllintMain(int argc, const char **argv, xmlResourceLoader loader) {
#endif /* LIBXML_READER_ENABLED && LIBXML_PATTERN_ENABLED */ #endif /* LIBXML_READER_ENABLED && LIBXML_PATTERN_ENABLED */
for (i = 1; i < argc ; i++) { for (i = 1; i < argc ; i++) {
xmlParserCtxtPtr ctxt;
const char *filename = argv[i]; const char *filename = argv[i];
#if HAVE_DECL_MMAP #if HAVE_DECL_MMAP
int memoryFd = -1; int memoryFd = -1;
@ -3449,51 +3430,46 @@ xmllintMain(int argc, const char **argv, xmlResourceLoader loader) {
} }
#endif /* HAVE_DECL_MMAP */ #endif /* HAVE_DECL_MMAP */
if ((timing) && (repeat)) if ((timing) && (repeat > 1))
startTimer(); startTimer();
if (repeat) {
xmlParserCtxtPtr ctxt;
#ifdef LIBXML_HTML_ENABLED
if (html) {
ctxt = htmlNewParserCtxt();
} else
#endif
{
ctxt = xmlNewParserCtxt(); ctxt = xmlNewParserCtxt();
if (ctxt == NULL) {
progresult = XMLLINT_ERR_MEM;
goto error;
}
for (acount = 0;acount < repeat;acount++) {
#ifdef LIBXML_READER_ENABLED
if (stream != 0) {
streamFile(filename);
} else {
#endif /* LIBXML_READER_ENABLED */
if (sax) {
testSAX(filename);
} else {
parseAndPrintFile(filename, ctxt);
}
#ifdef LIBXML_READER_ENABLED
}
#endif /* LIBXML_READER_ENABLED */
}
xmlFreeParserCtxt(ctxt);
} else {
#ifdef LIBXML_READER_ENABLED
if (stream != 0)
streamFile(filename);
else
#endif /* LIBXML_READER_ENABLED */
if (sax) {
testSAX(filename);
} else {
parseAndPrintFile(filename, NULL);
}
} }
files ++; if (ctxt == NULL) {
if ((timing) && (repeat)) { progresult = XMLLINT_ERR_MEM;
goto error;
}
for (j = 0; j < repeat; j++) {
#ifdef LIBXML_READER_ENABLED
if (stream != 0) {
streamFile(filename);
} else {
#endif /* LIBXML_READER_ENABLED */
if (sax) {
testSAX(filename);
} else {
parseAndPrintFile(filename, ctxt);
}
#ifdef LIBXML_READER_ENABLED
}
#endif /* LIBXML_READER_ENABLED */
}
xmlFreeParserCtxt(ctxt);
if ((timing) && (repeat > 1)) {
endTimer("%d iterations", repeat); endTimer("%d iterations", repeat);
} }
files += 1;
#if HAVE_DECL_MMAP #if HAVE_DECL_MMAP
if (memory) { if (memory) {
munmap(memoryData, memorySize); munmap(memoryData, memorySize);