corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1118024 - Add explicit PL_DHashTable{Add,Lookup,Remove} functions. r=nfroyd

Browse Source
This commit is contained in:
Michael Pruett
2015-01-05 20:26:50 -06:00
parent a0e24bf8eb
commit cdea6d623f
8 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xpcom/base/nsCycleCollector.cpp
View File

@@ -898,8 +898,7 @@ PtrInfo*
CCGraph::FindNode(void* aPtr)
{
PtrToNodeEntry* e =
static_cast<PtrToNodeEntry*>(PL_DHashTableOperate(&mPtrToNodeMap, aPtr,
PL_DHASH_LOOKUP));
static_cast<PtrToNodeEntry*>(PL_DHashTableLookup(&mPtrToNodeMap, aPtr));
if (!PL_DHASH_ENTRY_IS_BUSY(e)) {
return nullptr;
}
@@ -911,8 +910,7 @@ CCGraph::AddNodeToMap(void* aPtr)
{
JS::AutoSuppressGCAnalysis suppress;
PtrToNodeEntry* e =
static_cast<PtrToNodeEntry*>(PL_DHashTableOperate(&mPtrToNodeMap, aPtr,
PL_DHASH_ADD));
static_cast<PtrToNodeEntry*>(PL_DHashTableAdd(&mPtrToNodeMap, aPtr));
if (!e) {
// Caller should track OOMs
return nullptr;
@@ -923,7 +921,7 @@ CCGraph::AddNodeToMap(void* aPtr)
void
CCGraph::RemoveNodeFromMap(void* aPtr)
{
PL_DHashTableOperate(&mPtrToNodeMap, aPtr, PL_DHASH_REMOVE);
PL_DHashTableRemove(&mPtrToNodeMap, aPtr);
}