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

small fix from Rob Richards for input filename fixes for --repeat and

Browse Source 
* parserInternals.c: small fix from Rob Richards for input filename
* xmllint.c: fixes for --repeat and --memory/--stream for speed tests
* xmlIO: adding a guard in one function
Daniel
This commit is contained in:
Daniel Veillard 2003-09-17 19:36:25 +00:00
parent 1989505ac7
commit 8d8bf2c5f6
4 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Sep 17 21:33:57 CEST 2003 Daniel Veillard <daniel@veillard.com>
* parserInternals.c: small fix from Rob Richards for input filename
* xmllint.c: fixes for --repeat and --memory/--stream for speed tests
* xmlIO: adding a guard in one function
Wed Sep 17 15:57:44 CEST 2003 Daniel Veillard <daniel@veillard.com>
* SAX2.c xmlreader.c include/libxml/parser.h: more performance hunting

2
parserInternals.c
View File

@ -2167,7 +2167,7 @@ xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) {
return(NULL);
}
inputStream->filename = (const char *) URI;
inputStream->filename = (char *) xmlCanonicPath((const xmlChar *) URI);
inputStream->directory = directory;
inputStream->buf = buf;

2
xmlIO.c
View File

@ -1643,6 +1643,8 @@ xmlAllocOutputBuffer(xmlCharEncodingHandlerPtr encoder) {
*/
void
xmlFreeParserInputBuffer(xmlParserInputBufferPtr in) {
if (in == NULL) return;
if (in->raw) {
xmlBufferFree(in->raw);
in->raw = NULL;

42
xmllint.c
View File

@ -609,8 +609,28 @@ static void processNode(xmlTextReaderPtr reader) {
static void streamFile(char *filename) {
xmlTextReaderPtr reader;
int ret;
#ifdef HAVE_SYS_MMAN_H
int fd = -1;
struct stat info;
const char *base = NULL;
xmlParserInputBufferPtr input = NULL;
if (memory) {
if (stat(filename, &info) < 0)
return;
if ((fd = open(filename, O_RDONLY)) < 0)
return;
base = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, fd, 0) ;
if (base == (void *) MAP_FAILED)
return;
input = xmlParserInputBufferCreateMem((char *) base, info.st_size,
XML_CHAR_ENCODING_NONE);
reader = xmlNewTextReader(input, filename);
} else
#endif
reader = xmlNewTextReaderFilename(filename);
reader = xmlNewTextReaderFilename(filename);
if (reader != NULL) {
if (valid)
xmlTextReaderSetParserProp(reader, XML_PARSER_VALIDATE, 1);
@ -685,6 +705,13 @@ static void streamFile(char *filename) {
fprintf(stderr, "Unable to open %s\n", filename);
progresult = 1;
}
#ifdef HAVE_SYS_MMAN_H
if (memory) {
xmlFreeParserInputBuffer(input);
munmap((char *) base, info.st_size);
close(fd);
}
#endif
}
/************************************************************************
@ -1426,9 +1453,12 @@ main(int argc, char **argv) {
(!strcmp(argv[i], "--auto")))
generate++;
else if ((!strcmp(argv[i], "-repeat")) ||
(!strcmp(argv[i], "--repeat")))
repeat++;
else if ((!strcmp(argv[i], "-push")) ||
(!strcmp(argv[i], "--repeat"))) {
if (repeat)
repeat *= 10;
else
repeat = 100;
} else if ((!strcmp(argv[i], "-push")) ||
(!strcmp(argv[i], "--push")))
push++;
#ifdef HAVE_SYS_MMAN_H
@ -1664,7 +1694,7 @@ main(int argc, char **argv) {
/* Remember file names. "-" means stdin. <sven@zen.org> */
if ((argv[i][0] != '-') || (strcmp(argv[i], "-") == 0)) {
if (repeat) {
for (acount = 0;acount < 100 * repeat;acount++)
for (acount = 0;acount < repeat;acount++)
if (stream != 0)
streamFile(argv[i]);
else
@ -1677,7 +1707,7 @@ main(int argc, char **argv) {
}
files ++;
if ((timing) && (repeat)) {
endTimer("100 iterations");
endTimer("%d iterations", repeat);
}
}
}