wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 700659 - Slay nsHashSets in netwerk/protocol. r=mcmanus

Browse Source
This commit is contained in:
Nathan Froyd 2012-02-27 11:20:29 -05:00
parent 073f29b803
commit b009ee6750
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View File

@ -581,12 +581,11 @@ nsHttpConnectionMgr::ReportSpdyAlternateProtocol(nsHttpConnection *conn)
if (mAlternateProtocolHash.Contains(hostPortKey))
return;
if (mAlternateProtocolHash.mHashTable.entryCount > 2000)
PL_DHashTableEnumerate(&mAlternateProtocolHash.mHashTable,
&nsHttpConnectionMgr::TrimAlternateProtocolHash,
this);
if (mAlternateProtocolHash.Count() > 2000)
mAlternateProtocolHash.EnumerateEntries(&TrimAlternateProtocolHash,
this);
mAlternateProtocolHash.Put(hostPortKey);
mAlternateProtocolHash.PutEntry(hostPortKey);
}
void
@ -596,18 +595,16 @@ nsHttpConnectionMgr::RemoveSpdyAlternateProtocol(nsACString &hostPortKey)
// it is read from both the main and the network thread.
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
return mAlternateProtocolHash.Remove(hostPortKey);
return mAlternateProtocolHash.RemoveEntry(hostPortKey);
}
PLDHashOperator
nsHttpConnectionMgr::TrimAlternateProtocolHash(PLDHashTable *table,
PLDHashEntryHdr *hdr,
PRUint32 number,
nsHttpConnectionMgr::TrimAlternateProtocolHash(nsCStringHashKey *entry,
void *closure)
{
nsHttpConnectionMgr *self = (nsHttpConnectionMgr *) closure;
if (self->mAlternateProtocolHash.mHashTable.entryCount > 2000)
if (self->mAlternateProtocolHash.Count() > 2000)
return PL_DHASH_REMOVE;
return PL_DHASH_STOP;
}

8
netwerk/protocol/http/nsHttpConnectionMgr.h
View File

@ -49,7 +49,6 @@
#include "nsAutoPtr.h"
#include "mozilla/ReentrantMonitor.h"
#include "nsISocketTransportService.h"
#include "nsHashSets.h"
#include "nsIObserver.h"
#include "nsITimer.h"
@ -425,10 +424,9 @@ private:
nsClassHashtable<nsCStringHashKey, nsConnectionEntry> mCT;
// mAlternateProtocolHash is used only for spdy/2 upgrades for now
nsCStringHashSet mAlternateProtocolHash; // protected by the monitor
static PLDHashOperator TrimAlternateProtocolHash(PLDHashTable *table,
PLDHashEntryHdr *hdr,
PRUint32 number,
// protected by the monitor
nsTHashtable<nsCStringHashKey> mAlternateProtocolHash;
static PLDHashOperator TrimAlternateProtocolHash(nsCStringHashKey *entry,
void *closure);
// Read Timeout Tick handlers
void ActivateTimeoutTick();