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

landing XPCOM_19990201_BRANCH

Browse Source
This commit is contained in:
dp%netscape.com 1999-02-03 07:03:17 +00:00
parent aa41a5e908
commit 704fe62ecb
10 changed files with 280 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
xpcom/components/nsRepository.cpp
View File

@ -19,9 +19,9 @@
#include <stdlib.h>
#ifndef XP_MAC
// including this on mac causes odd link errors in static initialization stuff that we
// (pinkerton & scc) don't yet understand. If you want to turn this on for mac, talk
// to one of us.
// including this on mac causes odd link errors in static initialization
// stuff that we (pinkerton & scc) don't yet understand. If you want to
// turn this on for mac, talk to one of us.
#include <iostream.h>
#endif
@ -46,10 +46,12 @@
#endif
#endif
#include "xcDllStore.h"
#include "nsIServiceManager.h"
nsHashtable *nsRepository::factories = NULL;
PRMonitor *nsRepository::monitor = NULL;
DllStore *nsRepository::dllStore = NULL;
static PRLogModuleInfo *logmodule = NULL;
@ -60,29 +62,81 @@ public:
nsCID cid;
nsIFactory *factory;
char *library;
PRLibrary *instance;
// DO NOT DELETE THIS. Many FactoryEntry(s) could be sharing the same Dll.
// This gets deleted from the dllStore going away.
Dll *dll;
FactoryEntry(const nsCID &aClass, nsIFactory *aFactory,
const char *aLibrary)
: cid(aClass), factory(aFactory), library(NULL), dll(NULL)
{
DllStore *dllCollection = nsRepository::dllStore;
if (aLibrary == NULL)
{
return;
}
FactoryEntry(const nsCID &aClass, nsIFactory *aFactory,
const char *aLibrary) {
cid = aClass;
factory = aFactory;
if (aLibrary != NULL) {
library = PL_strdup(aLibrary);
} else {
library = NULL;
}
instance = NULL;
if (library == NULL)
{
// No memory
return;
}
// If dll not already in dllCollection, add it.
dll = dllCollection->Get(library);
if (dll == NULL)
{
// Add a new Dll into the DllStore
dll = new Dll(library);
if (dll->GetStatus() != DLL_OK)
{
// Cant create a DllInfo. Backoff.
delete dll;
dll = NULL;
PL_strfree(library);
library = NULL;
}
else
{
dllCollection->Put(library, dll);
}
}
}
~FactoryEntry(void) {
if (library != NULL) {
free(library);
}
if (instance != NULL) {
PR_UnloadLibrary(instance);
}
if (factory != NULL) {
factory->Release();
}
~FactoryEntry(void)
{
if (library != NULL) {
free(library);
}
if (factory != NULL) {
factory->Release();
}
// DO NOT DELETE Dll *dll;
}
};
class IDKey: public nsHashKey {
private:
nsID id;
public:
IDKey(const nsID &aID) {
id = aID;
}
PRUint32 HashValue(void) const {
return id.m0;
}
PRBool Equals(const nsHashKey *aKey) const {
return (id.Equals(((const IDKey *) aKey)->id));
}
nsHashKey *Clone(void) const {
return new IDKey(id);
}
};
@ -143,7 +197,7 @@ static FactoryEntry *platformFind(const nsCID &aCID)
delete [] cidString;
if (err == REGERR_OK) {
res = new FactoryEntry(aCID, NULL, library);
res = new FactoryEntry(aCID, NULL, library);
}
}
NR_RegClose(hreg);
@ -212,39 +266,44 @@ static FactoryEntry *platformFind(const nsCID &aCID)
nsresult nsRepository::loadFactory(FactoryEntry *aEntry,
nsIFactory **aFactory)
{
if (aFactory == NULL) {
return NS_ERROR_NULL_POINTER;
}
*aFactory = NULL;
if (aFactory == NULL)
{
return NS_ERROR_NULL_POINTER;
}
*aFactory = NULL;
if (aEntry->dll->IsLoaded() == PR_FALSE)
{
// Load the dll
PR_LOG(logmodule, PR_LOG_ALWAYS,
("nsRepository: + Loading \"%s\".", aEntry->library));
if (aEntry->dll->Load() == PR_FALSE)
{
PR_LOG(logmodule, PR_LOG_ERROR,
("nsRepository: Library load unsuccessful."));
return (NS_ERROR_FAILURE);
}
}
if (aEntry->instance == NULL) {
PR_LOG(logmodule, PR_LOG_ALWAYS,
("nsRepository: + Loading \"%s\".", aEntry->library));
aEntry->instance = PR_LoadLibrary(aEntry->library);
}
if (aEntry->instance != NULL) {
#ifdef MOZ_TRACE_XPCOM_REFCNT
// Inform refcnt tracer of new library so that calls through the
// new library can be traced.
nsTraceRefcnt::LoadLibrarySymbols(aEntry->library, aEntry->instance);
// Inform refcnt tracer of new library so that calls through the
// new library can be traced.
nsTraceRefcnt::LoadLibrarySymbols(aEntry->library, aEntry->dll->GetInstance());
#endif
nsFactoryProc proc = (nsFactoryProc) PR_FindSymbol(aEntry->instance,
"NSGetFactory");
if (proc != NULL) {
nsIServiceManager* serviceMgr = NULL;
nsresult res = nsServiceManager::GetGlobalServiceManager(&serviceMgr);
if (res == NS_OK) {
res = proc(aEntry->cid, serviceMgr, aFactory);
}
return res;
}
PR_LOG(logmodule, PR_LOG_ERROR,
("nsRepository: NSGetFactory entrypoint not found."));
}
PR_LOG(logmodule, PR_LOG_ERROR,
("nsRepository: Library load unsuccessful."));
return NS_ERROR_FACTORY_NOT_LOADED;
nsFactoryProc proc = (nsFactoryProc) aEntry->dll->FindSymbol("NSGetFactory");
if (proc != NULL)
{
nsIServiceManager* serviceMgr = NULL;
nsresult res = nsServiceManager::GetGlobalServiceManager(&serviceMgr);
if (res == NS_OK)
{
res = proc(aEntry->cid, serviceMgr, aFactory);
}
return res;
}
PR_LOG(logmodule, PR_LOG_ERROR,
("nsRepository: NSGetFactory entrypoint not found."));
return NS_ERROR_FACTORY_NOT_LOADED;
}
nsresult nsRepository::FindFactory(const nsCID &aClass,
@ -320,6 +379,9 @@ nsresult nsRepository::Initialize(void)
if (logmodule == NULL) {
logmodule = PR_NewLogModule("nsRepository");
}
if (dllStore == NULL) {
dllStore = new DllStore();
}
PR_LOG(logmodule, PR_LOG_ALWAYS,
("nsRepository: Initialized."));
@ -574,16 +636,14 @@ static PRBool freeLibraryEnum(nsHashKey *aKey, void *aData, void* closure)
{
FactoryEntry *entry = (FactoryEntry *) aData;
if (entry->instance != NULL) {
nsCanUnloadProc proc = (nsCanUnloadProc) PR_FindSymbol(entry->instance,
"NSCanUnload");
if (entry->dll->IsLoaded() == PR_TRUE) {
nsCanUnloadProc proc = (nsCanUnloadProc) entry->dll->FindSymbol("NSCanUnload");
if (proc != NULL) {
PRBool res = proc();
if (res) {
PR_LOG(logmodule, PR_LOG_ALWAYS,
("nsRepository: + Unloading \"%s\".", entry->library));
PR_UnloadLibrary(entry->instance);
entry->instance = NULL;
entry->dll->Unload();
}
}
}

11
xpcom/components/nsRepository.h
View File

@ -47,9 +47,9 @@ class nsIServiceManager;
extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass,
nsISupports* serviceMgr,
nsIFactory **aFactory);
extern "C" NS_EXPORT PRBool NSCanUnload(void);
extern "C" NS_EXPORT nsresult NSRegisterSelf(const char *path);
extern "C" NS_EXPORT nsresult NSUnregisterSelf(const char *path);
extern "C" NS_EXPORT PRBool NSCanUnload();
extern "C" NS_EXPORT nsresult NSRegisterSelf(const char *fullpath);
extern "C" NS_EXPORT nsresult NSUnregisterSelf(const char *fullpath);
/*
* Dynamic library export function types
@ -67,6 +67,7 @@ typedef nsresult (*nsUnregisterProc)(const char *path);
*/
class FactoryEntry;
class DllStore;
/*
* nsRepository class
@ -79,8 +80,10 @@ private:
static nsresult checkInitialized(void);
static nsresult loadFactory(FactoryEntry *aEntry, nsIFactory **aFactory);
public:
static DllStore *dllStore;
static nsresult Initialize(void);
// Finds a factory for a specific class ID
static nsresult FindFactory(const nsCID &aClass,

12
xpcom/components/xcDll.cpp
View File

@ -28,11 +28,14 @@
#include "plstr.h" // strdup and strfree
Dll::Dll(const char *libFullPath) : m_instance(NULL), m_status(DLL_OK),
m_fullpath(NULL), m_lastModTime(0), m_size(0)
m_fullpath(NULL)
{
// XXX No initializer for PRTime's
// m_lastModTime = 0;
LL_I2L(m_size, 0);
if (libFullPath == NULL)
{
m_status == DLL_INVALID_PARAM;
m_status = DLL_INVALID_PARAM;
return;
}
m_fullpath = PL_strdup(libFullPath);
@ -42,6 +45,10 @@ Dll::Dll(const char *libFullPath) : m_instance(NULL), m_status(DLL_OK),
m_status = DLL_NO_MEM;
return;
}
#ifdef XP_MAC
// m_size = 0;
// m_lastModTime = 0;
#else
PRFileInfo64 statinfo;
if (PR_GetFileInfo64(m_fullpath, &statinfo) != PR_SUCCESS)
{
@ -56,6 +63,7 @@ Dll::Dll(const char *libFullPath) : m_instance(NULL), m_status(DLL_OK),
}
m_size = statinfo.size;
m_lastModTime = statinfo.modifyTime;
#endif
m_status = DLL_OK;
}

2
xpcom/macbuild/xpcom.toc
View File

@ -10,3 +10,5 @@ mozilla/xpcom/src/nsServiceManager.cpp
mozilla/xpcom/src/nsSupportsArray.cpp
mozilla/xpcom/src/nsTraceRefcnt.cpp
mozilla/xpcom/src/plvector.c
mozilla/xpcom/src/xcDll.cpp
mozilla/xpcom/src/xcDllStore.cpp

BIN
xpcom/macbuild/xpcomPPC.mcp
View File

Binary file not shown.

11
xpcom/public/nsRepository.h
View File

@ -47,9 +47,9 @@ class nsIServiceManager;
extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass,
nsISupports* serviceMgr,
nsIFactory **aFactory);
extern "C" NS_EXPORT PRBool NSCanUnload(void);
extern "C" NS_EXPORT nsresult NSRegisterSelf(const char *path);
extern "C" NS_EXPORT nsresult NSUnregisterSelf(const char *path);
extern "C" NS_EXPORT PRBool NSCanUnload();
extern "C" NS_EXPORT nsresult NSRegisterSelf(const char *fullpath);
extern "C" NS_EXPORT nsresult NSUnregisterSelf(const char *fullpath);
/*
* Dynamic library export function types
@ -67,6 +67,7 @@ typedef nsresult (*nsUnregisterProc)(const char *path);
*/
class FactoryEntry;
class DllStore;
/*
* nsRepository class
@ -79,8 +80,10 @@ private:
static nsresult checkInitialized(void);
static nsresult loadFactory(FactoryEntry *aEntry, nsIFactory **aFactory);
public:
static DllStore *dllStore;
static nsresult Initialize(void);
// Finds a factory for a specific class ID
static nsresult FindFactory(const nsCID &aClass,

2
xpcom/src/Makefile.in
View File

@ -37,6 +37,8 @@ CPPSRCS = nsDebug.cpp \
nsProxyEvent.cpp \
nsXPComFactory.cpp \
nsEventQueueService.cpp \
xcDll.cpp \
xcDllStore.cpp \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

4
xpcom/src/makefile.win
View File

@ -61,6 +61,8 @@ CPPSRCS = \
nsXPComFactory.cpp \
nsEventQueueService.cpp \
nsAllocator.cpp \
xcDll.cpp \
xcDllStore.cpp \
$(NULL)
CPP_OBJS = \
@ -75,6 +77,8 @@ CPP_OBJS = \
.\$(OBJDIR)\nsXPComFactory.obj \
.\$(OBJDIR)\nsEventQueueService.obj \
.\$(OBJDIR)\nsAllocator.obj \
.\$(OBJDIR)\xcDll.obj \
.\$(OBJDIR)\xcDllStore.obj \
$(NULL)
MODULE = xpcom

178
xpcom/src/nsRepository.cpp
View File

@ -19,9 +19,9 @@
#include <stdlib.h>
#ifndef XP_MAC
// including this on mac causes odd link errors in static initialization stuff that we
// (pinkerton & scc) don't yet understand. If you want to turn this on for mac, talk
// to one of us.
// including this on mac causes odd link errors in static initialization
// stuff that we (pinkerton & scc) don't yet understand. If you want to
// turn this on for mac, talk to one of us.
#include <iostream.h>
#endif
@ -46,10 +46,12 @@
#endif
#endif
#include "xcDllStore.h"
#include "nsIServiceManager.h"
nsHashtable *nsRepository::factories = NULL;
PRMonitor *nsRepository::monitor = NULL;
DllStore *nsRepository::dllStore = NULL;
static PRLogModuleInfo *logmodule = NULL;
@ -60,29 +62,81 @@ public:
nsCID cid;
nsIFactory *factory;
char *library;
PRLibrary *instance;
// DO NOT DELETE THIS. Many FactoryEntry(s) could be sharing the same Dll.
// This gets deleted from the dllStore going away.
Dll *dll;
FactoryEntry(const nsCID &aClass, nsIFactory *aFactory,
const char *aLibrary)
: cid(aClass), factory(aFactory), library(NULL), dll(NULL)
{
DllStore *dllCollection = nsRepository::dllStore;
if (aLibrary == NULL)
{
return;
}
FactoryEntry(const nsCID &aClass, nsIFactory *aFactory,
const char *aLibrary) {
cid = aClass;
factory = aFactory;
if (aLibrary != NULL) {
library = PL_strdup(aLibrary);
} else {
library = NULL;
}
instance = NULL;
if (library == NULL)
{
// No memory
return;
}
// If dll not already in dllCollection, add it.
dll = dllCollection->Get(library);
if (dll == NULL)
{
// Add a new Dll into the DllStore
dll = new Dll(library);
if (dll->GetStatus() != DLL_OK)
{
// Cant create a DllInfo. Backoff.
delete dll;
dll = NULL;
PL_strfree(library);
library = NULL;
}
else
{
dllCollection->Put(library, dll);
}
}
}
~FactoryEntry(void) {
if (library != NULL) {
free(library);
}
if (instance != NULL) {
PR_UnloadLibrary(instance);
}
if (factory != NULL) {
factory->Release();
}
~FactoryEntry(void)
{
if (library != NULL) {
free(library);
}
if (factory != NULL) {
factory->Release();
}
// DO NOT DELETE Dll *dll;
}
};
class IDKey: public nsHashKey {
private:
nsID id;
public:
IDKey(const nsID &aID) {
id = aID;
}
PRUint32 HashValue(void) const {
return id.m0;
}
PRBool Equals(const nsHashKey *aKey) const {
return (id.Equals(((const IDKey *) aKey)->id));
}
nsHashKey *Clone(void) const {
return new IDKey(id);
}
};
@ -143,7 +197,7 @@ static FactoryEntry *platformFind(const nsCID &aCID)
delete [] cidString;
if (err == REGERR_OK) {
res = new FactoryEntry(aCID, NULL, library);
res = new FactoryEntry(aCID, NULL, library);
}
}
NR_RegClose(hreg);
@ -212,39 +266,44 @@ static FactoryEntry *platformFind(const nsCID &aCID)
nsresult nsRepository::loadFactory(FactoryEntry *aEntry,
nsIFactory **aFactory)
{
if (aFactory == NULL) {
return NS_ERROR_NULL_POINTER;
}
*aFactory = NULL;
if (aFactory == NULL)
{
return NS_ERROR_NULL_POINTER;
}
*aFactory = NULL;
if (aEntry->dll->IsLoaded() == PR_FALSE)
{
// Load the dll
PR_LOG(logmodule, PR_LOG_ALWAYS,
("nsRepository: + Loading \"%s\".", aEntry->library));
if (aEntry->dll->Load() == PR_FALSE)
{
PR_LOG(logmodule, PR_LOG_ERROR,
("nsRepository: Library load unsuccessful."));
return (NS_ERROR_FAILURE);
}
}
if (aEntry->instance == NULL) {
PR_LOG(logmodule, PR_LOG_ALWAYS,
("nsRepository: + Loading \"%s\".", aEntry->library));
aEntry->instance = PR_LoadLibrary(aEntry->library);
}
if (aEntry->instance != NULL) {
#ifdef MOZ_TRACE_XPCOM_REFCNT
// Inform refcnt tracer of new library so that calls through the
// new library can be traced.
nsTraceRefcnt::LoadLibrarySymbols(aEntry->library, aEntry->instance);
// Inform refcnt tracer of new library so that calls through the
// new library can be traced.
nsTraceRefcnt::LoadLibrarySymbols(aEntry->library, aEntry->dll->GetInstance());
#endif
nsFactoryProc proc = (nsFactoryProc) PR_FindSymbol(aEntry->instance,
"NSGetFactory");
if (proc != NULL) {
nsIServiceManager* serviceMgr = NULL;
nsresult res = nsServiceManager::GetGlobalServiceManager(&serviceMgr);
if (res == NS_OK) {
res = proc(aEntry->cid, serviceMgr, aFactory);
}
return res;
}
PR_LOG(logmodule, PR_LOG_ERROR,
("nsRepository: NSGetFactory entrypoint not found."));
}
PR_LOG(logmodule, PR_LOG_ERROR,
("nsRepository: Library load unsuccessful."));
return NS_ERROR_FACTORY_NOT_LOADED;
nsFactoryProc proc = (nsFactoryProc) aEntry->dll->FindSymbol("NSGetFactory");
if (proc != NULL)
{
nsIServiceManager* serviceMgr = NULL;
nsresult res = nsServiceManager::GetGlobalServiceManager(&serviceMgr);
if (res == NS_OK)
{
res = proc(aEntry->cid, serviceMgr, aFactory);
}
return res;
}
PR_LOG(logmodule, PR_LOG_ERROR,
("nsRepository: NSGetFactory entrypoint not found."));
return NS_ERROR_FACTORY_NOT_LOADED;
}
nsresult nsRepository::FindFactory(const nsCID &aClass,
@ -320,6 +379,9 @@ nsresult nsRepository::Initialize(void)
if (logmodule == NULL) {
logmodule = PR_NewLogModule("nsRepository");
}
if (dllStore == NULL) {
dllStore = new DllStore();
}
PR_LOG(logmodule, PR_LOG_ALWAYS,
("nsRepository: Initialized."));
@ -574,16 +636,14 @@ static PRBool freeLibraryEnum(nsHashKey *aKey, void *aData, void* closure)
{
FactoryEntry *entry = (FactoryEntry *) aData;
if (entry->instance != NULL) {
nsCanUnloadProc proc = (nsCanUnloadProc) PR_FindSymbol(entry->instance,
"NSCanUnload");
if (entry->dll->IsLoaded() == PR_TRUE) {
nsCanUnloadProc proc = (nsCanUnloadProc) entry->dll->FindSymbol("NSCanUnload");
if (proc != NULL) {
PRBool res = proc();
if (res) {
PR_LOG(logmodule, PR_LOG_ALWAYS,
("nsRepository: + Unloading \"%s\".", entry->library));
PR_UnloadLibrary(entry->instance);
entry->instance = NULL;
entry->dll->Unload();
}
}
}

12
xpcom/src/xcDll.cpp
View File

@ -28,11 +28,14 @@
#include "plstr.h" // strdup and strfree
Dll::Dll(const char *libFullPath) : m_instance(NULL), m_status(DLL_OK),
m_fullpath(NULL), m_lastModTime(0), m_size(0)
m_fullpath(NULL)
{
// XXX No initializer for PRTime's
// m_lastModTime = 0;
LL_I2L(m_size, 0);
if (libFullPath == NULL)
{
m_status == DLL_INVALID_PARAM;
m_status = DLL_INVALID_PARAM;
return;
}
m_fullpath = PL_strdup(libFullPath);
@ -42,6 +45,10 @@ Dll::Dll(const char *libFullPath) : m_instance(NULL), m_status(DLL_OK),
m_status = DLL_NO_MEM;
return;
}
#ifdef XP_MAC
// m_size = 0;
// m_lastModTime = 0;
#else
PRFileInfo64 statinfo;
if (PR_GetFileInfo64(m_fullpath, &statinfo) != PR_SUCCESS)
{
@ -56,6 +63,7 @@ Dll::Dll(const char *libFullPath) : m_instance(NULL), m_status(DLL_OK),
}
m_size = statinfo.size;
m_lastModTime = statinfo.modifyTime;
#endif
m_status = DLL_OK;
}