2001-01-20 00:23:24 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2012-05-21 15:12:37 +04:00
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* nsProcess is used to execute new processes and specify if you want to
|
|
|
|
* wait (blocking) or continue (non-blocking).
|
|
|
|
*
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
|
2013-12-09 06:52:54 +04:00
|
|
|
#include "mozilla/ArrayUtils.h"
|
2011-10-11 09:50:08 +04:00
|
|
|
|
2001-01-20 00:23:24 +03:00
|
|
|
#include "nsCOMPtr.h"
|
2009-03-25 11:57:21 +03:00
|
|
|
#include "nsAutoPtr.h"
|
2001-01-20 00:23:24 +03:00
|
|
|
#include "nsMemory.h"
|
|
|
|
#include "nsProcess.h"
|
|
|
|
#include "prio.h"
|
2002-03-23 00:37:50 +03:00
|
|
|
#include "prenv.h"
|
|
|
|
#include "nsCRT.h"
|
2009-03-25 11:57:21 +03:00
|
|
|
#include "nsThreadUtils.h"
|
|
|
|
#include "nsIObserverService.h"
|
Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov
2010-04-29 20:59:13 +04:00
|
|
|
#include "mozilla/Services.h"
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
2009-03-18 14:00:20 +03:00
|
|
|
#if defined(PROCESSMODEL_WINAPI)
|
2001-06-06 08:33:19 +04:00
|
|
|
#include "prmem.h"
|
Fix for http://bugzilla.mozilla.org/show_bug.cgi?id=80383
r=dbragg, sr=mscott, a=asa
For the nsIProcess component, which is only used by XPInstall, instead of calling
nspr for process creation, we call a simplified version which, on windows, will
cause the child process not to inherit fds open by the forking process.
Fix is only XP_WIN. nspr will provide a more risky, non-nsIProcess, XP solution at
some point which is either achieved by modifying open() to accept a non-inherit
flag (on win32) or do an fcntl() on Unix (see the bug for details specific to the
fcntl()), or provide another pair of create processes functions that are geared
towards non-inheriting process creation.
The bug fixed here is the XP installer is not able, on win32, to remove the
components.reg file from the "cleanup" process, which leads to all sorts of mayhem,
because the cleanup process inherits the component.reg fd which is open at the
time the cleanup process is forked, and this it cannot remove something it has an
open reference to.
2001-06-02 04:06:44 +04:00
|
|
|
#include "nsString.h"
|
|
|
|
#include "nsLiteralString.h"
|
|
|
|
#include "nsReadableUtils.h"
|
2009-03-09 19:47:39 +03:00
|
|
|
#else
|
2010-10-01 17:01:04 +04:00
|
|
|
#ifdef XP_MACOSX
|
2010-10-06 20:22:36 +04:00
|
|
|
#include <crt_externs.h>
|
2010-10-01 17:01:04 +04:00
|
|
|
#include <spawn.h>
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#endif
|
2009-03-09 19:47:39 +03:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <signal.h>
|
2004-10-12 09:31:37 +04:00
|
|
|
#endif
|
|
|
|
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 08:29:02 +04:00
|
|
|
using namespace mozilla;
|
|
|
|
|
2010-10-01 17:01:04 +04:00
|
|
|
#ifdef XP_MACOSX
|
|
|
|
cpu_type_t pref_cpu_types[2] = {
|
|
|
|
#if defined(__i386__)
|
|
|
|
CPU_TYPE_X86,
|
|
|
|
#elif defined(__x86_64__)
|
|
|
|
CPU_TYPE_X86_64,
|
|
|
|
#elif defined(__ppc__)
|
|
|
|
CPU_TYPE_POWERPC,
|
|
|
|
#endif
|
|
|
|
CPU_TYPE_ANY };
|
|
|
|
#endif
|
|
|
|
|
2001-01-20 00:23:24 +03:00
|
|
|
//-------------------------------------------------------------------//
|
|
|
|
// nsIProcess implementation
|
|
|
|
//-------------------------------------------------------------------//
|
2013-07-19 06:31:26 +04:00
|
|
|
NS_IMPL_ISUPPORTS2(nsProcess, nsIProcess,
|
|
|
|
nsIObserver)
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
//Constructor
|
2004-11-11 22:42:26 +03:00
|
|
|
nsProcess::nsProcess()
|
2012-07-30 18:20:58 +04:00
|
|
|
: mThread(nullptr)
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 08:29:02 +04:00
|
|
|
, mLock("nsProcess.mLock")
|
2011-10-17 18:59:28 +04:00
|
|
|
, mShutdown(false)
|
2012-07-31 22:59:18 +04:00
|
|
|
, mBlocking(false)
|
2010-10-01 17:01:04 +04:00
|
|
|
, mPid(-1)
|
2012-07-30 18:20:58 +04:00
|
|
|
, mObserver(nullptr)
|
|
|
|
, mWeakObserver(nullptr)
|
2010-10-01 17:01:04 +04:00
|
|
|
, mExitValue(-1)
|
|
|
|
#if !defined(XP_MACOSX)
|
2012-07-30 18:20:58 +04:00
|
|
|
, mProcess(nullptr)
|
2010-10-01 17:01:04 +04:00
|
|
|
#endif
|
2001-01-20 00:23:24 +03:00
|
|
|
{
|
2009-03-09 19:47:39 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
//Destructor
|
|
|
|
nsProcess::~nsProcess()
|
|
|
|
{
|
2001-01-20 00:23:24 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsProcess::Init(nsIFile* executable)
|
|
|
|
{
|
2009-03-25 11:57:21 +03:00
|
|
|
if (mExecutable)
|
2009-03-09 19:47:39 +03:00
|
|
|
return NS_ERROR_ALREADY_INITIALIZED;
|
|
|
|
|
2013-11-20 01:27:37 +04:00
|
|
|
if (NS_WARN_IF(!executable))
|
|
|
|
return NS_ERROR_INVALID_ARG;
|
2011-09-29 10:19:26 +04:00
|
|
|
bool isFile;
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
//First make sure the file exists
|
|
|
|
nsresult rv = executable->IsFile(&isFile);
|
|
|
|
if (NS_FAILED(rv)) return rv;
|
|
|
|
if (!isFile)
|
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
|
|
|
|
//Store the nsIFile in mExecutable
|
|
|
|
mExecutable = executable;
|
|
|
|
//Get the path because it is needed by the NSPR process creation
|
|
|
|
#ifdef XP_WIN
|
2010-03-18 11:37:12 +03:00
|
|
|
rv = mExecutable->GetTarget(mTargetPath);
|
2002-04-27 09:33:09 +04:00
|
|
|
if (NS_FAILED(rv) || mTargetPath.IsEmpty() )
|
2001-01-20 00:23:24 +03:00
|
|
|
#endif
|
2010-03-18 11:37:12 +03:00
|
|
|
rv = mExecutable->GetPath(mTargetPath);
|
2001-01-20 00:23:24 +03:00
|
|
|
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-10-12 09:31:37 +04:00
|
|
|
#if defined(XP_WIN)
|
2008-12-11 22:50:24 +03:00
|
|
|
// Out param `wideCmdLine` must be PR_Freed by the caller.
|
2013-12-04 16:19:09 +04:00
|
|
|
static int assembleCmdLine(char *const *argv, wchar_t **wideCmdLine,
|
2010-03-18 11:37:12 +03:00
|
|
|
UINT codePage)
|
2001-06-06 08:33:19 +04:00
|
|
|
{
|
|
|
|
char *const *arg;
|
2008-12-11 22:50:24 +03:00
|
|
|
char *p, *q, *cmdLine;
|
2001-06-06 08:33:19 +04:00
|
|
|
int cmdLineSize;
|
|
|
|
int numBackslashes;
|
|
|
|
int i;
|
|
|
|
int argNeedQuotes;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find out how large the command line buffer should be.
|
|
|
|
*/
|
|
|
|
cmdLineSize = 0;
|
|
|
|
for (arg = argv; *arg; arg++) {
|
|
|
|
/*
|
|
|
|
* \ and " need to be escaped by a \. In the worst case,
|
|
|
|
* every character is a \ or ", so the string of length
|
|
|
|
* may double. If we quote an argument, that needs two ".
|
|
|
|
* Finally, we need a space between arguments, and
|
|
|
|
* a null byte at the end of command line.
|
|
|
|
*/
|
|
|
|
cmdLineSize += 2 * strlen(*arg) /* \ and " need to be escaped */
|
|
|
|
+ 2 /* we quote every argument */
|
|
|
|
+ 1; /* space in between, or final null */
|
|
|
|
}
|
2008-12-11 22:50:24 +03:00
|
|
|
p = cmdLine = (char *) PR_MALLOC(cmdLineSize*sizeof(char));
|
2013-10-11 00:42:16 +04:00
|
|
|
if (p == nullptr) {
|
2001-06-06 08:33:19 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (arg = argv; *arg; arg++) {
|
|
|
|
/* Add a space to separates the arguments */
|
|
|
|
if (arg != argv) {
|
|
|
|
*p++ = ' ';
|
|
|
|
}
|
|
|
|
q = *arg;
|
|
|
|
numBackslashes = 0;
|
|
|
|
argNeedQuotes = 0;
|
|
|
|
|
|
|
|
/* If the argument contains white space, it needs to be quoted. */
|
|
|
|
if (strpbrk(*arg, " \f\n\r\t\v")) {
|
|
|
|
argNeedQuotes = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argNeedQuotes) {
|
|
|
|
*p++ = '"';
|
|
|
|
}
|
|
|
|
while (*q) {
|
|
|
|
if (*q == '\\') {
|
|
|
|
numBackslashes++;
|
|
|
|
q++;
|
|
|
|
} else if (*q == '"') {
|
|
|
|
if (numBackslashes) {
|
|
|
|
/*
|
|
|
|
* Double the backslashes since they are followed
|
|
|
|
* by a quote
|
|
|
|
*/
|
|
|
|
for (i = 0; i < 2 * numBackslashes; i++) {
|
|
|
|
*p++ = '\\';
|
|
|
|
}
|
|
|
|
numBackslashes = 0;
|
|
|
|
}
|
|
|
|
/* To escape the quote */
|
|
|
|
*p++ = '\\';
|
|
|
|
*p++ = *q++;
|
|
|
|
} else {
|
|
|
|
if (numBackslashes) {
|
|
|
|
/*
|
|
|
|
* Backslashes are not followed by a quote, so
|
|
|
|
* don't need to double the backslashes.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < numBackslashes; i++) {
|
|
|
|
*p++ = '\\';
|
|
|
|
}
|
|
|
|
numBackslashes = 0;
|
|
|
|
}
|
|
|
|
*p++ = *q++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we are at the end of this argument */
|
|
|
|
if (numBackslashes) {
|
|
|
|
/*
|
|
|
|
* Double the backslashes if we have a quote string
|
|
|
|
* delimiter at the end.
|
|
|
|
*/
|
|
|
|
if (argNeedQuotes) {
|
|
|
|
numBackslashes *= 2;
|
|
|
|
}
|
|
|
|
for (i = 0; i < numBackslashes; i++) {
|
|
|
|
*p++ = '\\';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (argNeedQuotes) {
|
|
|
|
*p++ = '"';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*p = '\0';
|
2013-10-11 00:42:16 +04:00
|
|
|
int32_t numChars = MultiByteToWideChar(codePage, 0, cmdLine, -1, nullptr, 0);
|
2013-12-04 16:19:09 +04:00
|
|
|
*wideCmdLine = (wchar_t *) PR_MALLOC(numChars*sizeof(wchar_t));
|
2010-03-18 11:37:12 +03:00
|
|
|
MultiByteToWideChar(codePage, 0, cmdLine, -1, *wideCmdLine, numChars);
|
2008-12-11 22:50:24 +03:00
|
|
|
PR_Free(cmdLine);
|
2001-06-06 08:33:19 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-09-25 20:18:38 +04:00
|
|
|
void nsProcess::Monitor(void *arg)
|
2009-03-25 11:57:21 +03:00
|
|
|
{
|
|
|
|
nsRefPtr<nsProcess> process = dont_AddRef(static_cast<nsProcess*>(arg));
|
2012-07-31 22:59:18 +04:00
|
|
|
|
|
|
|
if (!process->mBlocking)
|
|
|
|
PR_SetCurrentThreadName("RunProcess");
|
|
|
|
|
2009-03-25 11:57:21 +03:00
|
|
|
#if defined(PROCESSMODEL_WINAPI)
|
|
|
|
DWORD dwRetVal;
|
|
|
|
unsigned long exitCode = -1;
|
|
|
|
|
|
|
|
dwRetVal = WaitForSingleObject(process->mProcess, INFINITE);
|
|
|
|
if (dwRetVal != WAIT_FAILED) {
|
|
|
|
if (GetExitCodeProcess(process->mProcess, &exitCode) == FALSE)
|
|
|
|
exitCode = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Lock in case Kill or GetExitCode are called during this
|
|
|
|
{
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 08:29:02 +04:00
|
|
|
MutexAutoLock lock(process->mLock);
|
2009-03-25 11:57:21 +03:00
|
|
|
CloseHandle(process->mProcess);
|
2013-10-11 00:42:16 +04:00
|
|
|
process->mProcess = nullptr;
|
2009-03-25 11:57:21 +03:00
|
|
|
process->mExitValue = exitCode;
|
|
|
|
if (process->mShutdown)
|
|
|
|
return;
|
|
|
|
}
|
2010-10-01 17:01:04 +04:00
|
|
|
#else
|
|
|
|
#ifdef XP_MACOSX
|
|
|
|
int exitCode = -1;
|
|
|
|
int status = 0;
|
2010-10-26 00:57:18 +04:00
|
|
|
if (waitpid(process->mPid, &status, 0) == process->mPid) {
|
|
|
|
if (WIFEXITED(status)) {
|
|
|
|
exitCode = WEXITSTATUS(status);
|
|
|
|
}
|
|
|
|
else if(WIFSIGNALED(status)) {
|
|
|
|
exitCode = 256; // match NSPR's signal exit status
|
|
|
|
}
|
|
|
|
}
|
2009-03-25 11:57:21 +03:00
|
|
|
#else
|
2012-08-22 19:56:38 +04:00
|
|
|
int32_t exitCode = -1;
|
2009-03-25 11:57:21 +03:00
|
|
|
if (PR_WaitProcess(process->mProcess, &exitCode) != PR_SUCCESS)
|
|
|
|
exitCode = -1;
|
2010-10-01 17:01:04 +04:00
|
|
|
#endif
|
2009-03-25 11:57:21 +03:00
|
|
|
|
|
|
|
// Lock in case Kill or GetExitCode are called during this
|
|
|
|
{
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 08:29:02 +04:00
|
|
|
MutexAutoLock lock(process->mLock);
|
2010-10-01 17:01:04 +04:00
|
|
|
#if !defined(XP_MACOSX)
|
2012-07-30 18:20:58 +04:00
|
|
|
process->mProcess = nullptr;
|
2010-10-01 17:01:04 +04:00
|
|
|
#endif
|
2009-03-25 11:57:21 +03:00
|
|
|
process->mExitValue = exitCode;
|
|
|
|
if (process->mShutdown)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// If we ran a background thread for the monitor then notify on the main
|
|
|
|
// thread
|
|
|
|
if (NS_IsMainThread()) {
|
|
|
|
process->ProcessComplete();
|
|
|
|
}
|
|
|
|
else {
|
2010-04-21 03:21:35 +04:00
|
|
|
nsCOMPtr<nsIRunnable> event =
|
|
|
|
NS_NewRunnableMethod(process, &nsProcess::ProcessComplete);
|
2009-03-25 11:57:21 +03:00
|
|
|
NS_DispatchToMainThread(event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void nsProcess::ProcessComplete()
|
|
|
|
{
|
|
|
|
if (mThread) {
|
Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov
2010-04-29 20:59:13 +04:00
|
|
|
nsCOMPtr<nsIObserverService> os =
|
|
|
|
mozilla::services::GetObserverService();
|
2009-03-25 11:57:21 +03:00
|
|
|
if (os)
|
|
|
|
os->RemoveObserver(this, "xpcom-shutdown");
|
|
|
|
PR_JoinThread(mThread);
|
2012-07-30 18:20:58 +04:00
|
|
|
mThread = nullptr;
|
2009-03-25 11:57:21 +03:00
|
|
|
}
|
|
|
|
|
2009-05-26 12:53:15 +04:00
|
|
|
const char* topic;
|
2009-03-25 11:57:21 +03:00
|
|
|
if (mExitValue < 0)
|
|
|
|
topic = "process-failed";
|
|
|
|
else
|
|
|
|
topic = "process-finished";
|
|
|
|
|
|
|
|
mPid = -1;
|
|
|
|
nsCOMPtr<nsIObserver> observer;
|
|
|
|
if (mWeakObserver)
|
|
|
|
observer = do_QueryReferent(mWeakObserver);
|
|
|
|
else if (mObserver)
|
|
|
|
observer = mObserver;
|
2012-07-30 18:20:58 +04:00
|
|
|
mObserver = nullptr;
|
|
|
|
mWeakObserver = nullptr;
|
2009-03-25 11:57:21 +03:00
|
|
|
|
|
|
|
if (observer)
|
2012-07-30 18:20:58 +04:00
|
|
|
observer->Observe(NS_ISUPPORTS_CAST(nsIProcess*, this), topic, nullptr);
|
2009-03-25 11:57:21 +03:00
|
|
|
}
|
|
|
|
|
2004-02-29 01:34:07 +03:00
|
|
|
// XXXldb |args| has the wrong const-ness
|
2001-01-20 00:23:24 +03:00
|
|
|
NS_IMETHODIMP
|
2012-08-22 19:56:38 +04:00
|
|
|
nsProcess::Run(bool blocking, const char **args, uint32_t count)
|
2009-03-25 11:57:21 +03:00
|
|
|
{
|
2012-07-30 18:20:58 +04:00
|
|
|
return CopyArgsAndRunProcess(blocking, args, count, nullptr, false);
|
2009-03-25 11:57:21 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// XXXldb |args| has the wrong const-ness
|
|
|
|
NS_IMETHODIMP
|
2012-08-22 19:56:38 +04:00
|
|
|
nsProcess::RunAsync(const char **args, uint32_t count,
|
2011-09-29 10:19:26 +04:00
|
|
|
nsIObserver* observer, bool holdWeak)
|
2009-03-25 11:57:21 +03:00
|
|
|
{
|
2011-10-17 18:59:28 +04:00
|
|
|
return CopyArgsAndRunProcess(false, args, count, observer, holdWeak);
|
2009-03-25 11:57:21 +03:00
|
|
|
}
|
|
|
|
|
2010-10-01 17:01:04 +04:00
|
|
|
nsresult
|
2011-09-29 10:19:26 +04:00
|
|
|
nsProcess::CopyArgsAndRunProcess(bool blocking, const char** args,
|
2012-08-22 19:56:38 +04:00
|
|
|
uint32_t count, nsIObserver* observer,
|
2011-09-29 10:19:26 +04:00
|
|
|
bool holdWeak)
|
2001-01-20 00:23:24 +03:00
|
|
|
{
|
2013-10-11 00:42:16 +04:00
|
|
|
// Add one to the count for the program name and one for null termination.
|
|
|
|
char **my_argv = nullptr;
|
2010-10-01 17:01:04 +04:00
|
|
|
my_argv = (char**)NS_Alloc(sizeof(char*) * (count + 2));
|
2010-03-18 11:37:12 +03:00
|
|
|
if (!my_argv) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
2009-03-25 11:57:21 +03:00
|
|
|
|
2010-03-18 11:37:12 +03:00
|
|
|
my_argv[0] = ToNewUTF8String(mTargetPath);
|
2009-03-25 11:57:21 +03:00
|
|
|
|
2012-08-22 19:56:38 +04:00
|
|
|
for (uint32_t i = 0; i < count; i++) {
|
2010-10-01 17:01:04 +04:00
|
|
|
my_argv[i + 1] = const_cast<char*>(args[i]);
|
|
|
|
}
|
|
|
|
|
2013-10-11 00:42:16 +04:00
|
|
|
my_argv[count + 1] = nullptr;
|
2010-10-01 17:01:04 +04:00
|
|
|
|
2011-10-17 18:59:28 +04:00
|
|
|
nsresult rv = RunProcess(blocking, my_argv, observer, holdWeak, false);
|
2010-03-18 11:37:12 +03:00
|
|
|
|
|
|
|
NS_Free(my_argv[0]);
|
|
|
|
NS_Free(my_argv);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
// XXXldb |args| has the wrong const-ness
|
|
|
|
NS_IMETHODIMP
|
2012-08-22 19:56:38 +04:00
|
|
|
nsProcess::Runw(bool blocking, const PRUnichar **args, uint32_t count)
|
2010-03-18 11:37:12 +03:00
|
|
|
{
|
2012-07-30 18:20:58 +04:00
|
|
|
return CopyArgsAndRunProcessw(blocking, args, count, nullptr, false);
|
2010-03-18 11:37:12 +03:00
|
|
|
}
|
2001-01-20 00:23:24 +03:00
|
|
|
|
2010-03-18 11:37:12 +03:00
|
|
|
// XXXldb |args| has the wrong const-ness
|
|
|
|
NS_IMETHODIMP
|
2012-08-22 19:56:38 +04:00
|
|
|
nsProcess::RunwAsync(const PRUnichar **args, uint32_t count,
|
2011-09-29 10:19:26 +04:00
|
|
|
nsIObserver* observer, bool holdWeak)
|
2010-03-18 11:37:12 +03:00
|
|
|
{
|
2011-10-17 18:59:28 +04:00
|
|
|
return CopyArgsAndRunProcessw(false, args, count, observer, holdWeak);
|
2010-03-18 11:37:12 +03:00
|
|
|
}
|
|
|
|
|
2010-10-01 17:01:04 +04:00
|
|
|
nsresult
|
2011-09-29 10:19:26 +04:00
|
|
|
nsProcess::CopyArgsAndRunProcessw(bool blocking, const PRUnichar** args,
|
2012-08-22 19:56:38 +04:00
|
|
|
uint32_t count, nsIObserver* observer,
|
2011-09-29 10:19:26 +04:00
|
|
|
bool holdWeak)
|
2010-03-18 11:37:12 +03:00
|
|
|
{
|
2013-10-11 00:42:16 +04:00
|
|
|
// Add one to the count for the program name and one for null termination.
|
|
|
|
char **my_argv = nullptr;
|
2010-10-01 17:01:04 +04:00
|
|
|
my_argv = (char**)NS_Alloc(sizeof(char*) * (count + 2));
|
2001-01-20 00:23:24 +03:00
|
|
|
if (!my_argv) {
|
|
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
}
|
|
|
|
|
2010-03-18 11:37:12 +03:00
|
|
|
my_argv[0] = ToNewUTF8String(mTargetPath);
|
2001-01-20 00:23:24 +03:00
|
|
|
|
2012-08-22 19:56:38 +04:00
|
|
|
for (uint32_t i = 0; i < count; i++) {
|
2010-10-01 17:01:04 +04:00
|
|
|
my_argv[i + 1] = ToNewUTF8String(nsDependentString(args[i]));
|
|
|
|
}
|
2010-03-18 11:37:12 +03:00
|
|
|
|
2013-10-11 00:42:16 +04:00
|
|
|
my_argv[count + 1] = nullptr;
|
2010-10-01 17:01:04 +04:00
|
|
|
|
2011-10-17 18:59:28 +04:00
|
|
|
nsresult rv = RunProcess(blocking, my_argv, observer, holdWeak, true);
|
2010-10-01 17:01:04 +04:00
|
|
|
|
2012-08-22 19:56:38 +04:00
|
|
|
for (uint32_t i = 0; i <= count; i++) {
|
2010-03-18 11:37:12 +03:00
|
|
|
NS_Free(my_argv[i]);
|
|
|
|
}
|
|
|
|
NS_Free(my_argv);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2010-10-01 17:01:04 +04:00
|
|
|
nsresult
|
2011-09-29 10:19:26 +04:00
|
|
|
nsProcess::RunProcess(bool blocking, char **my_argv, nsIObserver* observer,
|
|
|
|
bool holdWeak, bool argsUTF8)
|
2010-03-18 11:37:12 +03:00
|
|
|
{
|
2013-11-20 01:27:37 +04:00
|
|
|
if (NS_WARN_IF(!mExecutable))
|
|
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
|
|
if (NS_WARN_IF(mThread))
|
|
|
|
return NS_ERROR_ALREADY_INITIALIZED;
|
2010-03-18 11:37:12 +03:00
|
|
|
|
|
|
|
if (observer) {
|
|
|
|
if (holdWeak) {
|
|
|
|
mWeakObserver = do_GetWeakReference(observer);
|
|
|
|
if (!mWeakObserver)
|
|
|
|
return NS_NOINTERFACE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
mObserver = observer;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mExitValue = -1;
|
|
|
|
mPid = -1;
|
|
|
|
|
2009-03-09 19:47:39 +03:00
|
|
|
#if defined(PROCESSMODEL_WINAPI)
|
Fix for http://bugzilla.mozilla.org/show_bug.cgi?id=80383
r=dbragg, sr=mscott, a=asa
For the nsIProcess component, which is only used by XPInstall, instead of calling
nspr for process creation, we call a simplified version which, on windows, will
cause the child process not to inherit fds open by the forking process.
Fix is only XP_WIN. nspr will provide a more risky, non-nsIProcess, XP solution at
some point which is either achieved by modifying open() to accept a non-inherit
flag (on win32) or do an fcntl() on Unix (see the bug for details specific to the
fcntl()), or provide another pair of create processes functions that are geared
towards non-inheriting process creation.
The bug fixed here is the XP installer is not able, on win32, to remove the
components.reg file from the "cleanup" process, which leads to all sorts of mayhem,
because the cleanup process inherits the component.reg fd which is open at the
time the cleanup process is forked, and this it cannot remove something it has an
open reference to.
2001-06-02 04:06:44 +04:00
|
|
|
BOOL retVal;
|
2013-12-04 16:19:09 +04:00
|
|
|
wchar_t *cmdLine = nullptr;
|
2001-06-06 08:33:19 +04:00
|
|
|
|
2010-10-01 17:01:04 +04:00
|
|
|
// The 'argv' array is null-terminated and always starts with the program path.
|
|
|
|
// If the second slot is non-null then arguments are being passed.
|
2013-10-11 00:42:16 +04:00
|
|
|
if (my_argv[1] != nullptr &&
|
2010-10-01 17:01:04 +04:00
|
|
|
assembleCmdLine(my_argv + 1, &cmdLine, argsUTF8 ? CP_UTF8 : CP_ACP) == -1) {
|
2001-06-06 08:33:19 +04:00
|
|
|
return NS_ERROR_FILE_EXECUTION_FAILED;
|
|
|
|
}
|
Fix for http://bugzilla.mozilla.org/show_bug.cgi?id=80383
r=dbragg, sr=mscott, a=asa
For the nsIProcess component, which is only used by XPInstall, instead of calling
nspr for process creation, we call a simplified version which, on windows, will
cause the child process not to inherit fds open by the forking process.
Fix is only XP_WIN. nspr will provide a more risky, non-nsIProcess, XP solution at
some point which is either achieved by modifying open() to accept a non-inherit
flag (on win32) or do an fcntl() on Unix (see the bug for details specific to the
fcntl()), or provide another pair of create processes functions that are geared
towards non-inheriting process creation.
The bug fixed here is the XP installer is not able, on win32, to remove the
components.reg file from the "cleanup" process, which leads to all sorts of mayhem,
because the cleanup process inherits the component.reg fd which is open at the
time the cleanup process is forked, and this it cannot remove something it has an
open reference to.
2001-06-02 04:06:44 +04:00
|
|
|
|
2009-03-18 14:00:20 +03:00
|
|
|
/* The SEE_MASK_NO_CONSOLE flag is important to prevent console windows
|
|
|
|
* from appearing. This makes behavior the same on all platforms. The flag
|
|
|
|
* will not have any effect on non-console applications.
|
2008-03-13 00:03:08 +03:00
|
|
|
*/
|
2009-03-18 14:00:20 +03:00
|
|
|
|
2010-03-18 11:37:12 +03:00
|
|
|
// The program name in my_argv[0] is always UTF-8
|
2012-10-24 08:46:52 +04:00
|
|
|
NS_ConvertUTF8toUTF16 wideFile(my_argv[0]);
|
2009-03-25 11:57:21 +03:00
|
|
|
|
2009-03-18 14:00:20 +03:00
|
|
|
SHELLEXECUTEINFOW sinfo;
|
|
|
|
memset(&sinfo, 0, sizeof(SHELLEXECUTEINFOW));
|
|
|
|
sinfo.cbSize = sizeof(SHELLEXECUTEINFOW);
|
2013-10-11 00:42:16 +04:00
|
|
|
sinfo.hwnd = nullptr;
|
2012-10-24 08:46:52 +04:00
|
|
|
sinfo.lpFile = wideFile.get();
|
2009-03-18 14:00:20 +03:00
|
|
|
sinfo.nShow = SW_SHOWNORMAL;
|
|
|
|
sinfo.fMask = SEE_MASK_FLAG_DDEWAIT |
|
|
|
|
SEE_MASK_NO_CONSOLE |
|
|
|
|
SEE_MASK_NOCLOSEPROCESS;
|
|
|
|
|
2010-10-01 17:01:04 +04:00
|
|
|
if (cmdLine)
|
2009-03-18 14:00:20 +03:00
|
|
|
sinfo.lpParameters = cmdLine;
|
|
|
|
|
|
|
|
retVal = ShellExecuteExW(&sinfo);
|
2009-03-25 11:57:21 +03:00
|
|
|
if (!retVal) {
|
|
|
|
return NS_ERROR_FILE_EXECUTION_FAILED;
|
|
|
|
}
|
|
|
|
|
2009-03-18 14:00:20 +03:00
|
|
|
mProcess = sinfo.hProcess;
|
|
|
|
|
2010-10-01 17:01:04 +04:00
|
|
|
if (cmdLine)
|
|
|
|
PR_Free(cmdLine);
|
2008-03-13 00:03:08 +03:00
|
|
|
|
2012-02-23 18:53:55 +04:00
|
|
|
mPid = GetProcessId(mProcess);
|
2010-10-01 17:01:04 +04:00
|
|
|
#elif defined(XP_MACOSX)
|
|
|
|
// Initialize spawn attributes.
|
|
|
|
posix_spawnattr_t spawnattr;
|
|
|
|
if (posix_spawnattr_init(&spawnattr) != 0) {
|
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set spawn attributes.
|
2011-10-11 09:50:08 +04:00
|
|
|
size_t attr_count = ArrayLength(pref_cpu_types);
|
2010-10-01 17:01:04 +04:00
|
|
|
size_t attr_ocount = 0;
|
|
|
|
if (posix_spawnattr_setbinpref_np(&spawnattr, attr_count, pref_cpu_types, &attr_ocount) != 0 ||
|
|
|
|
attr_ocount != attr_count) {
|
|
|
|
posix_spawnattr_destroy(&spawnattr);
|
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
}
|
Fix for http://bugzilla.mozilla.org/show_bug.cgi?id=80383
r=dbragg, sr=mscott, a=asa
For the nsIProcess component, which is only used by XPInstall, instead of calling
nspr for process creation, we call a simplified version which, on windows, will
cause the child process not to inherit fds open by the forking process.
Fix is only XP_WIN. nspr will provide a more risky, non-nsIProcess, XP solution at
some point which is either achieved by modifying open() to accept a non-inherit
flag (on win32) or do an fcntl() on Unix (see the bug for details specific to the
fcntl()), or provide another pair of create processes functions that are geared
towards non-inheriting process creation.
The bug fixed here is the XP installer is not able, on win32, to remove the
components.reg file from the "cleanup" process, which leads to all sorts of mayhem,
because the cleanup process inherits the component.reg fd which is open at the
time the cleanup process is forked, and this it cannot remove something it has an
open reference to.
2001-06-02 04:06:44 +04:00
|
|
|
|
2010-10-01 17:01:04 +04:00
|
|
|
// Note that the 'argv' array is already null-terminated, which 'posix_spawnp' requires.
|
|
|
|
pid_t newPid = 0;
|
2013-10-11 00:42:16 +04:00
|
|
|
int result = posix_spawnp(&newPid, my_argv[0], nullptr, &spawnattr, my_argv, *_NSGetEnviron());
|
2012-08-22 19:56:38 +04:00
|
|
|
mPid = static_cast<int32_t>(newPid);
|
2010-10-01 17:01:04 +04:00
|
|
|
|
|
|
|
posix_spawnattr_destroy(&spawnattr);
|
|
|
|
|
|
|
|
if (result != 0) {
|
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
}
|
|
|
|
#else
|
2013-10-11 00:42:16 +04:00
|
|
|
mProcess = PR_CreateProcess(my_argv[0], my_argv, nullptr, nullptr);
|
2009-03-25 11:57:21 +03:00
|
|
|
if (!mProcess)
|
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
struct MYProcess {
|
2012-08-22 19:56:38 +04:00
|
|
|
uint32_t pid;
|
2009-03-25 11:57:21 +03:00
|
|
|
};
|
|
|
|
MYProcess* ptrProc = (MYProcess *) mProcess;
|
|
|
|
mPid = ptrProc->pid;
|
2004-12-10 04:06:37 +03:00
|
|
|
#endif
|
2001-01-20 00:23:24 +03:00
|
|
|
|
2009-03-25 11:57:21 +03:00
|
|
|
NS_ADDREF_THIS();
|
2012-07-31 22:59:18 +04:00
|
|
|
mBlocking = blocking;
|
2009-03-25 11:57:21 +03:00
|
|
|
if (blocking) {
|
|
|
|
Monitor(this);
|
|
|
|
if (mExitValue < 0)
|
|
|
|
return NS_ERROR_FILE_EXECUTION_FAILED;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
mThread = PR_CreateThread(PR_SYSTEM_THREAD, Monitor, this,
|
|
|
|
PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
|
|
|
|
PR_JOINABLE_THREAD, 0);
|
|
|
|
if (!mThread) {
|
|
|
|
NS_RELEASE_THIS();
|
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
}
|
2001-01-20 00:23:24 +03:00
|
|
|
|
2009-03-25 11:57:21 +03:00
|
|
|
// It isn't a failure if we just can't watch for shutdown
|
Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov
2010-04-29 20:59:13 +04:00
|
|
|
nsCOMPtr<nsIObserverService> os =
|
|
|
|
mozilla::services::GetObserverService();
|
2009-03-25 11:57:21 +03:00
|
|
|
if (os)
|
2011-10-17 18:59:28 +04:00
|
|
|
os->AddObserver(this, "xpcom-shutdown", false);
|
2009-03-25 11:57:21 +03:00
|
|
|
}
|
2004-10-12 09:31:37 +04:00
|
|
|
|
2001-01-20 00:23:24 +03:00
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
2011-09-29 10:19:26 +04:00
|
|
|
NS_IMETHODIMP nsProcess::GetIsRunning(bool *aIsRunning)
|
2009-03-09 19:47:39 +03:00
|
|
|
{
|
2009-03-25 11:57:21 +03:00
|
|
|
if (mThread)
|
2011-10-17 18:59:28 +04:00
|
|
|
*aIsRunning = true;
|
2009-03-25 11:57:21 +03:00
|
|
|
else
|
2011-10-17 18:59:28 +04:00
|
|
|
*aIsRunning = false;
|
2009-03-25 11:57:21 +03:00
|
|
|
|
2009-03-09 19:47:39 +03:00
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
2001-01-20 00:23:24 +03:00
|
|
|
NS_IMETHODIMP
|
2012-08-22 19:56:38 +04:00
|
|
|
nsProcess::GetPid(uint32_t *aPid)
|
2001-01-20 00:23:24 +03:00
|
|
|
{
|
2009-03-25 11:57:21 +03:00
|
|
|
if (!mThread)
|
2009-03-09 19:47:39 +03:00
|
|
|
return NS_ERROR_FAILURE;
|
2009-03-25 11:57:21 +03:00
|
|
|
if (mPid < 0)
|
2009-03-18 14:00:20 +03:00
|
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
2009-03-25 11:57:21 +03:00
|
|
|
*aPid = mPid;
|
2009-03-09 19:47:39 +03:00
|
|
|
return NS_OK;
|
2001-01-20 00:23:24 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsProcess::Kill()
|
|
|
|
{
|
2009-03-25 11:57:21 +03:00
|
|
|
if (!mThread)
|
2009-03-18 13:59:32 +03:00
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
|
2009-03-25 11:57:21 +03:00
|
|
|
{
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 08:29:02 +04:00
|
|
|
MutexAutoLock lock(mLock);
|
2009-03-25 11:57:21 +03:00
|
|
|
#if defined(PROCESSMODEL_WINAPI)
|
2012-10-04 12:30:03 +04:00
|
|
|
if (TerminateProcess(mProcess, 0) == 0)
|
2009-03-25 11:57:21 +03:00
|
|
|
return NS_ERROR_FAILURE;
|
2010-10-01 17:01:04 +04:00
|
|
|
#elif defined(XP_MACOSX)
|
|
|
|
if (kill(mPid, SIGKILL) != 0)
|
|
|
|
return NS_ERROR_FAILURE;
|
2009-03-09 19:47:39 +03:00
|
|
|
#else
|
2010-04-29 11:24:32 +04:00
|
|
|
if (!mProcess || (PR_KillProcess(mProcess) != PR_SUCCESS))
|
2009-03-25 11:57:21 +03:00
|
|
|
return NS_ERROR_FAILURE;
|
|
|
|
#endif
|
|
|
|
}
|
2009-03-18 13:59:32 +03:00
|
|
|
|
2009-03-25 11:57:21 +03:00
|
|
|
// We must null out mThread if we want IsRunning to return false immediately
|
|
|
|
// after this call.
|
Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov
2010-04-29 20:59:13 +04:00
|
|
|
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
|
2009-03-25 11:57:21 +03:00
|
|
|
if (os)
|
|
|
|
os->RemoveObserver(this, "xpcom-shutdown");
|
|
|
|
PR_JoinThread(mThread);
|
2012-07-30 18:20:58 +04:00
|
|
|
mThread = nullptr;
|
2009-03-18 13:59:32 +03:00
|
|
|
|
|
|
|
return NS_OK;
|
2001-01-20 00:23:24 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
NS_IMETHODIMP
|
2012-08-22 19:56:38 +04:00
|
|
|
nsProcess::GetExitValue(int32_t *aExitValue)
|
2001-01-20 00:23:24 +03:00
|
|
|
{
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 08:29:02 +04:00
|
|
|
MutexAutoLock lock(mLock);
|
2009-03-25 11:57:21 +03:00
|
|
|
|
2001-01-20 00:23:24 +03:00
|
|
|
*aExitValue = mExitValue;
|
|
|
|
|
|
|
|
return NS_OK;
|
|
|
|
}
|
2009-03-25 11:57:21 +03:00
|
|
|
|
|
|
|
NS_IMETHODIMP
|
|
|
|
nsProcess::Observe(nsISupports* subject, const char* topic, const PRUnichar* data)
|
|
|
|
{
|
|
|
|
// Shutting down, drop all references
|
|
|
|
if (mThread) {
|
Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov
2010-04-29 20:59:13 +04:00
|
|
|
nsCOMPtr<nsIObserverService> os =
|
|
|
|
mozilla::services::GetObserverService();
|
2009-03-25 11:57:21 +03:00
|
|
|
if (os)
|
|
|
|
os->RemoveObserver(this, "xpcom-shutdown");
|
2012-07-30 18:20:58 +04:00
|
|
|
mThread = nullptr;
|
2009-03-25 11:57:21 +03:00
|
|
|
}
|
|
|
|
|
2012-07-30 18:20:58 +04:00
|
|
|
mObserver = nullptr;
|
|
|
|
mWeakObserver = nullptr;
|
2009-03-25 11:57:21 +03:00
|
|
|
|
Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-04-01 08:29:02 +04:00
|
|
|
MutexAutoLock lock(mLock);
|
2011-10-17 18:59:28 +04:00
|
|
|
mShutdown = true;
|
2009-03-25 11:57:21 +03:00
|
|
|
|
|
|
|
return NS_OK;
|
|
|
|
}
|