You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2003/05/22 04:24:07 UTC
cvs commit: xml-xerces/c/src/xercesc/dom/impl DOMDocumentImpl.cpp DOMDocumentTypeImpl.cpp DOMDocumentTypeImpl.hpp
knoaman 2003/05/21 19:24:06
Modified: c/src/xercesc/dom/impl DOMDocumentImpl.cpp
DOMDocumentTypeImpl.cpp DOMDocumentTypeImpl.hpp
Log:
Handle allocation of document types not created by a DOM document.
Revision Changes Path
1.39 +5 -2 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp
Index: DOMDocumentImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- DOMDocumentImpl.cpp 18 May 2003 14:02:03 -0000 1.38
+++ DOMDocumentImpl.cpp 22 May 2003 02:24:06 -0000 1.39
@@ -487,8 +487,11 @@
throw DOMException(DOMException::HIERARCHY_REQUEST_ERR,0);
// if the newChild is a documenttype node created from domimplementation, set the ownerDoc first
- if ((newChild->getNodeType() == DOMNode::DOCUMENT_TYPE_NODE) && !newChild->getOwnerDocument())
+ if ((newChild->getNodeType() == DOMNode::DOCUMENT_TYPE_NODE)) {
+ if (!newChild->getOwnerDocument() ||
+ ((DOMDocumentTypeImpl*)newChild)->isOwnerDocSingleton())
((DOMDocumentTypeImpl*)newChild)->setOwnerDocument(this);
+ }
fParent.insertBefore(newChild,refChild);
1.21 +86 -134 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
Index: DOMDocumentTypeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DOMDocumentTypeImpl.cpp 20 Dec 2002 22:10:58 -0000 1.20
+++ DOMDocumentTypeImpl.cpp 22 May 2003 02:24:06 -0000 1.21
@@ -61,8 +61,11 @@
#include "DOMDocumentTypeImpl.hpp"
#include <xercesc/dom/DOMNode.hpp>
#include <xercesc/dom/DOMException.hpp>
+#include <xercesc/dom/DOMImplementationRegistry.hpp>
+#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLChar.hpp>
+#include <xercesc/util/XMLRegisterCleanup.hpp>
#include "DOMNamedNodeMapImpl.hpp"
#include "DOMDocumentImpl.hpp"
@@ -70,12 +73,49 @@
XERCES_CPP_NAMESPACE_BEGIN
+// ---------------------------------------------------------------------------
+// Local static data
+// ---------------------------------------------------------------------------
+
+static DOMDocument* sDocument = 0;
+static XMLRegisterCleanup documentCleanup;
+
+static void reinitDocument()
+{
+ if (sDocument) {
+ sDocument->release();
+ sDocument = 0;
+ }
+}
+
+static DOMDocument& gDocTypeDocument()
+{
+ if (!sDocument)
+ {
+ static const XMLCh gCoreStr[] = { chLatin_C, chLatin_o, chLatin_r, chLatin_e, chNull };
+ DOMImplementation* impl = DOMImplementationRegistry::getDOMImplementation(gCoreStr);
+ DOMDocument* tmpDoc = impl->createDocument(); // document type object (DTD).
+
+ if (XMLPlatformUtils::compareAndSwap((void**)&sDocument, tmpDoc, 0))
+ {
+ // Someone beat us to it, so let's clean up ours
+ delete tmpDoc;
+ }
+ else
+ {
+ documentCleanup.registerCleanup(reinitDocument);
+ }
+ }
+
+ return *sDocument;
+}
+
DOMDocumentTypeImpl::DOMDocumentTypeImpl(DOMDocument *ownerDoc,
const XMLCh *dtName,
bool heap)
- : fNode(ownerDoc),
- fParent(ownerDoc),
+ : fNode(ownerDoc ? ownerDoc : &gDocTypeDocument()),
+ fParent(ownerDoc ? ownerDoc : &gDocTypeDocument()),
fPublicId(0),
fSystemId(0),
fName(0),
@@ -86,18 +126,11 @@
fInternalSubset(0),
fIsCreatedFromHeap(heap)
{
- if (ownerDoc) {
- fName = ((DOMDocumentImpl *)ownerDoc)->getPooledString(dtName);
- fEntities = new (ownerDoc) DOMNamedNodeMapImpl(this);
- fNotations= new (ownerDoc) DOMNamedNodeMapImpl(this);
- fElements = new (ownerDoc) DOMNamedNodeMapImpl(this);
- }
- else {
- fName = XMLString::replicate(dtName);
- fEntities = new DOMNamedNodeMapImpl(this);
- fNotations= new DOMNamedNodeMapImpl(this);
- fElements = new DOMNamedNodeMapImpl(this);
- }
+ DOMDocument *doc = this->fNode.getOwnerDocument();
+ fName = ((DOMDocumentImpl *)doc)->getPooledString(dtName);
+ fEntities = new (doc) DOMNamedNodeMapImpl(this);
+ fNotations= new (doc) DOMNamedNodeMapImpl(this);
+ fElements = new (doc) DOMNamedNodeMapImpl(this);
};
@@ -107,8 +140,8 @@
const XMLCh *pubId,
const XMLCh *sysId,
bool heap)
- : fNode(ownerDoc),
- fParent(ownerDoc),
+ : fNode(ownerDoc ? ownerDoc : &gDocTypeDocument()),
+ fParent(ownerDoc ? ownerDoc : &gDocTypeDocument()),
fPublicId(0),
fSystemId(0),
fName(0),
@@ -129,7 +162,10 @@
XMLCh* newName;
XMLCh temp[4000];
if (index >= 3999)
- newName = new XMLCh[XMLString::stringLen(qualifiedName)+1];
+ newName = (XMLCh*) XMLPlatformUtils::fgMemoryManager->allocate
+ (
+ (XMLString::stringLen(qualifiedName)+1) * sizeof(XMLCh)
+ );//new XMLCh[XMLString::stringLen(qualifiedName)+1];
else
newName = temp;
@@ -148,26 +184,16 @@
}
if (index >= 3999)
- delete[] newName;
+ XMLPlatformUtils::fgMemoryManager->deallocate(newName);//delete[] newName;
}
- if (ownerDoc) {
- DOMDocumentImpl *docImpl = (DOMDocumentImpl *)ownerDoc;
- fPublicId = docImpl->cloneString(pubId);
- fSystemId = docImpl->cloneString(sysId);
- fName = ((DOMDocumentImpl *)ownerDoc)->getPooledString(qualifiedName);
- fEntities = new (ownerDoc) DOMNamedNodeMapImpl(this);
- fNotations= new (ownerDoc) DOMNamedNodeMapImpl(this);
- fElements = new (ownerDoc) DOMNamedNodeMapImpl(this);
- }
- else {
- fPublicId = XMLString::replicate(pubId);
- fSystemId = XMLString::replicate(sysId);
- fName = XMLString::replicate(qualifiedName);
- fEntities = new DOMNamedNodeMapImpl(this);
- fNotations= new DOMNamedNodeMapImpl(this);
- fElements = new DOMNamedNodeMapImpl(this);
- }
+ DOMDocument *doc = this->fNode.getOwnerDocument();
+ fPublicId = ((DOMDocumentImpl*) doc)->cloneString(pubId);
+ fSystemId = ((DOMDocumentImpl*) doc)->cloneString(sysId);
+ fName = ((DOMDocumentImpl*) doc)->getPooledString(qualifiedName);
+ fEntities = new (doc) DOMNamedNodeMapImpl(this);
+ fNotations= new (doc) DOMNamedNodeMapImpl(this);
+ fElements = new (doc) DOMNamedNodeMapImpl(this);
};
@@ -185,59 +211,29 @@
fInternalSubset(0),
fIsCreatedFromHeap(heap)
{
- if ((DOMDocumentImpl *)this->fNode.getOwnerDocument()) {
- fName = other.fName;
- if (deep)
- fParent.cloneChildren(&other);
- //DOM Level 2
- fPublicId = other.fPublicId;
- fSystemId = other.fSystemId;
- fInternalSubset = other.fInternalSubset;
- }
- else {
- fName = XMLString::replicate(other.fName);
- fPublicId = XMLString::replicate(other.fPublicId);
- fSystemId = XMLString::replicate(other.fSystemId);
- fInternalSubset = XMLString::replicate(other.fInternalSubset);
- }
+ fName = other.fName;
+ if (deep)
+ fParent.cloneChildren(&other);
+ //DOM Level 2
+ fPublicId = other.fPublicId;
+ fSystemId = other.fSystemId;
+ fInternalSubset = other.fInternalSubset;
fEntities = ((DOMNamedNodeMapImpl *)other.fEntities)->cloneMap(this);
fNotations= ((DOMNamedNodeMapImpl *)other.fNotations)->cloneMap(this);
fElements = ((DOMNamedNodeMapImpl *)other.fElements)->cloneMap(this);
-
}
DOMDocumentTypeImpl::~DOMDocumentTypeImpl()
{
- if (!(castToNodeImpl(this)->getOwnerDocument())) {
- XMLCh* temp = (XMLCh*) fName; // cast off const
- delete [] temp;
-
- temp = (XMLCh*) fPublicId; // cast off const
- delete [] temp;
-
- temp = (XMLCh*) fSystemId;
- delete [] temp;
-
- temp = (XMLCh*) fInternalSubset;
- delete [] temp;
-
- delete fEntities;
- delete fNotations;
- delete fElements;
- }
}
DOMNode *DOMDocumentTypeImpl::cloneNode(bool deep) const
{
DOMNode* newNode = 0;
- if (castToNodeImpl(this)->getOwnerDocument())
- newNode = new (castToNodeImpl(this)->getOwnerDocument(), DOMDocumentImpl::DOCUMENT_TYPE_OBJECT) DOMDocumentTypeImpl(*this, false, deep);
- else
- newNode = new DOMDocumentTypeImpl(*this, true, deep);
-
+ newNode = new (castToNodeImpl(this)->getOwnerDocument(), DOMDocumentImpl::DOCUMENT_TYPE_OBJECT) DOMDocumentTypeImpl(*this, false, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
}
@@ -247,46 +243,15 @@
* set the ownerDocument of this node and its children
*/
void DOMDocumentTypeImpl::setOwnerDocument(DOMDocument *doc) {
- if (castToNodeImpl(this)->getOwnerDocument()) {
+
+ if (doc) {
+
fNode.setOwnerDocument(doc);
fParent.setOwnerDocument(doc);
}
else {
- if (doc) {
- DOMDocumentImpl *docImpl = (DOMDocumentImpl *)doc;
-
- XMLCh* temp = (XMLCh*) fPublicId; // cast off const
- fPublicId = docImpl->cloneString(fPublicId);
- delete [] temp;
-
- temp = (XMLCh*) fSystemId; // cast off const
- fSystemId = docImpl->cloneString(fSystemId);
- delete [] temp;
-
- temp = (XMLCh*) fInternalSubset; // cast off const
- fInternalSubset = docImpl->cloneString(fInternalSubset);
- delete [] temp;
-
- temp = (XMLCh*) fName; // cast off const
- fName = docImpl->getPooledString(fName);
- delete [] temp;
-
- fNode.setOwnerDocument(doc);
- fParent.setOwnerDocument(doc);
-
- DOMNamedNodeMap* entitiesTemp = ((DOMNamedNodeMapImpl *)fEntities)->cloneMap(this);
- DOMNamedNodeMap* notationsTemp = ((DOMNamedNodeMapImpl *)fNotations)->cloneMap(this);
- DOMNamedNodeMap* elementsTemp = ((DOMNamedNodeMapImpl *)fElements)->cloneMap(this);
-
- delete fEntities;
- delete fNotations;
- delete fElements;
-
- fEntities = entitiesTemp;
- fNotations = notationsTemp;
- fElements = elementsTemp;
-
- }
+ fNode.setOwnerDocument(&gDocTypeDocument());
+ fParent.setOwnerDocument(&gDocTypeDocument());
}
}
@@ -369,47 +334,29 @@
//set functions
-void DOMDocumentTypeImpl::setPublicId(const XMLCh *value)
+void DOMDocumentTypeImpl::setPublicId(const XMLCh *value)
{
// revist. Why shouldn't 0 be assigned like any other value?
if (value == 0)
return;
- if ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())
- fPublicId = ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())->cloneString(value);
- else {
- XMLCh* temp = (XMLCh*) fPublicId; // cast off const
- delete [] temp;
- fPublicId = XMLString::replicate(value);
- }
+ fPublicId = ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())->cloneString(value);
}
-void DOMDocumentTypeImpl::setSystemId(const XMLCh *value)
+void DOMDocumentTypeImpl::setSystemId(const XMLCh *value)
{
if (value == 0)
return;
- if ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())
- fSystemId = ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())->cloneString(value);
- else {
- XMLCh* temp = (XMLCh*) fSystemId; // cast off const
- delete [] temp;
- fSystemId = XMLString::replicate(value);
- }
+ fSystemId = ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())->cloneString(value);
}
-void DOMDocumentTypeImpl::setInternalSubset(const XMLCh *value)
+void DOMDocumentTypeImpl::setInternalSubset(const XMLCh *value)
{
if (value == 0)
return;
- if ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())
- fInternalSubset = ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())->cloneString(value);
- else {
- XMLCh* temp = (XMLCh*) fInternalSubset; // cast off const
- delete [] temp;
- fInternalSubset = XMLString::replicate(value);
- }
+ fInternalSubset = ((DOMDocumentImpl *)castToNodeImpl(this)->getOwnerDocument())->cloneString(value);
}
void DOMDocumentTypeImpl::release()
@@ -579,6 +526,11 @@
return fParent.isEqualNode(arg);
};
+
+bool DOMDocumentTypeImpl::isOwnerDocSingleton() const
+{
+ return (fIsCreatedFromHeap && (castToNodeImpl(this)->getOwnerDocument() == &gDocTypeDocument()));
+}
XERCES_CPP_NAMESPACE_END
1.12 +5 -2 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
Index: DOMDocumentTypeImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMDocumentTypeImpl.hpp 3 Apr 2003 21:00:15 -0000 1.11
+++ DOMDocumentTypeImpl.hpp 22 May 2003 02:24:06 -0000 1.12
@@ -99,7 +99,7 @@
const XMLCh * fSystemId;
const XMLCh * fInternalSubset;
- bool fIntSubsetReading;
+ bool fIntSubsetReading;
bool fIsCreatedFromHeap;
virtual void setPublicId(const XMLCh * value);
@@ -132,6 +132,9 @@
virtual const XMLCh * getPublicId() const;
virtual const XMLCh * getSystemId() const;
virtual const XMLCh * getInternalSubset() const;
+
+ //
+ bool isOwnerDocSingleton() const;
};
XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org