From 25c90c589b256f0925f081198c1525134a491e31 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 2 Mar 2005 10:47:41 +0000 Subject: [PATCH] try to fix a problem with valgrind. applied memory leak fix from Brent * Makefile.am doc/examples/Makefile.am python/tests/Makefile.am xstc/Makefile.am: try to fix a problem with valgrind. * python/generator.py python/libxml.c python/tests/Makefile.am python/tests/tstmem.py: applied memory leak fix from Brent Hendricks c.f. bug #165349 Daniel --- ChangeLog | 8 ++++++++ Makefile.am | 2 +- doc/examples/Makefile.am | 2 +- doc/examples/index.py | 2 +- python/generator.py | 2 ++ python/libxml.c | 26 ++++++++++++++++++++++++++ python/tests/Makefile.am | 3 ++- python/tests/tstmem.py | 36 ++++++++++++++++++++++++++++++++++++ xstc/Makefile.am | 2 +- 9 files changed, 78 insertions(+), 5 deletions(-) create mode 100755 python/tests/tstmem.py diff --git a/ChangeLog b/ChangeLog index e0d92285..02c45c61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Mar 2 11:45:18 CET 2005 Daniel Veillard + + * Makefile.am doc/examples/Makefile.am python/tests/Makefile.am + xstc/Makefile.am: try to fix a problem with valgrind. + * python/generator.py python/libxml.c python/tests/Makefile.am + python/tests/tstmem.py: applied memory leak fix from Brent Hendricks + c.f. bug #165349 + Mon Feb 28 11:18:24 CET 2005 Kasimier Buchcik * tree.c: Changed xmlSearchNsByHref to call xmlNsInScope with diff --git a/Makefile.am b/Makefile.am index a745e0bf..c857b62c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -156,7 +156,7 @@ tests: XMLtests XMLenttests NStests IDtests Errtests APItests @READER_TEST@ @TES valgrind: @echo '## Running the regression tests under Valgrind' @echo '## Go get a cup of coffee it is gonna take a while ...' - $(MAKE) CHECKER='valgrind -q' tests + $(MAKE) CHECKER='valgrind' tests APItests: testapi$(EXEEXT) @echo "## Running the API regression tests this may take a little while" diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index a3ef18fa..97edc550 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -95,7 +95,7 @@ reader3_DEPENDENCIES= $(DEPS) reader3_LDADD= @RDL_LIBS@ $(LDADDS) valgrind: - $(MAKE) CHECKER='valgrind -q' tests + $(MAKE) CHECKER='valgrind' tests tests: $(noinst_PROGRAMS) @(echo '## examples regression tests') diff --git a/doc/examples/index.py b/doc/examples/index.py index db411657..11df6f0f 100755 --- a/doc/examples/index.py +++ b/doc/examples/index.py @@ -249,7 +249,7 @@ install-data-local: for example in examples: Makefile = Makefile + "%s_SOURCES=%s.c\n%s_LDFLAGS=\n%s_DEPENDENCIES= $(DEPS)\n%s_LDADD= @RDL_LIBS@ $(LDADDS)\n\n" % (example, example, example, example, example) - Makefile = Makefile + "valgrind: \n\t$(MAKE) CHECKER='valgrind -q' tests\n\n" + Makefile = Makefile + "valgrind: \n\t$(MAKE) CHECKER='valgrind' tests\n\n" Makefile = Makefile + "tests: $(noinst_PROGRAMS)\n" Makefile = Makefile + "\t@(echo '## examples regression tests')\n" Makefile = Makefile + "\t@(echo > .memdump)\n" diff --git a/python/generator.py b/python/generator.py index f2c79392..8add0a93 100755 --- a/python/generator.py +++ b/python/generator.py @@ -344,6 +344,8 @@ def skip_function(name): # the next function is defined in libxml.c if name == "xmlRelaxNGFreeValidCtxt": return 1 + if name == "xmlFreeValidCtxt": + return 1 # # Those are skipped because the Const version is used of the bindings # instead. diff --git a/python/libxml.c b/python/libxml.c index ae1a0f4a..b5209949 100644 --- a/python/libxml.c +++ b/python/libxml.c @@ -1858,6 +1858,31 @@ libxml_xmlSetValidErrors(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) return (py_retval); } + +PyObject * +libxml_xmlFreeValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + xmlValidCtxtPtr cur; + xmlValidCtxtPyCtxtPtr pyCtxt; + PyObject *pyobj_cur; + + if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeValidCtxt", &pyobj_cur)) + return(NULL); + cur = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_cur); + + pyCtxt = (xmlValidCtxtPyCtxtPtr)(cur->userData); + if (pyCtxt != NULL) + { + Py_XDECREF(pyCtxt->error); + Py_XDECREF(pyCtxt->warn); + Py_XDECREF(pyCtxt->arg); + xmlFree(pyCtxt); + } + + xmlFreeValidCtxt(cur); + Py_INCREF(Py_None); + return(Py_None); +} + /************************************************************************ * * * Per xmlTextReader error handler * @@ -3618,6 +3643,7 @@ static PyMethodDef libxmlMethods[] = { {(char *) "doc", libxml_doc, METH_VARARGS, NULL}, {(char *) "xmlNewNode", libxml_xmlNewNode, METH_VARARGS, NULL}, {(char *)"xmlSetValidErrors", libxml_xmlSetValidErrors, METH_VARARGS, NULL}, + {(char *)"xmlFreeValidCtxt", libxml_xmlFreeValidCtxt, METH_VARARGS, NULL}, #ifdef LIBXML_OUTPUT_ENABLED {(char *) "serializeNode", libxml_serializeNode, METH_VARARGS, NULL}, {(char *) "saveNodeTo", libxml_saveNodeTo, METH_VARARGS, NULL}, diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 3fb29590..23f031e8 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -37,7 +37,8 @@ PYTESTS= \ sync.py \ tstLastError.py \ indexes.py \ - dtdvalid.py + dtdvalid.py \ + tstmem.py XMLS= \ tst.xml \ diff --git a/python/tests/tstmem.py b/python/tests/tstmem.py new file mode 100755 index 00000000..553096d3 --- /dev/null +++ b/python/tests/tstmem.py @@ -0,0 +1,36 @@ +#!/usr/bin/python -u +import libxml2 +import libxml2mod +import sys + +def error(msg, data): + pass + +# Memory debug specific +libxml2.debugMemory(1) + +dtd="""""" +instance=""" +""" + +dtd = libxml2.parseDTD(None, 'test.dtd') +ctxt = libxml2.newValidCtxt() +libxml2mod.xmlSetValidErrors(ctxt._o, error, error) +doc = libxml2.parseDoc(instance) +ret = doc.validateDtd(ctxt, dtd) +if ret != 1: + print "error doing DTD validation" + sys.exit(1) + +doc.freeDoc() +dtd.freeDtd() +del dtd +del ctxt + +# Memory debug specific +libxml2.cleanupParser() +if libxml2.debugMemory(1) == 0: + print "OK" +else: + print "Memory leak %d bytes" % (libxml2.debugMemory(1)) + libxml2.dumpMemory() diff --git a/xstc/Makefile.am b/xstc/Makefile.am index 82de1ef6..e7e128bd 100644 --- a/xstc/Makefile.am +++ b/xstc/Makefile.am @@ -94,7 +94,7 @@ tests: valgrind: -@(if [ -x $(PYTHON) ] ; then \ echo '## Running the regression tests under Valgrind' ; \ - $(MAKE) CHECKER='valgrind -q' MAKEFLAGS+=--silent pytests ; fi); + $(MAKE) CHECKER='valgrind' MAKEFLAGS+=--silent pytests ; fi); clean: rm -f $(PYSCRIPTS) test.log