Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1248565 - Let child processes have its own MOZ_LOG_FILE. r=erahm

Browse Source
This commit is contained in:
Honza Bambas 2016-03-11 08:24:00 -05:00
parent 32c3d179be
commit 8db127fbea
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ipc/glue/GeckoChildProcessHost.cpp
View File

@ -475,44 +475,67 @@ GeckoChildProcessHost::SetAlreadyDead()
int32_t GeckoChildProcessHost::mChildCounter = 0;
//
// Wrapper function for handling GECKO_SEPARATE_NSPR_LOGS
//
bool
GeckoChildProcessHost::PerformAsyncLaunch(std::vector<std::string> aExtraOpts, base::ProcessArchitecture arch)
void
GeckoChildProcessHost::SetChildLogName(const char* varName, const char* origLogName)
{
// If NSPR log files are not requested, we're done.
const char* origLogName = PR_GetEnv("NSPR_LOG_FILE");
if (!origLogName) {
return PerformAsyncLaunchInternal(aExtraOpts, arch);
}
// We currently have no portable way to launch child with environment
// different than parent. So temporarily change NSPR_LOG_FILE so child
// inherits value we want it to have. (NSPR only looks at NSPR_LOG_FILE at
// startup, so it's 'safe' to play with the parent's environment this way.)
nsAutoCString setChildLogName("NSPR_LOG_FILE=");
nsAutoCString setChildLogName(varName);
setChildLogName.Append(origLogName);
// remember original value so we can restore it.
// - buffer needs to be permanently allocated for PR_SetEnv()
// - Note: this code is not called re-entrantly, nor are restoreOrigLogName
// or mChildCounter touched by any other thread, so this is safe.
static char* restoreOrigLogName = 0;
if (!restoreOrigLogName)
restoreOrigLogName = strdup(setChildLogName.get());
// Append child-specific postfix to name
setChildLogName.AppendLiteral(".child-");
setChildLogName.AppendInt(++mChildCounter);
setChildLogName.AppendInt(mChildCounter);
// Passing temporary to PR_SetEnv is ok here because env gets copied
// by exec, etc., to permanent storage in child when process launched.
PR_SetEnv(setChildLogName.get());
}
bool
GeckoChildProcessHost::PerformAsyncLaunch(std::vector<std::string> aExtraOpts, base::ProcessArchitecture arch)
{
// If NSPR log files are not requested, we're done.
const char* origNSPRLogName = PR_GetEnv("NSPR_LOG_FILE");
const char* origMozLogName = PR_GetEnv("MOZ_LOG_FILE");
if (!origNSPRLogName && !origMozLogName) {
return PerformAsyncLaunchInternal(aExtraOpts, arch);
}
++mChildCounter;
// remember original value so we can restore it.
// - Note: this code is not called re-entrantly, nor are restoreOrig*LogName
// or mChildCounter touched by any other thread, so this is safe.
static nsAutoCString restoreOrigNSPRLogName;
static nsAutoCString restoreOrigMozLogName;
if (origNSPRLogName) {
if (restoreOrigNSPRLogName.IsEmpty()) {
restoreOrigNSPRLogName.AssignLiteral("NSPR_LOG_FILE=");
restoreOrigNSPRLogName.Append(origNSPRLogName);
}
SetChildLogName("NSPR_LOG_FILE=", origNSPRLogName);
}
if (origMozLogName) {
if (restoreOrigMozLogName.IsEmpty()) {
restoreOrigMozLogName.AssignLiteral("MOZ_LOG_FILE=");
restoreOrigMozLogName.Append(origMozLogName);
}
SetChildLogName("MOZ_LOG_FILE=", origMozLogName);
}
bool retval = PerformAsyncLaunchInternal(aExtraOpts, arch);
// Revert to original value
PR_SetEnv(restoreOrigLogName);
if (origNSPRLogName) {
PR_SetEnv(restoreOrigNSPRLogName.get());
}
if (origMozLogName) {
PR_SetEnv(restoreOrigMozLogName.get());
}
return retval;
}

2
ipc/glue/GeckoChildProcessHost.h
View File

@ -191,6 +191,8 @@ private:
static void GetPathToBinary(FilePath& exePath);
void SetChildLogName(const char* varName, const char* origLogName);
// In between launching the subprocess and handing off its IPC
// channel, there's a small window of time in which *we* might still
// be the channel listener, and receive messages. That's bad