--- a/dom/plugins/PluginModuleChild.cpp
+++ b/dom/plugins/PluginModuleChild.cpp
@@ -276,25 +276,16 @@ PluginModuleChild::AnswerNP_Shutdown(NPE
return true;
}
void
PluginModuleChild::ActorDestroy(ActorDestroyReason why)
{
// doesn't matter why we're being destroyed; it's up to us to
// initiate (clean) shutdown
-
-
-
-#ifdef OS_LINUX
- fprintf(stderr, "TEST-UNEXPECTED-FAIL | plugin process %d | initiating shutdown\n", getpid());
-#endif
-
-
-
XRE_ShutdownChildProcess();
}
void
PluginModuleChild::CleanUp()
{
}
--- a/ipc/chromium/src/base/process_util_linux.cc
+++ b/ipc/chromium/src/base/process_util_linux.cc
@@ -57,22 +57,16 @@ bool LaunchApp(const std::vector<std::st
argv_cstr[argv.size()] = NULL;
execvp(argv_cstr[0], argv_cstr.get());
#if defined(CHROMIUM_MOZILLA_BUILD)
// if we get here, we're in serious trouble and should complain loudly
DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
#endif
exit(127);
} else {
-
-
- fprintf(stderr, "TEST-UNEXPECTED-FAIL | ==> process %d launched | child process %d\n", GetCurrentProcId(), pid);
-
-
-
gProcessLog.print("==> process %d launched child process %d\n",
GetCurrentProcId(), pid);
if (wait)
HANDLE_EINTR(waitpid(pid, 0, 0));
if (process_handle)
*process_handle = pid;
}
--- a/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc
+++ b/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc
@@ -49,22 +49,16 @@
// XXXXXXXXXXXXXXXX
//-----------------------------------------------------------------------------
#include <errno.h>
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
-
-
-#include <stdio.h>
-
-
-
#include "base/eintr_wrapper.h"
#include "base/message_loop.h"
#include "base/process_util.h"
#include "chrome/common/process_watcher.h"
// Maximum amount of time (in milliseconds) to wait for the process to exit.
// XXX/cjones: fairly arbitrary, chosen to match process_watcher_win.cc
@@ -190,42 +184,27 @@ public:
}
// @override
virtual void OnSignal(int sig)
{
ChildReaper::OnSignal(sig);
if (!process_) {
-
-
-
- fprintf(stderr, "TEST-UNEXPECTED-FAIL | process %d reaped | child process (got SIGCHLD, exited normally)\n", getpid());
-
-
-
-
MessageLoop::current()->RemoveDestructionObserver(this);
delete this;
}
}
// @override
virtual void WillDestroyCurrentMessageLoop()
{
DCHECK(process_);
WaitForChildExit();
-
-
-
- fprintf(stderr, "TEST-UNEXPECTED-FAIL | process %d reaped | child process (waitpid() on shutdown)\n", getpid());
-
-
-
process_ = 0;
// XXX don't think this is necessary, since destruction can only
// be observed once, but can't hurt
MessageLoop::current()->RemoveDestructionObserver(this);
delete this;
}
@@ -255,26 +234,18 @@ private:
*/
void
ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process,
bool force)
{
DCHECK(process != base::GetCurrentProcId());
DCHECK(process > 0);
- if (IsProcessDead(process)) {
-
-
-
- fprintf(stderr, "TEST-UNEXPECTED-FAIL | process %d reaped | child process %d (it was already dead)\n", getpid(), process);
-
-
-
+ if (IsProcessDead(process))
return;
- }
MessageLoopForIO* loop = MessageLoopForIO::current();
if (force) {
ChildGrimReaper* reaper = new ChildGrimReaper(process);
loop->CatchSignal(SIGCHLD, reaper, reaper);
// |loop| takes ownership of |reaper|
loop->PostDelayedTask(FROM_HERE, reaper, kMaxWaitMs);
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3587,29 +3587,16 @@ XRE_main(int argc, char* argv[], const n
#ifdef MOZ_CRASHREPORTER
if (appData.flags & NS_XRE_ENABLE_CRASH_REPORTER)
CrashReporter::UnsetExceptionHandler();
#endif
XRE_DeinitCommandLine();
-
-
-
-
-
-#ifdef OS_LINUX
- fprintf(stderr, "TEST-UNEXPECTED-FAIL | browser process %d | exiting\n", getpid());
-#endif
-
-
-
-
-
return NS_FAILED(rv) ? 1 : 0;
}
nsresult
XRE_InitCommandLine(int aArgc, char* aArgv[])
{
nsresult rv = NS_OK;
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -366,23 +366,16 @@ XRE_InitChildProcess(int aArgc,
// Do IPC event loop
sIOMessageLoop = MessageLoop::current();
sIOMessageLoop->Run();
sIOMessageLoop = nsnull;
}
-
-#ifdef OS_LINUX
- fprintf(stderr, "TEST-UNEXPECTED-FAIL | plugin process %d | IO thread joined XPCOM thread, exiting\n", getpid());
-#endif
-
-
-
NS_LogTerm();
return XRE_DeinitCommandLine();
}
MessageLoop*
XRE_GetIOMessageLoop()
{
if (sChildProcessType == GeckoProcessType_Default) {
@@ -505,25 +498,16 @@ void
XRE_ShutdownChildProcess()
{
NS_ABORT_IF_FALSE(NS_IsMainThread(), "Wrong thread!");
MessageLoop* ioLoop = XRE_GetIOMessageLoop();
NS_ABORT_IF_FALSE(!!ioLoop, "Bad shutdown order");
ioLoop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
-
-
-
-#ifdef OS_LINUX
- fprintf(stderr, "TEST-UNEXPECTED-FAIL | plugin process %d | posted quit task to IO thread\n", getpid());
-#endif
-
-
-
}
namespace {
TestShellParent* gTestShellParent = nsnull;
}
bool
XRE_SendTestShellCommand(JSContext* aCx,