summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-08-04 13:40:36 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-08-04 13:40:55 +0200
commit6577d13f01da675718ca5f061914581329c5c7f5 (patch)
tree334b9fdbf8401ad21638b083ca28c84e0bd8a7ed
parentca87455cc5880897c8b921077819988feede90bd (diff)
downloadUXP-6577d13f01da675718ca5f061914581329c5c7f5.tar
UXP-6577d13f01da675718ca5f061914581329c5c7f5.tar.gz
UXP-6577d13f01da675718ca5f061914581329c5c7f5.tar.lz
UXP-6577d13f01da675718ca5f061914581329c5c7f5.tar.xz
UXP-6577d13f01da675718ca5f061914581329c5c7f5.zip
re-apply "Improve nsHtml5AtomTable performance (#693)" (#695)"
This reverts commit ca87455cc5880897c8b921077819988feede90bd.
-rw-r--r--parser/html/nsHtml5AtomTable.cpp14
-rw-r--r--parser/html/nsHtml5AtomTable.h6
2 files changed, 20 insertions, 0 deletions
diff --git a/parser/html/nsHtml5AtomTable.cpp b/parser/html/nsHtml5AtomTable.cpp
index d523f58b0..d9c18485d 100644
--- a/parser/html/nsHtml5AtomTable.cpp
+++ b/parser/html/nsHtml5AtomTable.cpp
@@ -31,7 +31,11 @@ nsHtml5AtomTable::nsHtml5AtomTable()
}
nsHtml5AtomTable::~nsHtml5AtomTable()
+ : mRecentlyUsedParserAtoms{}
{
+#ifdef DEBUG
+ NS_GetMainThread(getter_AddRefs(mPermittedLookupThread));
+#endif
}
nsIAtom*
@@ -44,13 +48,23 @@ nsHtml5AtomTable::GetAtom(const nsAString& aKey)
NS_ASSERTION(mPermittedLookupThread == currentThread, "Wrong thread!");
}
#endif
+
+ uint32_t index = mozilla::HashString(aKey) % RECENTLY_USED_PARSER_ATOMS_SIZE;
+ nsIAtom* cachedAtom = mRecentlyUsedParserAtoms[index];
+ if (cachedAtom && cachedAtom->Equals(aKey)) {
+ return cachedAtom;
+ }
+
nsIAtom* atom = NS_GetStaticAtom(aKey);
if (atom) {
+ mRecentlyUsedParserAtoms[index] = atom;
return atom;
}
nsHtml5AtomEntry* entry = mTable.PutEntry(aKey);
if (!entry) {
return nullptr;
}
+
+ mRecentlyUsedParserAtoms[index] = entry->GetAtom();
return entry->GetAtom();
}
diff --git a/parser/html/nsHtml5AtomTable.h b/parser/html/nsHtml5AtomTable.h
index 43f9b5f2f..b0dc2f678 100644
--- a/parser/html/nsHtml5AtomTable.h
+++ b/parser/html/nsHtml5AtomTable.h
@@ -11,6 +11,8 @@
#include "nsIAtom.h"
#include "nsIThread.h"
+#define RECENTLY_USED_PARSER_ATOMS_SIZE 31
+
class nsHtml5Atom;
class nsHtml5AtomEntry : public nsStringHashKey
@@ -87,6 +89,9 @@ class nsHtml5AtomTable
*/
void Clear()
{
+ for (uint32_t i = 0; i < RECENTLY_USED_PARSER_ATOMS_SIZE; ++i) {
+ mRecentlyUsedParserAtoms[i] = nullptr;
+ }
mTable.Clear();
}
@@ -99,6 +104,7 @@ class nsHtml5AtomTable
private:
nsTHashtable<nsHtml5AtomEntry> mTable;
+ nsIAtom* mRecentlyUsedParserAtoms[RECENTLY_USED_PARSER_ATOMS_SIZE];
#ifdef DEBUG
nsCOMPtr<nsIThread> mPermittedLookupThread;
#endif