Changeset 28163 in vbox

Timestamp:

Apr 11, 2010 5:15:21 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: xml optimizations, preps for better namespace support

Location:

trunk

Files:

• include/iprt/cpp/xml.h (modified) (5 diffs)
• src/VBox/Runtime/r3/xml.cpp (modified) (17 diffs)

trunk/include/iprt/cpp/xml.h

@@ -48 +48 @@
 typedef xmlError *xmlErrorPtr;
 
+typedef struct _xmlAttr xmlAttr;
+typedef struct _xmlNode xmlNode;
+
 namespace xml
 {
@@ -454 +457 @@
     int isElement()
     {
-        return mType == IsElement;
+        return m_Type == IsElement;
     }
 
 protected:
     typedef enum {IsElement, IsAttribute, IsContent} EnumType;
-    EnumType mType;
+
+    EnumType    m_Type;
+    Node        *m_pParent;
+    xmlNode     *m_plibNode;            // != NULL if this is an element or content node
+    xmlAttr     *m_plibAttr;            // != NULL if this is an attribute node
+    const char  *m_pcszNamespace;
+    const char  *m_pcszName;            // element or attribute name, points either into plibNode or plibAttr;
+                                        // NULL if this is a content node
 
     // hide the default constructor so people use only our factory methods
-    Node(EnumType type);
+    Node(EnumType type,
+         Node *pParent,
+         xmlNode *plibNode,
+         xmlAttr *plibAttr);
     Node(const Node &x);      // no copying
 
@@ -517 +530 @@
 protected:
     // hide the default constructor so people use only our factory methods
-    ElementNode();
+    ElementNode(Node *pParent, xmlNode *plibNode);
     ElementNode(const ElementNode &x);      // no copying
 
@@ -531 +544 @@
 protected:
     // hide the default constructor so people use only our factory methods
-    ContentNode();
+    ContentNode(Node *pParent, xmlNode *plibNode);
     ContentNode(const ContentNode &x);      // no copying
 
@@ -544 +557 @@
 protected:
     // hide the default constructor so people use only our factory methods
-    AttributeNode();
+    AttributeNode(Node *pParent, xmlAttr *plibAttr);
     AttributeNode(const AttributeNode &x);      // no copying
 

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -420 +420 @@
 struct Node::Data
 {
-    xmlNode     *plibNode;          // != NULL if this is an element or content node
-    xmlAttr     *plibAttr;          // != NULL if this is an attribute node
-
-    Node        *pParent;           // NULL only for the root element
-    const char  *pcszName;          // element or attribute name, points either into plibNode or plibAttr;
-                                    // NULL if this is a content node
-
     struct compare_const_char
     {
@@ -444 +437 @@
 };
 
-Node::Node(EnumType type)
-    : mType(type),
+Node::Node(EnumType type,
+           Node *pParent,
+           xmlNode *plibNode,
+           xmlAttr *plibAttr)
+    : m_Type(type),
+      m_pParent(pParent),
+      m_plibNode(plibNode),
+      m_plibAttr(plibAttr),
+      m_pcszNamespace(NULL),
+      m_pcszName(NULL),
       m(new Data)
 {
-    m->plibNode = NULL;
-    m->plibAttr = NULL;
-    m->pParent = NULL;
 }
 
@@ -461 +459 @@
 {
     // go thru this element's attributes
-    xmlAttr *plibAttr = m->plibNode->properties;
+    xmlAttr *plibAttr = m_plibNode->properties;
     while (plibAttr)
     {
         const char *pcszAttribName = (const char*)plibAttr->name;
-        boost::shared_ptr<AttributeNode> pNew(new AttributeNode);
-        pNew->m->plibAttr = plibAttr;
-        pNew->m->pcszName = (const char*)plibAttr->name;
-        pNew->m->pParent = this;
+        boost::shared_ptr<AttributeNode> pNew(new AttributeNode(this, plibAttr));
         // store
         m->attribs[pcszAttribName] = pNew;
@@ -476 +471 @@
 
     // go thru this element's child elements
-    xmlNodePtr plibNode = m->plibNode->children;
+    xmlNodePtr plibNode = m_plibNode->children;
     while (plibNode)
     {
@@ -482 +477 @@
 
         if (plibNode->type == XML_ELEMENT_NODE)
-            pNew = boost::shared_ptr<Node>(new ElementNode);
+            pNew = boost::shared_ptr<Node>(new ElementNode(this, plibNode));
         else if (plibNode->type == XML_TEXT_NODE)
-            pNew = boost::shared_ptr<Node>(new ContentNode);
+            pNew = boost::shared_ptr<Node>(new ContentNode(this, plibNode));
         if (pNew)
         {
-            pNew->m->plibNode = plibNode;
-            pNew->m->pcszName = (const char*)plibNode->name;
-            pNew->m->pParent = this;
             // store
             m->children.push_back(pNew);
@@ -503 +495 @@
 const char* Node::getName() const
 {
-    return m->pcszName;
+    return m_pcszName;
 }
 
@@ -514 +506 @@
 bool Node::nameEquals(const char *pcszNamespace, const char *pcsz) const
 {
-    if (m->pcszName == pcsz)
+    if (m_pcszName == pcsz)
         return true;
-    if (m->pcszName == NULL)
+    if (m_pcszName == NULL)
         return false;
     if (pcsz == NULL)
         return false;
-    if (strcmp(m->pcszName, pcsz))
+    if (strcmp(m_pcszName, pcsz))
         return false;
 
@@ -527 +519 @@
         return true;
     // caller wants namespace:
-    if (    !m->plibNode->ns
-         || !m->plibNode->ns->prefix
-         || !*m->plibNode->ns->prefix
-       )
+    if (!m_pcszNamespace)
         // but node has no namespace:
         return false;
-    return !strcmp((const char*)m->plibNode->ns->prefix, pcszNamespace);
+    return !strcmp(m_pcszNamespace, pcszNamespace);
 }
 
@@ -544 +533 @@
 const char* Node::getValue() const
 {
-    if (    (m->plibAttr)
-         && (m->plibAttr->children)
+    if (    (m_plibAttr)
+         && (m_plibAttr->children)
        )
         // libxml hides attribute values in another node created as a
         // single child of the attribute node, and it's in the content field
-        return (const char*)m->plibAttr->children->content;
-
-    if (    (m->plibNode)
-         && (m->plibNode->children)
+        return (const char*)m_plibAttr->children->content;
+
+    if (    (m_plibNode)
+         && (m_plibNode->children)
        )
-        return (const char*)m->plibNode->children->content;
+        return (const char*)m_plibNode->children->content;
 
     return NULL;
@@ -634 +623 @@
 int Node::getLineNumber() const
 {
-    if (m->plibAttr)
-        return m->pParent->m->plibNode->line;
-
-    return m->plibNode->line;
-}
-
-ElementNode::ElementNode()
-    : Node(IsElement)
-{
+    if (m_plibAttr)
+        return m_pParent->m_plibNode->line;
+
+    return m_plibNode->line;
+}
+
+ElementNode::ElementNode(Node *pParent, xmlNode *plibNode)
+    : Node(IsElement,
+           pParent,
+           plibNode,
+           NULL)
+{
+    m_pcszName = (const char*)plibNode->name;
+
+    if (    plibNode->ns
+         && plibNode->ns->prefix
+       )
+        m_pcszNamespace = (const char*)m_plibNode->ns->prefix;
 }
 
@@ -921 +919 @@
 {
     // we must be an element, not an attribute
-    if (!m->plibNode)
+    if (!m_plibNode)
         throw ENodeIsNotElement(RT_SRC_POS);
 
@@ -929 +927 @@
                                 (const xmlChar*)pcszElementName)))
         throw std::bad_alloc();
-    xmlAddChild(m->plibNode, plibNode);
+    xmlAddChild(m_plibNode, plibNode);
 
     // now wrap this in C++
-    ElementNode *p = new ElementNode;
+    ElementNode *p = new ElementNode(this, plibNode);
     boost::shared_ptr<ElementNode> pNew(p);
-    pNew->m->plibNode = plibNode;
-    pNew->m->pcszName = (const char*)plibNode->name;
-
     m->children.push_back(pNew);
 
@@ -956 +951 @@
     if (!(plibNode = xmlNewText((const xmlChar*)pcszContent)))
         throw std::bad_alloc();
-    xmlAddChild(m->plibNode, plibNode);
+    xmlAddChild(m_plibNode, plibNode);
 
     // now wrap this in C++
-    ContentNode *p = new ContentNode;
+    ContentNode *p = new ContentNode(this, plibNode);
     boost::shared_ptr<ContentNode> pNew(p);
-    pNew->m->plibNode = plibNode;
-    pNew->m->pcszName = NULL;
-
     m->children.push_back(pNew);
 
@@ -988 +980 @@
     {
         // libxml side: xmlNewProp creates an attribute
-        xmlAttr *plibAttr = xmlNewProp(m->plibNode, (xmlChar*)pcszName, (xmlChar*)pcszValue);
+        xmlAttr *plibAttr = xmlNewProp(m_plibNode, (xmlChar*)pcszName, (xmlChar*)pcszValue);
         const char *pcszAttribName = (const char*)plibAttr->name;
 
         // C++ side: create an attribute node around it
-        boost::shared_ptr<AttributeNode> pNew(new AttributeNode);
-        pNew->m->plibAttr = plibAttr;
-        pNew->m->pcszName = (const char*)plibAttr->name;
-        pNew->m->pParent = this;
+        boost::shared_ptr<AttributeNode> pNew(new AttributeNode(this, plibAttr));
         // store
         m->attribs[pcszAttribName] = pNew;
@@ -1059 +1048 @@
 }
 
-AttributeNode::AttributeNode()
-    : Node(IsAttribute)
-{
-}
-
-ContentNode::ContentNode()
-    : Node(IsContent)
+AttributeNode::AttributeNode(Node *pParent, xmlAttr *plibAttr)
+    : Node(IsAttribute,
+           pParent,
+           NULL,
+           plibAttr)
+{
+    m_pcszName = (const char*)plibAttr->name;
+}
+
+ContentNode::ContentNode(Node *pParent, xmlNode *plibNode)
+    : Node(IsContent,
+           pParent,
+           plibNode,
+           NULL)
 {
 }
@@ -1195 +1191 @@
 void Document::refreshInternals() // private
 {
-    m->pRootElement = new ElementNode();
-    m->pRootElement->m->plibNode = xmlDocGetRootElement(m->plibDocument);
-    m->pRootElement->m->pcszName = (const char*)m->pRootElement->m->plibNode->name;
+    m->pRootElement = new ElementNode(NULL, xmlDocGetRootElement(m->plibDocument));
 
     m->pRootElement->buildChildren();
@@ -1240 +1234 @@
 
     // now wrap this in C++
-    m->pRootElement = new ElementNode();
-    m->pRootElement->m->plibNode = plibRootNode;
-    m->pRootElement->m->pcszName = (const char*)plibRootNode->name;
+    m->pRootElement = new ElementNode(NULL, plibRootNode);
 
     return m->pRootElement;