Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 744103, part 4 - Remove nsCycleCollectionLanguageRuntime. r=smaug

Browse Source
This commit is contained in:
Andrew McCreight 2012-05-03 12:28:11 -07:00
parent 07f9a7c5cb
commit 65d7a82313
4 changed files with 36 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/xpconnect/src/nsXPConnect.cpp
View File

@ -118,7 +118,7 @@ nsXPConnect::nsXPConnect()
{
mRuntime = XPCJSRuntime::newXPCJSRuntime(this);
nsCycleCollector_registerRuntime(nsIProgrammingLanguage::JAVASCRIPT, this);
nsCycleCollector_registerJSRuntime(this);
char* reportableEnv = PR_GetEnv("MOZ_REPORT_ALL_JS_EXCEPTIONS");
if (reportableEnv && *reportableEnv)
@ -127,7 +127,7 @@ nsXPConnect::nsXPConnect()
nsXPConnect::~nsXPConnect()
{
nsCycleCollector_forgetRuntime(nsIProgrammingLanguage::JAVASCRIPT);
nsCycleCollector_forgetJSRuntime();
JSContext *cx = nsnull;
if (mRuntime) {
@ -578,12 +578,6 @@ nsXPConnect::FinishTraverse()
return NS_OK;
}
nsCycleCollectionParticipant *
nsXPConnect::ToParticipant(void *p)
{
return this;
}
nsCycleCollectionParticipant *
nsXPConnect::GetParticipant()
{

1
js/xpconnect/src/xpcprivate.h
View File

@ -477,7 +477,6 @@ public:
virtual void NotifyEnterMainThread();
virtual nsresult BeginCycleCollection(nsCycleCollectionTraversalCallback &cb);
virtual nsresult FinishTraverse();
virtual nsCycleCollectionParticipant *ToParticipant(void *p);
virtual nsCycleCollectionParticipant *GetParticipant();
virtual bool NeedCollect();
virtual void Collect(PRUint32 reason, PRUint32 kind);

106
xpcom/base/nsCycleCollector.cpp
View File

@ -1047,26 +1047,9 @@ nsPurpleBuffer::SelectPointers(GCGraphBuilder &aBuilder)
////////////////////////////////////////////////////////////////////////
// Implement the LanguageRuntime interface for C++/XPCOM
// Top level structure for the cycle collector.
////////////////////////////////////////////////////////////////////////
struct nsCycleCollectionXPCOMRuntime :
public nsCycleCollectionLanguageRuntime
{
nsresult BeginCycleCollection(nsCycleCollectionTraversalCallback &cb)
{
return NS_OK;
}
nsresult FinishTraverse()
{
return NS_OK;
}
inline nsCycleCollectionParticipant *ToParticipant(void *p);
};
struct nsCycleCollector
{
bool mCollectionInProgress;
@ -1075,9 +1058,7 @@ struct nsCycleCollector
nsCycleCollectorResults *mResults;
TimeStamp mCollectionStart;
nsCycleCollectionLanguageRuntime *mRuntimes[nsIProgrammingLanguage::MAX+1];
nsCycleCollectionJSRuntime *mJSRuntime;
nsCycleCollectionXPCOMRuntime mXPCOMRuntime;
GCGraph mGraph;
@ -1095,9 +1076,8 @@ struct nsCycleCollector
nsPurpleBuffer mPurpleBuf;
void RegisterRuntime(PRUint32 langID,
nsCycleCollectionLanguageRuntime *rt);
void ForgetRuntime(PRUint32 langID);
void RegisterJSRuntime(nsCycleCollectionJSRuntime *aJSRuntime);
void ForgetJSRuntime();
void SelectPurple(GCGraphBuilder &builder);
void MarkRoots(GCGraphBuilder &builder);
@ -1274,15 +1254,6 @@ ToParticipant(nsISupports *s, nsXPCOMCycleCollectionParticipant **cp)
#endif
}
nsCycleCollectionParticipant *
nsCycleCollectionXPCOMRuntime::ToParticipant(void *p)
{
nsXPCOMCycleCollectionParticipant *cp;
::ToParticipant(static_cast<nsISupports*>(p), &cp);
return cp;
}
template <class Visitor>
MOZ_NEVER_INLINE void
GraphWalker<Visitor>::Walk(PtrInfo *s0)
@ -1671,14 +1642,12 @@ private:
nsTArray<WeakMapping> &mWeakMaps;
PLDHashTable mPtrToNodeMap;
PtrInfo *mCurrPi;
nsCycleCollectionLanguageRuntime **mRuntimes; // weak, from nsCycleCollector
nsCycleCollectionParticipant *mJSParticipant;
nsCString mNextEdgeName;
nsICycleCollectorListener *mListener;
public:
GCGraphBuilder(GCGraph &aGraph,
nsCycleCollectionLanguageRuntime **aRuntimes,
nsCycleCollectionJSRuntime *aJSRuntime,
nsICycleCollectorListener *aListener);
~GCGraphBuilder();
@ -1760,13 +1729,11 @@ private:
};
GCGraphBuilder::GCGraphBuilder(GCGraph &aGraph,
nsCycleCollectionLanguageRuntime **aRuntimes,
nsCycleCollectionJSRuntime *aJSRuntime,
nsICycleCollectorListener *aListener)
: mNodeBuilder(aGraph.mNodes),
mEdgeBuilder(aGraph.mEdges),
mWeakMaps(aGraph.mWeakMaps),
mRuntimes(aRuntimes),
mJSParticipant(nsnull),
mListener(aListener)
{
@ -2624,9 +2591,6 @@ nsCycleCollector::nsCycleCollector() :
#ifdef DEBUG_CC
mExpectedGarbage.Init();
#endif
memset(mRuntimes, 0, sizeof(mRuntimes));
mRuntimes[nsIProgrammingLanguage::CPLUSPLUS] = &mXPCOMRuntime;
}
@ -2636,42 +2600,27 @@ nsCycleCollector::~nsCycleCollector()
void
nsCycleCollector::RegisterRuntime(PRUint32 langID,
nsCycleCollectionLanguageRuntime *rt)
nsCycleCollector::RegisterJSRuntime(nsCycleCollectionJSRuntime *aJSRuntime)
{
if (mParams.mDoNothing)
return;
if (langID > nsIProgrammingLanguage::MAX)
Fault("unknown language runtime in registration");
if (mJSRuntime)
Fault("multiple registrations of cycle collector JS runtime", aJSRuntime);
if (mRuntimes[langID])
Fault("multiple registrations of language runtime", rt);
mRuntimes[langID] = rt;
if (langID == nsIProgrammingLanguage::JAVASCRIPT) {
mJSRuntime = static_cast<nsCycleCollectionJSRuntime *>(rt);
}
mJSRuntime = aJSRuntime;
}
void
nsCycleCollector::ForgetRuntime(PRUint32 langID)
nsCycleCollector::ForgetJSRuntime()
{
if (mParams.mDoNothing)
return;
if (langID > nsIProgrammingLanguage::MAX)
Fault("unknown language runtime in deregistration");
if (!mJSRuntime)
Fault("forgetting non-registered cycle collector JS runtime");
if (! mRuntimes[langID])
Fault("forgetting non-registered language runtime");
mRuntimes[langID] = nsnull;
if (langID == nsIProgrammingLanguage::JAVASCRIPT) {
mJSRuntime = nsnull;
}
mJSRuntime = nsnull;
}
#ifdef DEBUG_CC
@ -3096,17 +3045,15 @@ nsCycleCollector::BeginCollection(nsICycleCollectorListener *aListener)
if (mParams.mDoNothing)
return false;
GCGraphBuilder builder(mGraph, mRuntimes, mJSRuntime, aListener);
GCGraphBuilder builder(mGraph, mJSRuntime, aListener);
if (!builder.Initialized())
return false;
for (PRUint32 i = 0; i <= nsIProgrammingLanguage::MAX; ++i) {
if (mRuntimes[i])
mRuntimes[i]->BeginCycleCollection(builder);
if (mJSRuntime) {
mJSRuntime->BeginCycleCollection(builder);
timeLog.Checkpoint("mJSRuntime->BeginCycleCollection()");
}
timeLog.Checkpoint("mRuntimes[*]->BeginCycleCollection()");
#ifdef DEBUG_CC
PRUint32 purpleStart = builder.Count();
#endif
@ -3183,13 +3130,11 @@ nsCycleCollector::BeginCollection(nsICycleCollectorListener *aListener)
}
#endif
for (PRUint32 i = 0; i <= nsIProgrammingLanguage::MAX; ++i) {
if (mRuntimes[i])
mRuntimes[i]->FinishTraverse();
if (mJSRuntime) {
mJSRuntime->FinishTraverse();
timeLog.Checkpoint("mJSRuntime->FinishTraverse()");
}
timeLog.Checkpoint("mRuntimes[*]->FinishTraverse()");
}
else {
} else {
mScanInProgress = false;
}
@ -3254,7 +3199,7 @@ nsCycleCollector::Shutdown()
Collect(nsnull, SHUTDOWN_COLLECTIONS(mParams), listener);
#ifdef DEBUG_CC
GCGraphBuilder builder(mGraph, mRuntimes, mJSRuntime, nsnull);
GCGraphBuilder builder(mGraph, mJSRuntime, nsnull);
mScanInProgress = true;
SelectPurple(builder);
mScanInProgress = false;
@ -3320,13 +3265,12 @@ NS_MEMORY_REPORTER_IMPLEMENT(CycleCollector,
// Just functions that redirect into the singleton, once it's built.
////////////////////////////////////////////////////////////////////////
void
nsCycleCollector_registerRuntime(PRUint32 langID,
nsCycleCollectionLanguageRuntime *rt)
void
nsCycleCollector_registerJSRuntime(nsCycleCollectionJSRuntime *rt)
{
static bool regMemReport = true;
if (sCollector)
sCollector->RegisterRuntime(langID, rt);
sCollector->RegisterJSRuntime(rt);
if (regMemReport) {
regMemReport = false;
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(CycleCollector));
@ -3334,10 +3278,10 @@ nsCycleCollector_registerRuntime(PRUint32 langID,
}
void
nsCycleCollector_forgetRuntime(PRUint32 langID)
nsCycleCollector_forgetJSRuntime()
{
if (sCollector)
sCollector->ForgetRuntime(langID);
sCollector->ForgetJSRuntime();
}

30
xpcom/base/nsCycleCollector.h
View File

@ -45,16 +45,6 @@ class nsICycleCollectorListener;
class nsCycleCollectionParticipant;
class nsCycleCollectionTraversalCallback;
// An nsCycleCollectionLanguageRuntime is a per-language object that
// implements language-specific aspects of the cycle collection task.
struct nsCycleCollectionLanguageRuntime
{
virtual nsresult BeginCycleCollection(nsCycleCollectionTraversalCallback &cb) = 0;
virtual nsresult FinishTraverse() = 0;
virtual nsCycleCollectionParticipant *ToParticipant(void *p) = 0;
};
// Contains various stats about the cycle collection.
class nsCycleCollectorResults
{
@ -89,13 +79,12 @@ PRUint32 nsCycleCollector_suspectedCount();
void nsCycleCollector_shutdownThreads();
void nsCycleCollector_shutdown();
// The JS runtime is special, it needs to call cycle collection during its GC.
// If the JS runtime is registered nsCycleCollector_collect will call
// nsCycleCollectionJSRuntime::Collect which will call
// nsCycleCollector_doCollect, else nsCycleCollector_collect will call
// nsCycleCollector_doCollect directly.
struct nsCycleCollectionJSRuntime : public nsCycleCollectionLanguageRuntime
// Various methods the cycle collector needs to deal with Javascript.
struct nsCycleCollectionJSRuntime
{
virtual nsresult BeginCycleCollection(nsCycleCollectionTraversalCallback &cb) = 0;
virtual nsresult FinishTraverse() = 0;
/**
* Called before/after transitioning to/from the main thread.
*
@ -124,16 +113,15 @@ struct nsCycleCollectionJSRuntime : public nsCycleCollectionLanguageRuntime
virtual nsCycleCollectionParticipant *GetParticipant() = 0;
};
// Helpers for interacting with JS
void nsCycleCollector_registerJSRuntime(nsCycleCollectionJSRuntime *rt);
void nsCycleCollector_forgetJSRuntime();
#ifdef DEBUG
void nsCycleCollector_DEBUG_shouldBeFreed(nsISupports *n);
void nsCycleCollector_DEBUG_wasFreed(nsISupports *n);
#endif
// Helpers for interacting with language-identified scripts
void nsCycleCollector_registerRuntime(PRUint32 langID, nsCycleCollectionLanguageRuntime *rt);
void nsCycleCollector_forgetRuntime(PRUint32 langID);
#define NS_CYCLE_COLLECTOR_LOGGER_CID \
{ 0x58be81b4, 0x39d2, 0x437c, \
{ 0x94, 0xea, 0xae, 0xde, 0x2c, 0x62, 0x08, 0xd3 } }