Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-05 00:02:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use fixed size arena allocator for element map.

Browse Source
This commit is contained in:
waterson%netscape.com 2000-04-25 01:21:57 +00:00
parent d25ee9357e
commit 6ed7f258ec
4 changed files with 154 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
content/xul/document/src/nsElementMap.cpp
View File

@ -17,6 +17,9 @@
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Original Author(s):
* Chris Waterson <waterson@netscape.com>
*
* Contributor(s):
*/
@ -24,6 +27,11 @@
Maps IDs to elements.
To turn on logging for this module, set:
NS_PR_LOG_MODULES nsElementMap:5
*/
#include "nsCOMPtr.h"
@ -37,18 +45,58 @@
static PRLogModuleInfo* gMapLog;
#endif
static void* PR_CALLBACK AllocTable(void* aPool, PRSize aSize)
{
return new char[aSize];
}
static void PR_CALLBACK FreeTable(void* aPool, void* aItem)
{
delete[] NS_STATIC_CAST(char*, aItem);
}
static PLHashEntry* PR_CALLBACK AllocEntry(void* aPool, const void* aKey)
{
nsFixedSizeAllocator* pool = NS_STATIC_CAST(nsFixedSizeAllocator*, aPool);
PLHashEntry* entry = NS_STATIC_CAST(PLHashEntry*, pool->Alloc(sizeof(PLHashEntry)));
return entry;
}
static void PR_CALLBACK FreeEntry(void* aPool, PLHashEntry* aEntry, PRUintn aFlag)
{
if (aFlag == HT_FREE_ENTRY)
nsFixedSizeAllocator::Free(aEntry, sizeof(PLHashEntry));
}
PLHashAllocOps nsElementMap::gAllocOps = {
AllocTable, FreeTable, AllocEntry, FreeEntry };
nsElementMap::nsElementMap()
{
MOZ_COUNT_CTOR(XUL_nsElementMap);
MOZ_COUNT_CTOR(nsElementMap);
// Create a table for mapping IDs to elements in the content tree.
static PRInt32 kInitialResourceTableSize = 1023;
mMap = PL_NewHashTable(kInitialResourceTableSize,
Hash,
Compare,
PL_CompareValues,
nsnull,
nsnull);
static const size_t kBucketSizes[] = {
sizeof(PLHashEntry), sizeof(ContentListItem)
};
static const PRInt32 kNumBuckets = sizeof(kBucketSizes) / sizeof(size_t);
static const PRInt32 kInitialNumElements = 64;
static const PRInt32 kInitialPoolSize =
(NS_SIZE_IN_HEAP(sizeof(PLHashEntry)) +
NS_SIZE_IN_HEAP(sizeof(ContentListItem))) * kInitialNumElements;
mPool.Init("nsElementMap", kBucketSizes, kNumBuckets, kInitialPoolSize);
mMap = PL_NewHashTable(kInitialNumElements,
Hash,
Compare,
PL_CompareValues,
&gAllocOps,
&mPool);
NS_ASSERTION(mMap != nsnull, "could not create hash table for resources");
@ -64,7 +112,7 @@ nsElementMap::nsElementMap()
nsElementMap::~nsElementMap()
{
MOZ_COUNT_DTOR(XUL_nsElementMap);
MOZ_COUNT_DTOR(nsElementMap);
if (mMap) {
PL_HashTableEnumerateEntries(mMap, ReleaseContentList, nsnull);
@ -105,10 +153,10 @@ nsElementMap::Add(const nsString& aID, nsIContent* aContent)
return NS_ERROR_NOT_INITIALIZED;
ContentListItem* head =
(ContentListItem*) PL_HashTableLookup(mMap, aID.GetUnicode());
NS_STATIC_CAST(ContentListItem*, PL_HashTableLookup(mMap, aID.GetUnicode()));
if (! head) {
head = new ContentListItem(aContent);
head = new (mPool) ContentListItem(aContent);
if (! head)
return NS_ERROR_OUT_OF_MEMORY;
@ -160,7 +208,7 @@ nsElementMap::Add(const nsString& aID, nsIContent* aContent)
head = head->mNext;
}
head->mNext = new ContentListItem(aContent);
head->mNext = new (mPool) ContentListItem(aContent);
if (! head->mNext)
return NS_ERROR_OUT_OF_MEMORY;
}

20
content/xul/document/src/nsElementMap.h
View File

@ -17,6 +17,9 @@
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Original Author(s):
* Chris Waterson <waterson@netscape.com>
*
* Contributor(s):
*
*
@ -47,23 +50,33 @@
#include "nsError.h"
#include "plhash.h"
#include "nsIContent.h"
#include "nsFixedSizeAllocator.h"
class nsString;
class nsISupportsArray;
class nsElementMap
{
private:
protected:
PLHashTable* mMap;
nsFixedSizeAllocator mPool;
static PLHashAllocOps gAllocOps;
class ContentListItem {
public:
static void* operator new(size_t aSize, nsFixedSizeAllocator& aAllocator) {
return aAllocator.Alloc(aSize); }
static void operator delete(void* aPtr, size_t aSize) {
nsFixedSizeAllocator::Free(aPtr, aSize); }
ContentListItem(nsIContent* aContent) : mNext(nsnull), mContent(aContent) {
MOZ_COUNT_CTOR(XUL_nsElementMap_ContentListItem);
MOZ_COUNT_CTOR(nsElementMap::ContentListItem);
}
~ContentListItem() {
MOZ_COUNT_DTOR(XUL_nsElementMap_ContentListItem);
MOZ_COUNT_DTOR(nsElementMap::ContentListItem);
}
ContentListItem* mNext;
@ -98,6 +111,7 @@ public:
typedef PRIntn (*nsElementMapEnumerator)(const nsString& aID,
nsIContent* aElement,
void* aClosure);
nsresult
Enumerate(nsElementMapEnumerator aEnumerator, void* aClosure);

72
rdf/content/src/nsElementMap.cpp
View File

@ -17,6 +17,9 @@
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Original Author(s):
* Chris Waterson <waterson@netscape.com>
*
* Contributor(s):
*/
@ -24,6 +27,11 @@
Maps IDs to elements.
To turn on logging for this module, set:
NS_PR_LOG_MODULES nsElementMap:5
*/
#include "nsCOMPtr.h"
@ -37,18 +45,58 @@
static PRLogModuleInfo* gMapLog;
#endif
static void* PR_CALLBACK AllocTable(void* aPool, PRSize aSize)
{
return new char[aSize];
}
static void PR_CALLBACK FreeTable(void* aPool, void* aItem)
{
delete[] NS_STATIC_CAST(char*, aItem);
}
static PLHashEntry* PR_CALLBACK AllocEntry(void* aPool, const void* aKey)
{
nsFixedSizeAllocator* pool = NS_STATIC_CAST(nsFixedSizeAllocator*, aPool);
PLHashEntry* entry = NS_STATIC_CAST(PLHashEntry*, pool->Alloc(sizeof(PLHashEntry)));
return entry;
}
static void PR_CALLBACK FreeEntry(void* aPool, PLHashEntry* aEntry, PRUintn aFlag)
{
if (aFlag == HT_FREE_ENTRY)
nsFixedSizeAllocator::Free(aEntry, sizeof(PLHashEntry));
}
PLHashAllocOps nsElementMap::gAllocOps = {
AllocTable, FreeTable, AllocEntry, FreeEntry };
nsElementMap::nsElementMap()
{
MOZ_COUNT_CTOR(XUL_nsElementMap);
MOZ_COUNT_CTOR(nsElementMap);
// Create a table for mapping IDs to elements in the content tree.
static PRInt32 kInitialResourceTableSize = 1023;
mMap = PL_NewHashTable(kInitialResourceTableSize,
Hash,
Compare,
PL_CompareValues,
nsnull,
nsnull);
static const size_t kBucketSizes[] = {
sizeof(PLHashEntry), sizeof(ContentListItem)
};
static const PRInt32 kNumBuckets = sizeof(kBucketSizes) / sizeof(size_t);
static const PRInt32 kInitialNumElements = 64;
static const PRInt32 kInitialPoolSize =
(NS_SIZE_IN_HEAP(sizeof(PLHashEntry)) +
NS_SIZE_IN_HEAP(sizeof(ContentListItem))) * kInitialNumElements;
mPool.Init("nsElementMap", kBucketSizes, kNumBuckets, kInitialPoolSize);
mMap = PL_NewHashTable(kInitialNumElements,
Hash,
Compare,
PL_CompareValues,
&gAllocOps,
&mPool);
NS_ASSERTION(mMap != nsnull, "could not create hash table for resources");
@ -64,7 +112,7 @@ nsElementMap::nsElementMap()
nsElementMap::~nsElementMap()
{
MOZ_COUNT_DTOR(XUL_nsElementMap);
MOZ_COUNT_DTOR(nsElementMap);
if (mMap) {
PL_HashTableEnumerateEntries(mMap, ReleaseContentList, nsnull);
@ -105,10 +153,10 @@ nsElementMap::Add(const nsString& aID, nsIContent* aContent)
return NS_ERROR_NOT_INITIALIZED;
ContentListItem* head =
(ContentListItem*) PL_HashTableLookup(mMap, aID.GetUnicode());
NS_STATIC_CAST(ContentListItem*, PL_HashTableLookup(mMap, aID.GetUnicode()));
if (! head) {
head = new ContentListItem(aContent);
head = new (mPool) ContentListItem(aContent);
if (! head)
return NS_ERROR_OUT_OF_MEMORY;
@ -160,7 +208,7 @@ nsElementMap::Add(const nsString& aID, nsIContent* aContent)
head = head->mNext;
}
head->mNext = new ContentListItem(aContent);
head->mNext = new (mPool) ContentListItem(aContent);
if (! head->mNext)
return NS_ERROR_OUT_OF_MEMORY;
}

20
rdf/content/src/nsElementMap.h
View File

@ -17,6 +17,9 @@
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Original Author(s):
* Chris Waterson <waterson@netscape.com>
*
* Contributor(s):
*
*
@ -47,23 +50,33 @@
#include "nsError.h"
#include "plhash.h"
#include "nsIContent.h"
#include "nsFixedSizeAllocator.h"
class nsString;
class nsISupportsArray;
class nsElementMap
{
private:
protected:
PLHashTable* mMap;
nsFixedSizeAllocator mPool;
static PLHashAllocOps gAllocOps;
class ContentListItem {
public:
static void* operator new(size_t aSize, nsFixedSizeAllocator& aAllocator) {
return aAllocator.Alloc(aSize); }
static void operator delete(void* aPtr, size_t aSize) {
nsFixedSizeAllocator::Free(aPtr, aSize); }
ContentListItem(nsIContent* aContent) : mNext(nsnull), mContent(aContent) {
MOZ_COUNT_CTOR(XUL_nsElementMap_ContentListItem);
MOZ_COUNT_CTOR(nsElementMap::ContentListItem);
}
~ContentListItem() {
MOZ_COUNT_DTOR(XUL_nsElementMap_ContentListItem);
MOZ_COUNT_DTOR(nsElementMap::ContentListItem);
}
ContentListItem* mNext;
@ -98,6 +111,7 @@ public:
typedef PRIntn (*nsElementMapEnumerator)(const nsString& aID,
nsIContent* aElement,
void* aClosure);
nsresult
Enumerate(nsElementMapEnumerator aEnumerator, void* aClosure);