wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1223222 - Part 3: Remove usage of PR_NewLogModule in mozilla LogModule code. r=froydnj

Browse Source
This commit is contained in:
Eric Rahm 2016-01-05 12:16:03 -08:00
parent 305056e25c
commit b406193407
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xpcom/base/Logging.cpp
View File

@ -12,6 +12,9 @@
#include "mozilla/Mutex.h"
#include "mozilla/StaticPtr.h"
#include "nsClassHashtable.h"
#include "NSPRLogModulesParser.h"
#include "prenv.h"
// NB: Initial amount determined by auditing the codebase for the total amount
// of unique module names and padding up to the next power of 2.
@ -42,21 +45,23 @@ public:
// its destructor.
}
/**
* Loads config from env vars if present.
*/
void Init()
{
const char* modules = PR_GetEnv("NSPR_LOG_MODULES");
NSPRLogModulesParser(modules, [] (const char* aName, LogLevel aLevel) {
LogModule::Get(aName)->SetLevel(aLevel);
});
}
LogModule* CreateOrGetModule(const char* aName)
{
OffTheBooksMutexAutoLock guard(mModulesLock);
LogModule* module = nullptr;
if (!mModules.Get(aName, &module)) {
// Create the PRLogModule, this will read any env vars that set the log
// level ahead of time. The module is held internally by NSPR, so it's
// okay to drop the pointer when leaving this scope.
PRLogModuleInfo* prModule = PR_NewLogModule(aName);
// NSPR does not impose a restriction on the values that log levels can
// be. LogModule uses the LogLevel enum class so we must clamp the value
// to a max of Verbose.
LogLevel logLevel = ToLogLevel(prModule->level);
module = new LogModule(logLevel);
module = new LogModule(LogLevel::Disabled);
mModules.Put(aName, module);
}
@ -93,6 +98,7 @@ LogModule::Init()
// before all logging is complete. And, yes, that means we leak, but
// we're doing that intentionally.
sLogModuleManager = new LogModuleManager();
sLogModuleManager->Init();
}
} // namespace mozilla