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

Added destructor/cleanup code.

Browse Source
This commit is contained in:
warren%netscape.com 1999-07-28 08:01:03 +00:00
parent 37708773d9
commit 334c7b3f3e
4 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xpcom/components/nsComponentManager.cpp
View File

@ -145,6 +145,30 @@ nsComponentManagerImpl::nsComponentManagerImpl()
NS_INIT_REFCNT();
}
PRBool
nsFactoryEntry_Destroy(nsHashKey *aKey, void *aData, void* closure)
{
nsFactoryEntry* entry = NS_STATIC_CAST(nsFactoryEntry*, aData);
delete entry;
return PR_TRUE;
}
PRBool
nsCID_Destroy(nsHashKey *aKey, void *aData, void* closure)
{
nsCID* entry = NS_STATIC_CAST(nsCID*, aData);
delete entry;
return PR_TRUE;
}
PRBool
nsDll_Destroy(nsHashKey *aKey, void *aData, void* closure)
{
nsDll* entry = NS_STATIC_CAST(nsDll*, aData);
delete entry;
return PR_TRUE;
}
nsresult nsComponentManagerImpl::Init(void)
{
if (nsComponentManagerLog == NULL)
@ -153,12 +177,16 @@ nsresult nsComponentManagerImpl::Init(void)
}
if (mFactories == NULL) {
mFactories = new nsHashtable(256, /* Thread Safe */ PR_TRUE);
mFactories = new nsObjectHashtable(nsnull, nsnull, // should never be copied
nsFactoryEntry_Destroy, nsnull,
256, /* Thread Safe */ PR_TRUE);
if (mFactories == NULL)
return NS_ERROR_OUT_OF_MEMORY;
}
if (mProgIDs == NULL) {
mProgIDs = new nsHashtable(256, /* Thread Safe */ PR_TRUE);
mProgIDs = new nsObjectHashtable(nsnull, nsnull, // should never be copied
nsCID_Destroy, nsnull,
256, /* Thread Safe */ PR_TRUE);
if (mProgIDs == NULL)
return NS_ERROR_OUT_OF_MEMORY;
}
@ -168,7 +196,9 @@ nsresult nsComponentManagerImpl::Init(void)
return NS_ERROR_OUT_OF_MEMORY;
}
if (mDllStore == NULL) {
mDllStore = new nsHashtable(256, /* Thead Safe */ PR_TRUE);
mDllStore = new nsObjectHashtable(nsnull, nsnull, // should never be copied
nsDll_Destroy, nsnull,
256, /* Thead Safe */ PR_TRUE);
if (mDllStore == NULL)
return NS_ERROR_OUT_OF_MEMORY;
}

16
xpcom/components/nsComponentManager.h
View File

@ -168,14 +168,14 @@ protected:
void PlatformSetFileInfo(nsIRegistry::Key Key, PRUint32 lastModifiedTime, PRUint32 fileSize);
protected:
nsHashtable* mFactories;
nsHashtable* mProgIDs;
PRMonitor* mMon;
nsHashtable* mDllStore;
nsIRegistry* mRegistry;
nsIRegistry::Key mXPCOMKey;
nsIRegistry::Key mClassesKey;
nsIRegistry::Key mCLSIDKey;
nsObjectHashtable* mFactories;
nsObjectHashtable* mProgIDs;
PRMonitor* mMon;
nsObjectHashtable* mDllStore;
nsIRegistry* mRegistry;
nsIRegistry::Key mXPCOMKey;
nsIRegistry::Key mClassesKey;
nsIRegistry::Key mCLSIDKey;
};
#define NS_MAX_FILENAME_LEN 1024

3
xpcom/components/nsIServiceManager.h
View File

@ -338,6 +338,9 @@ NS_NewServiceManager(nsIServiceManager* *result);
extern NS_COM nsresult
NS_InitXPCOM(nsIServiceManager* *result);
extern NS_COM nsresult
NS_ShutdownXPCOM(nsIServiceManager* servMgr);
////////////////////////////////////////////////////////////////////////////////
#endif /* nsIServiceManager_h___ */

1
xpcom/components/xcDll.cpp
View File

@ -136,6 +136,7 @@ nsDll::Init(const char *libPersistentDescriptor)
}
Init(dllSpec);
NS_RELEASE(dllSpec);
}