Bug 1046841 - Convert xpcom/components/ to Gecko style. r=froydnj
This commit is contained in:
Birunthan Mohanathas
@@ -53,13 +53,14 @@
|
||||
|
||||
using namespace mozilla;
|
||||
|
||||
static PRLogModuleInfo *
|
||||
static PRLogModuleInfo*
|
||||
GetNativeModuleLoaderLog()
|
||||
{
|
||||
static PRLogModuleInfo *sLog;
|
||||
if (!sLog)
|
||||
sLog = PR_NewLogModule("nsNativeModuleLoader");
|
||||
return sLog;
|
||||
static PRLogModuleInfo* sLog;
|
||||
if (!sLog) {
|
||||
sLog = PR_NewLogModule("nsNativeModuleLoader");
|
||||
}
|
||||
return sLog;
|
||||
}
|
||||
|
||||
#define LOG(level, args) PR_LOG(GetNativeModuleLoaderLog(), level, args)
|
||||
@@ -67,174 +68,177 @@ GetNativeModuleLoaderLog()
|
||||
nsresult
|
||||
nsNativeModuleLoader::Init()
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread(), "Startup not on main thread?");
|
||||
LOG(PR_LOG_DEBUG, ("nsNativeModuleLoader::Init()"));
|
||||
return NS_OK;
|
||||
MOZ_ASSERT(NS_IsMainThread(), "Startup not on main thread?");
|
||||
LOG(PR_LOG_DEBUG, ("nsNativeModuleLoader::Init()"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
class LoadModuleMainThreadRunnable : public nsRunnable
|
||||
{
|
||||
public:
|
||||
LoadModuleMainThreadRunnable(nsNativeModuleLoader* aLoader,
|
||||
FileLocation &aFile)
|
||||
: mManager(nsComponentManagerImpl::gComponentManager)
|
||||
, mLoader(aLoader)
|
||||
, mFile(aFile)
|
||||
, mResult(nullptr)
|
||||
{ }
|
||||
LoadModuleMainThreadRunnable(nsNativeModuleLoader* aLoader,
|
||||
FileLocation& aFile)
|
||||
: mManager(nsComponentManagerImpl::gComponentManager)
|
||||
, mLoader(aLoader)
|
||||
, mFile(aFile)
|
||||
, mResult(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMETHOD Run()
|
||||
{
|
||||
mResult = mLoader->LoadModule(mFile);
|
||||
return NS_OK;
|
||||
}
|
||||
NS_IMETHOD Run()
|
||||
{
|
||||
mResult = mLoader->LoadModule(mFile);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsRefPtr<nsComponentManagerImpl> mManager;
|
||||
nsNativeModuleLoader* mLoader;
|
||||
FileLocation mFile;
|
||||
const mozilla::Module* mResult;
|
||||
nsRefPtr<nsComponentManagerImpl> mManager;
|
||||
nsNativeModuleLoader* mLoader;
|
||||
FileLocation mFile;
|
||||
const mozilla::Module* mResult;
|
||||
};
|
||||
|
||||
const mozilla::Module*
|
||||
nsNativeModuleLoader::LoadModule(FileLocation &aFile)
|
||||
nsNativeModuleLoader::LoadModule(FileLocation& aFile)
|
||||
{
|
||||
if (aFile.IsZip()) {
|
||||
NS_ERROR("Binary components cannot be loaded from JARs");
|
||||
return nullptr;
|
||||
}
|
||||
nsCOMPtr<nsIFile> file = aFile.GetBaseFile();
|
||||
nsresult rv;
|
||||
if (aFile.IsZip()) {
|
||||
NS_ERROR("Binary components cannot be loaded from JARs");
|
||||
return nullptr;
|
||||
}
|
||||
nsCOMPtr<nsIFile> file = aFile.GetBaseFile();
|
||||
nsresult rv;
|
||||
|
||||
if (!NS_IsMainThread()) {
|
||||
// If this call is off the main thread, synchronously proxy it
|
||||
// to the main thread.
|
||||
nsRefPtr<LoadModuleMainThreadRunnable> r = new LoadModuleMainThreadRunnable(this, aFile);
|
||||
NS_DispatchToMainThread(r, NS_DISPATCH_SYNC);
|
||||
return r->mResult;
|
||||
}
|
||||
if (!NS_IsMainThread()) {
|
||||
// If this call is off the main thread, synchronously proxy it
|
||||
// to the main thread.
|
||||
nsRefPtr<LoadModuleMainThreadRunnable> r =
|
||||
new LoadModuleMainThreadRunnable(this, aFile);
|
||||
NS_DispatchToMainThread(r, NS_DISPATCH_SYNC);
|
||||
return r->mResult;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIHashable> hashedFile(do_QueryInterface(file));
|
||||
if (!hashedFile) {
|
||||
NS_ERROR("nsIFile is not nsIHashable");
|
||||
return nullptr;
|
||||
}
|
||||
nsCOMPtr<nsIHashable> hashedFile(do_QueryInterface(file));
|
||||
if (!hashedFile) {
|
||||
NS_ERROR("nsIFile is not nsIHashable");
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsAutoCString filePath;
|
||||
file->GetNativePath(filePath);
|
||||
nsAutoCString filePath;
|
||||
file->GetNativePath(filePath);
|
||||
|
||||
NativeLoadData data;
|
||||
NativeLoadData data;
|
||||
|
||||
if (mLibraries.Get(hashedFile, &data)) {
|
||||
NS_ASSERTION(data.mModule, "Corrupt mLibraries hash");
|
||||
LOG(PR_LOG_DEBUG,
|
||||
("nsNativeModuleLoader::LoadModule(\"%s\") - found in cache",
|
||||
filePath.get()));
|
||||
return data.mModule;
|
||||
}
|
||||
if (mLibraries.Get(hashedFile, &data)) {
|
||||
NS_ASSERTION(data.mModule, "Corrupt mLibraries hash");
|
||||
LOG(PR_LOG_DEBUG,
|
||||
("nsNativeModuleLoader::LoadModule(\"%s\") - found in cache",
|
||||
filePath.get()));
|
||||
return data.mModule;
|
||||
}
|
||||
|
||||
// We haven't loaded this module before
|
||||
{
|
||||
// We haven't loaded this module before
|
||||
{
|
||||
#ifdef HAS_DLL_BLOCKLIST
|
||||
AutoSetXPCOMLoadOnMainThread guard;
|
||||
AutoSetXPCOMLoadOnMainThread guard;
|
||||
#endif
|
||||
rv = file->Load(&data.mLibrary);
|
||||
rv = file->Load(&data.mLibrary);
|
||||
}
|
||||
|
||||
if (NS_FAILED(rv)) {
|
||||
char errorMsg[1024] = "<unknown; can't get error from NSPR>";
|
||||
|
||||
if (PR_GetErrorTextLength() < (int)sizeof(errorMsg)) {
|
||||
PR_GetErrorText(errorMsg);
|
||||
}
|
||||
|
||||
if (NS_FAILED(rv)) {
|
||||
char errorMsg[1024] = "<unknown; can't get error from NSPR>";
|
||||
LogMessage("Failed to load native module at path '%s': (%lx) %s",
|
||||
filePath.get(), rv, errorMsg);
|
||||
|
||||
if (PR_GetErrorTextLength() < (int) sizeof(errorMsg))
|
||||
PR_GetErrorText(errorMsg);
|
||||
|
||||
LogMessage("Failed to load native module at path '%s': (%lx) %s",
|
||||
filePath.get(), rv, errorMsg);
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
#ifdef IMPLEMENT_BREAK_AFTER_LOAD
|
||||
nsAutoCString leafName;
|
||||
file->GetNativeLeafName(leafName);
|
||||
nsAutoCString leafName;
|
||||
file->GetNativeLeafName(leafName);
|
||||
|
||||
char *env = getenv("XPCOM_BREAK_ON_LOAD");
|
||||
char *blist;
|
||||
if (env && *env && (blist = strdup(env))) {
|
||||
char *nextTok = blist;
|
||||
while (char *token = NS_strtok(":", &nextTok)) {
|
||||
if (leafName.Find(token, true) != kNotFound) {
|
||||
NS_BREAK();
|
||||
}
|
||||
}
|
||||
|
||||
free(blist);
|
||||
char* env = getenv("XPCOM_BREAK_ON_LOAD");
|
||||
char* blist;
|
||||
if (env && *env && (blist = strdup(env))) {
|
||||
char* nextTok = blist;
|
||||
while (char* token = NS_strtok(":", &nextTok)) {
|
||||
if (leafName.Find(token, true) != kNotFound) {
|
||||
NS_BREAK();
|
||||
}
|
||||
}
|
||||
|
||||
free(blist);
|
||||
}
|
||||
#endif
|
||||
|
||||
void *module = PR_FindSymbol(data.mLibrary, "NSModule");
|
||||
if (!module) {
|
||||
LogMessage("Native module at path '%s' doesn't export symbol `NSModule`.",
|
||||
filePath.get());
|
||||
PR_UnloadLibrary(data.mLibrary);
|
||||
return nullptr;
|
||||
}
|
||||
void* module = PR_FindSymbol(data.mLibrary, "NSModule");
|
||||
if (!module) {
|
||||
LogMessage("Native module at path '%s' doesn't export symbol `NSModule`.",
|
||||
filePath.get());
|
||||
PR_UnloadLibrary(data.mLibrary);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
data.mModule = *(mozilla::Module const *const *) module;
|
||||
if (mozilla::Module::kVersion != data.mModule->mVersion) {
|
||||
LogMessage("Native module at path '%s' is incompatible with this version of Firefox, has version %i, expected %i.",
|
||||
filePath.get(), data.mModule->mVersion,
|
||||
mozilla::Module::kVersion);
|
||||
PR_UnloadLibrary(data.mLibrary);
|
||||
return nullptr;
|
||||
}
|
||||
data.mModule = *(mozilla::Module const* const*)module;
|
||||
if (mozilla::Module::kVersion != data.mModule->mVersion) {
|
||||
LogMessage("Native module at path '%s' is incompatible with this version of Firefox, has version %i, expected %i.",
|
||||
filePath.get(), data.mModule->mVersion,
|
||||
mozilla::Module::kVersion);
|
||||
PR_UnloadLibrary(data.mLibrary);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
mLibraries.Put(hashedFile, data); // infallible
|
||||
return data.mModule;
|
||||
mLibraries.Put(hashedFile, data); // infallible
|
||||
return data.mModule;
|
||||
}
|
||||
|
||||
PLDHashOperator
|
||||
nsNativeModuleLoader::ReleaserFunc(nsIHashable* aHashedFile,
|
||||
NativeLoadData& aLoadData, void*)
|
||||
{
|
||||
aLoadData.mModule = nullptr;
|
||||
return PL_DHASH_NEXT;
|
||||
aLoadData.mModule = nullptr;
|
||||
return PL_DHASH_NEXT;
|
||||
}
|
||||
|
||||
PLDHashOperator
|
||||
nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile,
|
||||
NativeLoadData& aLoadData, void*)
|
||||
{
|
||||
if (PR_LOG_TEST(GetNativeModuleLoaderLog(), PR_LOG_DEBUG)) {
|
||||
nsCOMPtr<nsIFile> file(do_QueryInterface(aHashedFile));
|
||||
if (PR_LOG_TEST(GetNativeModuleLoaderLog(), PR_LOG_DEBUG)) {
|
||||
nsCOMPtr<nsIFile> file(do_QueryInterface(aHashedFile));
|
||||
|
||||
nsAutoCString filePath;
|
||||
file->GetNativePath(filePath);
|
||||
nsAutoCString filePath;
|
||||
file->GetNativePath(filePath);
|
||||
|
||||
LOG(PR_LOG_DEBUG,
|
||||
("nsNativeModuleLoader::UnloaderFunc(\"%s\")", filePath.get()));
|
||||
}
|
||||
LOG(PR_LOG_DEBUG,
|
||||
("nsNativeModuleLoader::UnloaderFunc(\"%s\")", filePath.get()));
|
||||
}
|
||||
|
||||
#ifdef NS_BUILD_REFCNT_LOGGING
|
||||
nsTraceRefcnt::SetActivityIsLegal(false);
|
||||
nsTraceRefcnt::SetActivityIsLegal(false);
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
// XXXbsmedberg: do this as soon as the static-destructor crash(es)
|
||||
// are fixed
|
||||
PRStatus ret = PR_UnloadLibrary(aLoadData.mLibrary);
|
||||
NS_ASSERTION(ret == PR_SUCCESS, "Failed to unload library");
|
||||
// XXXbsmedberg: do this as soon as the static-destructor crash(es)
|
||||
// are fixed
|
||||
PRStatus ret = PR_UnloadLibrary(aLoadData.mLibrary);
|
||||
NS_ASSERTION(ret == PR_SUCCESS, "Failed to unload library");
|
||||
#endif
|
||||
|
||||
#ifdef NS_BUILD_REFCNT_LOGGING
|
||||
nsTraceRefcnt::SetActivityIsLegal(true);
|
||||
nsTraceRefcnt::SetActivityIsLegal(true);
|
||||
#endif
|
||||
|
||||
return PL_DHASH_REMOVE;
|
||||
return PL_DHASH_REMOVE;
|
||||
}
|
||||
|
||||
void
|
||||
nsNativeModuleLoader::UnloadLibraries()
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread(), "Shutdown not on main thread?");
|
||||
mLibraries.Enumerate(ReleaserFunc, nullptr);
|
||||
mLibraries.Enumerate(UnloaderFunc, nullptr);
|
||||
MOZ_ASSERT(NS_IsMainThread(), "Shutdown not on main thread?");
|
||||
mLibraries.Enumerate(ReleaserFunc, nullptr);
|
||||
mLibraries.Enumerate(UnloaderFunc, nullptr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user