Fix for bug 106796 (Improve GetNameSpaceID() performance). r/sr=jst.

2005-09-11 11:24:16 +00:00 · 2005-09-11 11:24:16 +00:00 · 28e03d4aa6
--- a/content/base/public/nsINameSpaceManager.h
+++ b/content/base/public/nsINameSpaceManager.h
@ -67,8 +67,8 @@ static const PRInt32 kNameSpaceID_None = 0;
 #define NS_NAMESPACEMANAGER_CONTRACTID "@mozilla.org/content/namespacemanager;1"

 #define NS_INAMESPACEMANAGER_IID \
-  { 0x30977ca5, 0xc6af, 0x4687, \
-    { 0x88, 0x43, 0xa9, 0x7d, 0x0f, 0x95, 0x00, 0x17 } }
+  { 0xd74e83e6, 0xf932, 0x4289, \
+    { 0xac, 0x95, 0x9e, 0x10, 0x24, 0x30, 0x88, 0xd6 } }

 /**
 * The Name Space Manager tracks the associtation between a NameSpace
@ -89,13 +89,11 @@ class nsINameSpaceManager : public nsISupports
 public:
  NS_DEFINE_STATIC_IID_ACCESSOR(NS_INAMESPACEMANAGER_IID)

-  NS_IMETHOD RegisterNameSpace(const nsAString& aURI, 
-                               PRInt32& aNameSpaceID) = 0;
+  virtual nsresult RegisterNameSpace(const nsAString& aURI,
+                                     PRInt32& aNameSpaceID) = 0;

-  NS_IMETHOD GetNameSpaceURI(PRInt32 aNameSpaceID,
-                             nsAString& aURI) = 0;
-  NS_IMETHOD GetNameSpaceID(const nsAString& aURI,
-                            PRInt32* aNameSpaceID) = 0;
+  virtual nsresult GetNameSpaceURI(PRInt32 aNameSpaceID, nsAString& aURI) = 0;
+  virtual PRInt32 GetNameSpaceID(const nsAString& aURI) = 0;

  virtual PRBool HasElementCreator(PRInt32 aNameSpaceID) = 0;
 };
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@ -1663,7 +1663,7 @@ nsContentUtils::SplitQName(nsIContent* aNamespaceResolver,
                            nameSpace);
    NS_ENSURE_SUCCESS(rv, rv);

-    NameSpaceManager()->GetNameSpaceID(nameSpace, aNamespace);
+    *aNamespace = NameSpaceManager()->GetNameSpaceID(nameSpace);
    if (*aNamespace == kNameSpaceID_Unknown)
      return NS_ERROR_FAILURE;

--- a/content/base/src/nsDOMAttributeMap.cpp
+++ b/content/base/src/nsDOMAttributeMap.cpp
@ -389,8 +389,8 @@ nsDOMAttributeMap::GetNamedItemNSInternal(const nsAString& aNamespaceURI,
  PRInt32 nameSpaceID = kNameSpaceID_None;

  if (!aNamespaceURI.IsEmpty()) {
-    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI,
-                                                       &nameSpaceID);
+    nameSpaceID =
+      nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI);

    if (nameSpaceID == kNameSpaceID_Unknown) {
      return NS_OK;
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@ -2726,8 +2726,8 @@ nsDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
  nsContentList *list = nsnull;

  if (!aNamespaceURI.EqualsLiteral("*")) {
-    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI,
-                                                       &nameSpaceId);
+    nameSpaceId =
+      nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI);

    if (nameSpaceId == kNameSpaceID_Unknown) {
      // Unknown namespace means no matches, we create an empty list...
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@ -416,9 +416,8 @@ nsNode3Tearoff::LookupPrefix(const nsAString& aNamespaceURI,
  // XXX Waiting for DOM spec to list error codes.

  // Get the namespace id for the URI
-  PRInt32 namespaceId;
-  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI,
-                                                     &namespaceId);
+  PRInt32 namespaceId =
+    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI);
  if (namespaceId == kNameSpaceID_Unknown) {
    return NS_OK;
  }
@ -1519,8 +1518,8 @@ nsGenericElement::GetAttributeNS(const nsAString& aNamespaceURI,
                                 const nsAString& aLocalName,
                                 nsAString& aReturn)
 {
-  PRInt32 nsid;
-  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI, &nsid);
+  PRInt32 nsid =
+    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI);

  if (nsid == kNameSpaceID_Unknown) {
    // Unknown namespace means no attr...
@ -1557,9 +1556,8 @@ nsGenericElement::RemoveAttributeNS(const nsAString& aNamespaceURI,
                                    const nsAString& aLocalName)
 {
  nsCOMPtr<nsIAtom> name = do_GetAtom(aLocalName);
-  PRInt32 nsid;
-
-  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI, &nsid);
+  PRInt32 nsid =
+    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI);

  if (nsid == kNameSpaceID_Unknown) {
    // Unknown namespace means no attr...
@ -1631,8 +1629,8 @@ nsGenericElement::GetElementsByTagNameNS(const nsAString& aNamespaceURI,

  nsIDocument* document = GetCurrentDoc();
  if (!aNamespaceURI.EqualsLiteral("*")) {
-    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI,
-                                                       &nameSpaceId);
+    nameSpaceId =
+      nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI);

    if (nameSpaceId == kNameSpaceID_Unknown) {
      // Unknown namespace means no matches, we create an empty list...
@ -1673,8 +1671,8 @@ nsGenericElement::HasAttributeNS(const nsAString& aNamespaceURI,
 {
  NS_ENSURE_ARG_POINTER(aReturn);

-  PRInt32 nsid;
-  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI, &nsid);
+  PRInt32 nsid =
+    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI);

  if (nsid == kNameSpaceID_Unknown) {
    // Unknown namespace means no attr...
--- a/content/base/src/nsNameSpaceManager.cpp
+++ b/content/base/src/nsNameSpaceManager.cpp
@ -40,8 +40,7 @@
 #include "nsINodeInfo.h"
 #include "nsCOMArray.h"
 #include "nsContentCreatorFunctions.h"
-#include "nsDoubleHashtable.h"
-#include "nsLayoutAtoms.h"
+#include "nsDataHashtable.h"
 #include "nsString.h"

 #ifdef MOZ_XTF
@ -70,92 +69,74 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #define kWAIRolesNameSpaceURI "http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
 #define kWAIPropertiesNameSpaceURI "http://www.w3.org/2005/07/aaa"

-class nsNameSpaceEntry : public PLDHashEntryHdr
+class nsNameSpaceKey : public PLDHashEntryHdr
 {
 public:
-  nsNameSpaceEntry(const void* aKey) :
-    mKey(NS_STATIC_CAST(const nsAString*, aKey))
+  typedef const nsAString* KeyType;
+  typedef const nsAString* KeyTypePointer;
+
+  nsNameSpaceKey(KeyTypePointer aKey) : mKey(aKey)
  {
  }
-  ~nsNameSpaceEntry()
+  nsNameSpaceKey(const nsNameSpaceKey& toCopy) : mKey(toCopy.mKey)
  {
  }
-  const void* GetKey() const {
+
+  KeyType GetKey() const
+  {
    return mKey;
  }
-  static PLDHashNumber HashKey(const void* aKey) {
-    return HashString(*NS_STATIC_CAST(const nsAString*, aKey));
+  KeyTypePointer GetKeyPointer() const
+  {
+    return mKey;
  }
-  PRBool MatchEntry(const void* aKey) const {
-    return NS_STATIC_CAST(const nsAString*, aKey)->Equals(*mKey);
+  PRBool KeyEquals(KeyType aKey) const
+  {
+    return mKey->Equals(*aKey);
  }

+  static KeyTypePointer KeyToPointer(KeyType aKey)
+  {
+    return aKey;
+  }
+  static PLDHashNumber HashKey(KeyTypePointer aKey) {
+    return HashString(*aKey);
+  }
+
+  enum { 
+    ALLOW_MEMMOVE = PR_TRUE
+  };
+
+private:
  const nsAString* mKey;
-  PRInt32 mNameSpaceID;
-};
-
-DECL_DHASH_WRAPPER(nsNameSpaceHashBase, nsNameSpaceEntry, nsAString&)
-DHASH_WRAPPER(nsNameSpaceHashBase, nsNameSpaceEntry, nsAString&)
-
-class nsNameSpaceHash : public nsNameSpaceHashBase
-{
-public:
-  nsNameSpaceHash()
-  {
-  }
-  ~nsNameSpaceHash()
-  {
-  }
-  nsNameSpaceEntry* LookupEntry(const nsAString& aUri)
-  {
-    return NS_STATIC_CAST(nsNameSpaceEntry*,
-                          PL_DHashTableOperate(&mHashTable, &aUri,
-                                               PL_DHASH_LOOKUP));
-  }
 };

 class NameSpaceManagerImpl : public nsINameSpaceManager {
 public:
-  NameSpaceManagerImpl();
-  virtual ~NameSpaceManagerImpl();
+  virtual ~NameSpaceManagerImpl()
+  {
+  }

  NS_DECL_ISUPPORTS

  nsresult Init();

-  NS_IMETHOD RegisterNameSpace(const nsAString& aURI, 
-			                         PRInt32& aNameSpaceID);
+  nsresult RegisterNameSpace(const nsAString& aURI,  PRInt32& aNameSpaceID);

-  NS_IMETHOD GetNameSpaceURI(PRInt32 aNameSpaceID, nsAString& aURI);
-  NS_IMETHOD GetNameSpaceID(const nsAString& aURI,
-                            PRInt32* aNameSpaceID);
+  nsresult GetNameSpaceURI(PRInt32 aNameSpaceID, nsAString& aURI);
+  PRInt32 GetNameSpaceID(const nsAString& aURI);

  PRBool HasElementCreator(PRInt32 aNameSpaceID);

-  PRBool HasNameSpaceURI(PRInt32 aNameSpaceID);
-
 private:
-  // These are not supported and are not implemented!
-  NameSpaceManagerImpl(const NameSpaceManagerImpl& aCopy);
-  NameSpaceManagerImpl& operator=(const NameSpaceManagerImpl& aCopy);
-
  nsresult AddNameSpace(const nsAString& aURI, const PRInt32 aNameSpaceID);

-  nsNameSpaceHash mURIToIDTable;
+  nsDataHashtable<nsNameSpaceKey,PRInt32> mURIToIDTable;
  nsStringArray mURIArray;
 };

 static NameSpaceManagerImpl* gNameSpaceManager = nsnull;

-
-NameSpaceManagerImpl::NameSpaceManagerImpl()
-{
-}
-
-NameSpaceManagerImpl::~NameSpaceManagerImpl()
-{
-}
-
 NS_IMPL_ISUPPORTS1(NameSpaceManagerImpl, nsINameSpaceManager)

 nsresult NameSpaceManagerImpl::Init()
@ -163,26 +144,33 @@ nsresult NameSpaceManagerImpl::Init()
  nsresult rv = mURIToIDTable.Init(32);
  NS_ENSURE_SUCCESS(rv, rv);

+#define REGISTER_NAMESPACE(uri, id) \
+  rv = AddNameSpace(NS_LITERAL_STRING(uri), id); \
+  NS_ENSURE_SUCCESS(rv, rv)
+
  // Need to be ordered according to ID.
-  AddNameSpace(NS_LITERAL_STRING(kXMLNSNameSpaceURI), kNameSpaceID_XMLNS);
-  AddNameSpace(NS_LITERAL_STRING(kXMLNameSpaceURI), kNameSpaceID_XML);
-  AddNameSpace(NS_LITERAL_STRING(kXHTMLNameSpaceURI), kNameSpaceID_XHTML);
-  AddNameSpace(NS_LITERAL_STRING(kXLinkNameSpaceURI), kNameSpaceID_XLink);
-  AddNameSpace(NS_LITERAL_STRING(kXSLTNameSpaceURI), kNameSpaceID_XSLT);
-  AddNameSpace(NS_LITERAL_STRING(kXBLNameSpaceURI), kNameSpaceID_XBL);
-  AddNameSpace(NS_LITERAL_STRING(kMathMLNameSpaceURI), kNameSpaceID_MathML);
-  AddNameSpace(NS_LITERAL_STRING(kRDFNameSpaceURI), kNameSpaceID_RDF);
-  AddNameSpace(NS_LITERAL_STRING(kXULNameSpaceURI), kNameSpaceID_XUL);
-  AddNameSpace(NS_LITERAL_STRING(kSVGNameSpaceURI), kNameSpaceID_SVG);
-  AddNameSpace(NS_LITERAL_STRING(kXMLEventsNameSpaceURI), kNameSpaceID_XMLEvents);
-  AddNameSpace(NS_LITERAL_STRING(kXHTML2UnofficialNameSpaceURI), kNameSpaceID_XHTML2_Unofficial);
-  AddNameSpace(NS_LITERAL_STRING(kWAIRolesNameSpaceURI), kNameSpaceID_WAIRoles);
-  AddNameSpace(NS_LITERAL_STRING(kWAIPropertiesNameSpaceURI), kNameSpaceID_WAIProperties);
+  REGISTER_NAMESPACE(kXMLNSNameSpaceURI, kNameSpaceID_XMLNS);
+  REGISTER_NAMESPACE(kXMLNameSpaceURI, kNameSpaceID_XML);
+  REGISTER_NAMESPACE(kXHTMLNameSpaceURI, kNameSpaceID_XHTML);
+  REGISTER_NAMESPACE(kXLinkNameSpaceURI, kNameSpaceID_XLink);
+  REGISTER_NAMESPACE(kXSLTNameSpaceURI, kNameSpaceID_XSLT);
+  REGISTER_NAMESPACE(kXBLNameSpaceURI, kNameSpaceID_XBL);
+  REGISTER_NAMESPACE(kMathMLNameSpaceURI, kNameSpaceID_MathML);
+  REGISTER_NAMESPACE(kRDFNameSpaceURI, kNameSpaceID_RDF);
+  REGISTER_NAMESPACE(kXULNameSpaceURI, kNameSpaceID_XUL);
+  REGISTER_NAMESPACE(kSVGNameSpaceURI, kNameSpaceID_SVG);
+  REGISTER_NAMESPACE(kXMLEventsNameSpaceURI, kNameSpaceID_XMLEvents);
+  REGISTER_NAMESPACE(kXHTML2UnofficialNameSpaceURI,
+                     kNameSpaceID_XHTML2_Unofficial);
+  REGISTER_NAMESPACE(kWAIRolesNameSpaceURI, kNameSpaceID_WAIRoles);
+  REGISTER_NAMESPACE(kWAIPropertiesNameSpaceURI, kNameSpaceID_WAIProperties);
+
+#undef REGISTER_NAMESPACE

  return NS_OK;
 }

-NS_IMETHODIMP
+nsresult
 NameSpaceManagerImpl::RegisterNameSpace(const nsAString& aURI, 
                                        PRInt32& aNameSpaceID)
 {
@ -192,24 +180,20 @@ NameSpaceManagerImpl::RegisterNameSpace(const nsAString& aURI,
    return NS_OK;
  }

-  nsNameSpaceEntry* entry = mURIToIDTable.GetEntry(aURI);
-  if (entry) {
-    aNameSpaceID = entry->mNameSpaceID;
+  nsresult rv = NS_OK;
+  if (!mURIToIDTable.Get(&aURI, &aNameSpaceID)) {
+    aNameSpaceID = mURIArray.Count() + 1; // id is index + 1

-    return NS_OK;
-  }
-
-  aNameSpaceID = mURIArray.Count() + 1; // id is index + 1
-
-  nsresult rv = AddNameSpace(aURI, aNameSpaceID);
-  if (NS_FAILED(rv)) {
-    aNameSpaceID = kNameSpaceID_Unknown;
+    rv = AddNameSpace(aURI, aNameSpaceID);
+    if (NS_FAILED(rv)) {
+      aNameSpaceID = kNameSpaceID_Unknown;
+    }
  }

  return rv;
 }

-NS_IMETHODIMP
+nsresult
 NameSpaceManagerImpl::GetNameSpaceURI(PRInt32 aNameSpaceID, nsAString& aURI)
 {
  PRInt32 index = aNameSpaceID - 1; // id is index + 1
@ -224,20 +208,17 @@ NameSpaceManagerImpl::GetNameSpaceURI(PRInt32 aNameSpaceID, nsAString& aURI)
  return NS_OK;
 }

-NS_IMETHODIMP
-NameSpaceManagerImpl::GetNameSpaceID(const nsAString& aURI, PRInt32* aNameSpaceID)
+PRInt32
+NameSpaceManagerImpl::GetNameSpaceID(const nsAString& aURI)
 {
  if (aURI.IsEmpty()) {
-    *aNameSpaceID = kNameSpaceID_None; // xmlns="", see bug 75700 for details
-
-    return NS_OK;
+    return kNameSpaceID_None; // xmlns="", see bug 75700 for details
  }

-  nsNameSpaceEntry* entry = mURIToIDTable.GetEntry(aURI);
+  PRInt32 nameSpaceID;

-  *aNameSpaceID = entry ? entry->mNameSpaceID : kNameSpaceID_Unknown;
-
-  return NS_OK;
+  return mURIToIDTable.Get(&aURI, &nameSpaceID) ? nameSpaceID :
+                                                  kNameSpaceID_Unknown;
 }

 nsresult
@ -295,13 +276,6 @@ NameSpaceManagerImpl::HasElementCreator(PRInt32 aNameSpaceID)
         PR_FALSE;
 }

-PRBool
-NameSpaceManagerImpl::HasNameSpaceURI(PRInt32 aNameSpaceID)
-{
-  return (aNameSpaceID > kNameSpaceID_None &&
-          aNameSpaceID <= mURIArray.Count());
-}
-
 nsresult NameSpaceManagerImpl::AddNameSpace(const nsAString& aURI,
                                            const PRInt32 aNameSpaceID)
 {
@ -313,15 +287,12 @@ nsresult NameSpaceManagerImpl::AddNameSpace(const nsAString& aURI,
  }

  const nsString* uri = mURIArray.StringAt(aNameSpaceID - 1);
-  nsNameSpaceEntry* entry = mURIToIDTable.AddEntry(*uri);
-  if (!entry) {
+  if (!mURIToIDTable.Put(uri, aNameSpaceID)) {
    mURIArray.RemoveStringAt(aNameSpaceID - 1);

    return NS_ERROR_OUT_OF_MEMORY;
  }

-  entry->mNameSpaceID = aNameSpaceID;
-
  return NS_OK;
 }

--- a/content/base/src/nsNodeInfo.cpp
+++ b/content/base/src/nsNodeInfo.cpp
@ -212,8 +212,8 @@ nsNodeInfo::Equals(const nsAString& aName, const nsAString& aPrefix,
 PRBool
 nsNodeInfo::NamespaceEquals(const nsAString& aNamespaceURI) const
 {
-  PRInt32 nsid;
-  nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI, &nsid);
+  PRInt32 nsid =
+    nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNamespaceURI);

  return nsINodeInfo::NamespaceEquals(nsid);
 }
--- a/content/xbl/src/nsXBLService.cpp
+++ b/content/xbl/src/nsXBLService.cpp
@ -963,10 +963,8 @@ nsXBLService::GetBinding(nsIContent* aBoundElement, nsIURI* aURI,
              //child->UnsetAttr(kNameSpaceID_None, nsXBLAtoms::extends, PR_FALSE);
            }

-            PRInt32 nameSpaceID;
-
-            nsContentUtils::NameSpaceManager()->GetNameSpaceID(nameSpace,
-                                                               &nameSpaceID);
+            PRInt32 nameSpaceID =
+              nsContentUtils::NameSpaceManager()->GetNameSpaceID(nameSpace);

            nsCOMPtr<nsIAtom> tagName = do_GetAtom(display);
            protoBinding->SetBaseTag(nameSpaceID, tagName);