Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes static global initialization order. r=dougt@netscape.com, sr=brendan@mozilla.org, patch by bryner@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@122674 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com 2002-06-04 14:21:32 +00:00
parent 83ef4246aa
commit 929734e23b
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/xpcom/build/nsXPCOMPrivate.h
View File

@ -47,6 +47,9 @@
*
* This API is for the exclusive use of the xpcom glue library.
*
* Note that these APIs are NOT threadsafe and must be called on the
* main thread.
*
* @status FROZEN
* @param exitRoutine pointer to user defined callback function
* of type XPCOMExitRoutine.

29
mozilla/xpcom/build/nsXPComInit.cpp
View File

@ -465,15 +465,21 @@ nsresult NS_COM NS_InitXPCOM2(nsIServiceManager* *result,
return rv;
}
static nsVoidArray gExitRoutines;
static nsVoidArray* gExitRoutines;
static void CallExitRoutines()
{
PRInt32 count = gExitRoutines.Count();
if (!gExitRoutines)
return;
PRInt32 count = gExitRoutines->Count();
for (PRInt32 i = 0; i < count; i++) {
XPCOMExitRoutine func = (XPCOMExitRoutine) gExitRoutines.ElementAt(i);
XPCOMExitRoutine func = (XPCOMExitRoutine) gExitRoutines->ElementAt(i);
func();
}
gExitRoutines.Clear();
gExitRoutines->Clear();
delete gExitRoutines;
gExitRoutines = nsnull;
}
nsresult NS_COM
@ -481,14 +487,25 @@ NS_RegisterXPCOMExitRoutine(XPCOMExitRoutine exitRoutine, PRUint32 priority)
{
// priority are not used right now. It will need to be implemented as more
// classes are moved into the glue library --dougt
PRBool okay = gExitRoutines.AppendElement((void*)exitRoutine);
if (!gExitRoutines) {
gExitRoutines = new nsVoidArray();
if (!gExitRoutines) {
NS_WARNING("Failed to allocate gExitRoutines");
return NS_ERROR_FAILURE;
}
}
PRBool okay = gExitRoutines->AppendElement((void*)exitRoutine);
return okay ? NS_OK : NS_ERROR_FAILURE;
}
nsresult NS_COM
NS_UnregisterXPCOMExitRoutine(XPCOMExitRoutine exitRoutine)
{
PRBool okay = gExitRoutines.RemoveElement((void*)exitRoutine);
if (!gExitRoutines)
return NS_ERROR_FAILURE;
PRBool okay = gExitRoutines->RemoveElement((void*)exitRoutine);
return okay ? NS_OK : NS_ERROR_FAILURE;
}