mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
b564bd67d3
- Use CompositorWidgetProxy for dispatching vsync to the compositor. (bug 1269037 part 1, r=mchang) (c8b7a4240c) - Remove unused null widget checks. (bug 1269037 part 2, r=mchang) (4f4cc9952b) - Bug 1269422: Wrap Gonk widget in |CompositorWidgetProxyWrapper|. r=dvander (4513035cbf) - Remove nsBaseWidget::NewCompositorBridgeParent. (bug 1272472 part 1, r=kats) (ca813c1f2b) - Use IPDL to schedule composites on GTK. (bug 1272472 part 2, r=nical) (7402cf834e) - Use IPC to schedule composites on Windows. (bug 1272472 part 3, r=jimm) (e5d7281dd7) - Don't use nsIWidget to check APZ in LayerManagerComposite. (bug 1269653 part 1, r=kats) (79a1644111) - Restrict SetDispAcquireFence's nsIWidget access to Gonk. (bug 1269653 part 2, r=kats) (72110b7bc7) - Bug 1264764 - Move PTexture under PCompositorBridge r=nical,dvander (17e6ec7fc1) - Move CompositorThreadHolder into its own file. (bug 1273017 part 1, r=mattwoodrow) (464ede8be1) - Move CompositorBridgeParent::CompositorLoop to CompositorThreadHolder. (bug 1273017 part 2, r=mattwoodrow) (85708f3cde) - Bug 1268313: Part 1 - Be explicit about which NewRunnableMethod callers want to be able to cancel. r=froydnj (faa07aa139) - Bug 1268313: Part 2 - Replace some NewRunnableMethods with NS_NewNonOwningRunnableMethod. r=froydnj (010c43d000) - Bug 1268313: Part 3 - Replace some NewCancelableRunnableMethod with NS_NewNonOwningCancelableRunnableMethod. r=froydnj (55018ef234) - Bug 1268313: Part 4 - Replace NewCancelableRunnableMethod with NS_NewCancelableRunnableMethod. r=froydnj (c22711b35d) - Bug 1268313: Part 5 - Make NS_NewRunnableMethod able to call const functions. r=froydnj (b0f60963a3) - Bug 1268313: Part 6 - Replace NewRunnableMethod with NS_NewRunnableMethod. r=froydnj (18d40def2c) - Bug 1260950 - Set mInitialSizeFound to true when the initial size id found. r=jesup, r=pehrsons a=kwierso (5d6abe57e0) - Bug 1237176 - Notify synth start if we get a finished event without a blocking-changed event. r=roc (c1aebe903a) - Bug 911546, use a runnable so that popups don't rollup during a grab, r=karlt (a06bd44e6c) - Bug 1237617 - Call nsWindow::ForcePresent during going active r=bas.schouten (066cad8f89) - Bug 1268313: Part 7 - Move NS_NewRunnableMethod and friends to mozilla::NewRunnableMethod. r=froydnj (8b4bf34961) - Bug 1266595: Followup to fix IPDL tests. r=billm (216f2dcff5) - Bug 1268313: Fix up IPDL tests. r=billm (228348d642) - Add WinCompositorWidgetProxy. (bug 1265975 part 1, r=jimm) (bfafe7a8e2) - Implement WinCompositorWidgetProxy::GetClientSize. (bug 1265975 part 2, r=jimm) (a8710a3259) - Move the WM_SETTEXT present lock to CompositorWidgetProxy. (bug 1265975 part 3, r=jimm) (297ce28c8a) - Move transparency handling to WinCompositorWigetProxy. (bug 1265975 part 4, r=jimm) (46ba0c6d01) - Remove Windows-specific compositor calls to nsIWidget. (bug 1265975 part 5, r=jimm) (3ef157c160) - Remove plugin-related CompositorBridgeParent use of nsIWidget. (bug 1265975 part 6, r=jimm) (6d80cdd6fd) - Hide top-level CompositorBridgeParents behind a new API. (bug 1272472 part 4, r=mattwoodrow,kats,gwagner) (228c0efdb7) - Bug 1253424 - part 1 - add a already_AddRefed nsTransactionStack::Push overload; r=erahm (7059e20914) - Bug 1253424 - part 2 - add nsTransactionStack::IsEmpty; r=erahm (7e9764a146) - Bug 1254618 - modify nsTransactionStack to use nsDeque rather than std::deque; r=ehsan (5e47ea431e) - Bug 1136857 - Make DOMStorageCache::mLoaded flag atomic to prevent potential races, r=nfroyd (39aaea1de3) - Bug 1265408 - Add webidl for IIRFilterNode; r=smaug (040ce9aa43) - Bug 1265408 - Implement IIRFilterNode; r=padenot (6bf569a412) - Bug 1265408 - Import IIRFilter from blink; r=padenot (71b28c0ad2) - Bug 1265408 - Use IIRFilter from blink; r=padenot (5d058d8568) - Bug 1265408 - Add buffersAreZero to IIRFilter; r=karlt (45edba3e13) - Bug 1265408 - Avoid subnormals in IIRFilter; r=karlt (0e1ae93f0b) - Bug 1265408 - Add LogToDeveloperConsole to WebAudioUtils; r=padenot (88d5f0222a) - Bug 1268984 - Store GMPStorage on GMPServiceParent so that it persists inside the same PB session. r=gerald (17d4d0abaf) - Bug 1267905 - Replace uses of ScopedCERTCertList with UniqueCERTCertList. r=keeler (783bf11b2a) - Bug 1270005 - Replace uses of ScopedPK11SlotInfo with UniquePK11SlotInfo in PSM. r=keeler (ea9a4011aa) - Bug 1271501 - Remove unnecessary uses of reinterpret_cast in PSM. r=keeler (6be40f0a85) - Bug 1271501 - Downgrade unnecessarily strong reinterpret_casts in PSM. r=keeler (95245f00ce) - Bug 1082346 - 01. Convert PKCS12 password endian using copyAndSwapToBigEndian. r=keeler (9cc58fc550) - Bug 1082346 - 02. Test case. r=keeler r=Cykesiopka (7fb0e8abc4) - Bug 160122 - Stop using PR_smprintf in PSM. r=keeler (1e5b68819c) - Bug 1271501 - Use mozilla::BitwiseCast instead of reinterpret_cast in PSM. r=keeler (894966a2ef) - Bug 1273855: TraceLogger - Include PID in the log names in order to support browser with e10s, r=bbouvier (8cf2233db3) - Bug 1274189. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (4511b3d3f7) - Bug 1274189. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (77e745fdd1) - Bug 1274189. Part 3 - remove use of FlushableTaskQueue. r=jya (aac61dcd02) - Bug 1269963. Part 1 - Add a SyncRunnable::DispatchToThread() overload for AbstractThread. r=bobbyholley. (839752aff4) - Bug 1269672 - part1 : revert sampling rate changing of the bug1235612. (9015782e13) - Bug 1270698 - check if we need to enter buffering periodically to ensure we start buffering when running out of decoded audio/video data. r=cpearce. (16734549b7) - Bug 1271581 - use newCurrentTime, instead of GetMediaTime() to decide the nextState; r=jwwang (9c5075eada) - Bug 1224973 - Part 1: Remove MediaDecoderOwner->IsHidden(). r=cpearce,jwwang (4fde3ede5a) - Bug 1224973 - Part 2: Set MediaDecoder visibility via NotifyOwnerActivityChanged. r=cpearce,jwwang (be917202eb) - Bug 1224973 - Part 3: Plumb element visibility into MDSM. r=jya,jwwang (9ec83fa243) - Bug 1224973 - Part 4: Pref media.suspend-bkgnd-video.enabled. r=cpearce,jwwang (43413a025f) - Bug 1269408: P1. Retry InternalSeek if previous attempt failed once more data is available. r=gerald (05db58dc7c) - crude fix (0097068989) - Bug 1269408: P2. Update mochitest. r=gerald (464b4c0724) - Bug 1269408: P3. Ensure a new seek request will cancel the previous internal seek. r=gerald (6ed4b8dc95) - Bug 1269408: P4. Ensure the decoders are flushed prior performing an internal seek. r=gerald (074234067b) - Bug 1269408: P5. Only drop the seek target if it's exactly the seek target. r=gerald (88701eb05a) - Bug 1269408: P6. Add debugging information, useful when a mochitest timeout. r=gerald (ef0270ab0d) - Bug 1269408: P7. Start skip to next keyframe logic when resume point is behind current time. r=gerald (bd40ebf3bc) - Bug 1269408: P8. Add debugging log. r=gerald (e6dbd1f0a6) - Bug 1269408: P9. Move handling logic of skip to next keyframe to its own function. r=gerald (3c8039e417) - Bug 1269408: P10. Reject promise early if in error state. r=me (8af54c574e) - Bug 1224973 - Part 5: Implement suspend decoding for background video. r=cpearce,jwwang,jya (22081521e3) - Bug 1242874 - part1 : create suspened types. r=baku (d3ac9548e5) - Bug 1242874 - part2 : window's suspend attribute. r=baku, r=ehsan (1fd9dc2647) - remove allowscirpted (39ab523036) - Bug 1242874 - part3 : implement different suspended methods. r=baku, r=jwwang (25d1f27a03) - Bug 1242874 - part4 : wrap the volume/mute/suspend for notifyStartedPlaying. r=baku (b8ba3238c2) - bug 1242874 - part5 : add test. r=baku, r=ehsan (f840139b5a) - Bug 1235612 - Part 1: Implement notify media-playback. r=baku (b5ec29da20) - Bug 1235612 - Part 2: Notify audible state in NotifyStartedPlaying. r=baku (dc38583a62) - Bug 1235612 - Part 3: Implement the logic of audible state notification for agent owners. r=baku (f65b3952fa) - Bug 1235612 - Part 4: Modify check audible method. r=jwwang (73457e39eb) - Bug 1269672 - part2 : move audible data checking from MDSM to DecodedAudioDataSink. (d2c3b6874c) - Bug 1269936 - Introduce and call a runtime-wide servo initialization hook. r=heycam (d4d505d4c2) - Bug 1263778 - Rename a bunch of low-level [[Prototype]] access methods to make their interactions with statically-known and dynamically-computed [[Prototype]]s clearer. r=efaust (66bbe8e7db) - Bug 888969 - Permit a cyclic [[Prototype]] chain to be created through a Location object. r=bz, r=efaust (3e3b9cbb16) - re-apply Bug 1054906 - Implement ES6 Symbol.hasInstance 2/2; r=jandem (8d5c7573ff) - Bug 1054906 - Implement ES6 Symbol.hasInstance 1/2; r=evilpie,bz (a836904e5d) - fix misspatch (54a5f2d708) - Bug 1270349 part 1. Add IDL parser support for [LegacyUnenumerableNamedProperties]. r=peterv (8c836bc74a) - Bug 1270349 part 2. Add [LegacyUnenumerableNamedProperties] to the interfaces that specify it in DOM and HTML. r=peterv (25d3cc1377) - Bug 1270349 part 3. Add a way to ask an interface descriptor for a proxy whether its named props should be enumerable. r=peterv (0a9f804867) - Bug 1270349 part 4. Use LegacyUnenumerableNamedProperties instead of NameIsEnumerable() calls to determine whether named props on DOM proxies should be enumerable. r=peterv (82f5158963) - Bug 1270349 part 5. Use LegacyUnenumerableNamedProperties instead of passing flags to GetSupportedNames to determine whether named props on DOM proxies should be reflected in ownPropertyKeys. r=peterv (3984176834) - Bug 1270349 followup to address a review comment. r=peterv (b49f4c5335)
660 lines
16 KiB
C++
660 lines
16 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
/*****************************************************************************
|
|
*
|
|
* nsProcess is used to execute new processes and specify if you want to
|
|
* wait (blocking) or continue (non-blocking).
|
|
*
|
|
*****************************************************************************
|
|
*/
|
|
|
|
#include "mozilla/ArrayUtils.h"
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsMemory.h"
|
|
#include "nsProcess.h"
|
|
#include "prio.h"
|
|
#include "prenv.h"
|
|
#include "nsCRT.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "nsIObserverService.h"
|
|
#include "mozilla/Services.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#if defined(PROCESSMODEL_WINAPI)
|
|
#include "prmem.h"
|
|
#include "nsString.h"
|
|
#include "nsLiteralString.h"
|
|
#include "nsReadableUtils.h"
|
|
#else
|
|
#ifdef XP_MACOSX
|
|
#include <crt_externs.h>
|
|
#include <spawn.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/errno.h>
|
|
#endif
|
|
#include <sys/types.h>
|
|
#include <signal.h>
|
|
#endif
|
|
|
|
using namespace mozilla;
|
|
|
|
#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
|
|
|
|
//-------------------------------------------------------------------//
|
|
// nsIProcess implementation
|
|
//-------------------------------------------------------------------//
|
|
NS_IMPL_ISUPPORTS(nsProcess, nsIProcess,
|
|
nsIObserver)
|
|
|
|
//Constructor
|
|
nsProcess::nsProcess()
|
|
: mThread(nullptr)
|
|
, mLock("nsProcess.mLock")
|
|
, mShutdown(false)
|
|
, mBlocking(false)
|
|
, mPid(-1)
|
|
, mObserver(nullptr)
|
|
, mWeakObserver(nullptr)
|
|
, mExitValue(-1)
|
|
#if !defined(XP_MACOSX)
|
|
, mProcess(nullptr)
|
|
#endif
|
|
{
|
|
}
|
|
|
|
//Destructor
|
|
nsProcess::~nsProcess()
|
|
{
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsProcess::Init(nsIFile* aExecutable)
|
|
{
|
|
if (mExecutable) {
|
|
return NS_ERROR_ALREADY_INITIALIZED;
|
|
}
|
|
|
|
if (NS_WARN_IF(!aExecutable)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
bool isFile;
|
|
|
|
//First make sure the file exists
|
|
nsresult rv = aExecutable->IsFile(&isFile);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
if (!isFile) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
//Store the nsIFile in mExecutable
|
|
mExecutable = aExecutable;
|
|
//Get the path because it is needed by the NSPR process creation
|
|
#ifdef XP_WIN
|
|
rv = mExecutable->GetTarget(mTargetPath);
|
|
if (NS_FAILED(rv) || mTargetPath.IsEmpty())
|
|
#endif
|
|
rv = mExecutable->GetPath(mTargetPath);
|
|
|
|
return rv;
|
|
}
|
|
|
|
|
|
#if defined(XP_WIN)
|
|
// Out param `aWideCmdLine` must be PR_Freed by the caller.
|
|
static int
|
|
assembleCmdLine(char* const* aArgv, wchar_t** aWideCmdLine, UINT aCodePage)
|
|
{
|
|
char* const* arg;
|
|
char* p;
|
|
char* q;
|
|
char* cmdLine;
|
|
int cmdLineSize;
|
|
int numBackslashes;
|
|
int i;
|
|
int argNeedQuotes;
|
|
|
|
/*
|
|
* Find out how large the command line buffer should be.
|
|
*/
|
|
cmdLineSize = 0;
|
|
for (arg = aArgv; *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 */
|
|
}
|
|
p = cmdLine = (char*)PR_MALLOC(cmdLineSize * sizeof(char));
|
|
if (!p) {
|
|
return -1;
|
|
}
|
|
|
|
for (arg = aArgv; *arg; ++arg) {
|
|
/* Add a space to separates the arguments */
|
|
if (arg != aArgv) {
|
|
*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';
|
|
int32_t numChars = MultiByteToWideChar(aCodePage, 0, cmdLine, -1, nullptr, 0);
|
|
*aWideCmdLine = (wchar_t*)PR_MALLOC(numChars * sizeof(wchar_t));
|
|
MultiByteToWideChar(aCodePage, 0, cmdLine, -1, *aWideCmdLine, numChars);
|
|
PR_Free(cmdLine);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
void
|
|
nsProcess::Monitor(void* aArg)
|
|
{
|
|
RefPtr<nsProcess> process = dont_AddRef(static_cast<nsProcess*>(aArg));
|
|
|
|
if (!process->mBlocking) {
|
|
PR_SetCurrentThreadName("RunProcess");
|
|
}
|
|
|
|
#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
|
|
{
|
|
MutexAutoLock lock(process->mLock);
|
|
CloseHandle(process->mProcess);
|
|
process->mProcess = nullptr;
|
|
process->mExitValue = exitCode;
|
|
if (process->mShutdown) {
|
|
return;
|
|
}
|
|
}
|
|
#else
|
|
#ifdef XP_MACOSX
|
|
int exitCode = -1;
|
|
int status = 0;
|
|
pid_t result;
|
|
do {
|
|
result = waitpid(process->mPid, &status, 0);
|
|
} while (result == -1 && errno == EINTR);
|
|
if (result == process->mPid) {
|
|
if (WIFEXITED(status)) {
|
|
exitCode = WEXITSTATUS(status);
|
|
} else if (WIFSIGNALED(status)) {
|
|
exitCode = 256; // match NSPR's signal exit status
|
|
}
|
|
}
|
|
#else
|
|
int32_t exitCode = -1;
|
|
if (PR_WaitProcess(process->mProcess, &exitCode) != PR_SUCCESS) {
|
|
exitCode = -1;
|
|
}
|
|
#endif
|
|
|
|
// Lock in case Kill or GetExitCode are called during this
|
|
{
|
|
MutexAutoLock lock(process->mLock);
|
|
#if !defined(XP_MACOSX)
|
|
process->mProcess = nullptr;
|
|
#endif
|
|
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 {
|
|
NS_DispatchToMainThread(NewRunnableMethod(process, &nsProcess::ProcessComplete));
|
|
}
|
|
}
|
|
|
|
void
|
|
nsProcess::ProcessComplete()
|
|
{
|
|
if (mThread) {
|
|
nsCOMPtr<nsIObserverService> os =
|
|
mozilla::services::GetObserverService();
|
|
if (os) {
|
|
os->RemoveObserver(this, "xpcom-shutdown");
|
|
}
|
|
PR_JoinThread(mThread);
|
|
mThread = nullptr;
|
|
}
|
|
|
|
const char* topic;
|
|
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;
|
|
}
|
|
mObserver = nullptr;
|
|
mWeakObserver = nullptr;
|
|
|
|
if (observer) {
|
|
observer->Observe(NS_ISUPPORTS_CAST(nsIProcess*, this), topic, nullptr);
|
|
}
|
|
}
|
|
|
|
// XXXldb |aArgs| has the wrong const-ness
|
|
NS_IMETHODIMP
|
|
nsProcess::Run(bool aBlocking, const char** aArgs, uint32_t aCount)
|
|
{
|
|
return CopyArgsAndRunProcess(aBlocking, aArgs, aCount, nullptr, false);
|
|
}
|
|
|
|
// XXXldb |aArgs| has the wrong const-ness
|
|
NS_IMETHODIMP
|
|
nsProcess::RunAsync(const char** aArgs, uint32_t aCount,
|
|
nsIObserver* aObserver, bool aHoldWeak)
|
|
{
|
|
return CopyArgsAndRunProcess(false, aArgs, aCount, aObserver, aHoldWeak);
|
|
}
|
|
|
|
nsresult
|
|
nsProcess::CopyArgsAndRunProcess(bool aBlocking, const char** aArgs,
|
|
uint32_t aCount, nsIObserver* aObserver,
|
|
bool aHoldWeak)
|
|
{
|
|
// Add one to the aCount for the program name and one for null termination.
|
|
char** my_argv = nullptr;
|
|
my_argv = (char**)NS_Alloc(sizeof(char*) * (aCount + 2));
|
|
if (!my_argv) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
my_argv[0] = ToNewUTF8String(mTargetPath);
|
|
|
|
for (uint32_t i = 0; i < aCount; ++i) {
|
|
my_argv[i + 1] = const_cast<char*>(aArgs[i]);
|
|
}
|
|
|
|
my_argv[aCount + 1] = nullptr;
|
|
|
|
nsresult rv = RunProcess(aBlocking, my_argv, aObserver, aHoldWeak, false);
|
|
|
|
NS_Free(my_argv[0]);
|
|
NS_Free(my_argv);
|
|
return rv;
|
|
}
|
|
|
|
// XXXldb |aArgs| has the wrong const-ness
|
|
NS_IMETHODIMP
|
|
nsProcess::Runw(bool aBlocking, const char16_t** aArgs, uint32_t aCount)
|
|
{
|
|
return CopyArgsAndRunProcessw(aBlocking, aArgs, aCount, nullptr, false);
|
|
}
|
|
|
|
// XXXldb |aArgs| has the wrong const-ness
|
|
NS_IMETHODIMP
|
|
nsProcess::RunwAsync(const char16_t** aArgs, uint32_t aCount,
|
|
nsIObserver* aObserver, bool aHoldWeak)
|
|
{
|
|
return CopyArgsAndRunProcessw(false, aArgs, aCount, aObserver, aHoldWeak);
|
|
}
|
|
|
|
nsresult
|
|
nsProcess::CopyArgsAndRunProcessw(bool aBlocking, const char16_t** aArgs,
|
|
uint32_t aCount, nsIObserver* aObserver,
|
|
bool aHoldWeak)
|
|
{
|
|
// Add one to the aCount for the program name and one for null termination.
|
|
char** my_argv = nullptr;
|
|
my_argv = (char**)NS_Alloc(sizeof(char*) * (aCount + 2));
|
|
if (!my_argv) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
my_argv[0] = ToNewUTF8String(mTargetPath);
|
|
|
|
for (uint32_t i = 0; i < aCount; i++) {
|
|
my_argv[i + 1] = ToNewUTF8String(nsDependentString(aArgs[i]));
|
|
}
|
|
|
|
my_argv[aCount + 1] = nullptr;
|
|
|
|
nsresult rv = RunProcess(aBlocking, my_argv, aObserver, aHoldWeak, true);
|
|
|
|
for (uint32_t i = 0; i <= aCount; ++i) {
|
|
NS_Free(my_argv[i]);
|
|
}
|
|
NS_Free(my_argv);
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsProcess::RunProcess(bool aBlocking, char** aMyArgv, nsIObserver* aObserver,
|
|
bool aHoldWeak, bool aArgsUTF8)
|
|
{
|
|
if (NS_WARN_IF(!mExecutable)) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
if (NS_WARN_IF(mThread)) {
|
|
return NS_ERROR_ALREADY_INITIALIZED;
|
|
}
|
|
|
|
if (aObserver) {
|
|
if (aHoldWeak) {
|
|
mWeakObserver = do_GetWeakReference(aObserver);
|
|
if (!mWeakObserver) {
|
|
return NS_NOINTERFACE;
|
|
}
|
|
} else {
|
|
mObserver = aObserver;
|
|
}
|
|
}
|
|
|
|
mExitValue = -1;
|
|
mPid = -1;
|
|
|
|
#if defined(PROCESSMODEL_WINAPI)
|
|
BOOL retVal;
|
|
wchar_t* cmdLine = nullptr;
|
|
|
|
// |aMyArgv| is null-terminated and always starts with the program path. If
|
|
// the second slot is non-null then arguments are being passed.
|
|
if (aMyArgv[1] && assembleCmdLine(aMyArgv + 1, &cmdLine,
|
|
aArgsUTF8 ? CP_UTF8 : CP_ACP) == -1) {
|
|
return NS_ERROR_FILE_EXECUTION_FAILED;
|
|
}
|
|
|
|
/* 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.
|
|
*/
|
|
|
|
// The program name in aMyArgv[0] is always UTF-8
|
|
NS_ConvertUTF8toUTF16 wideFile(aMyArgv[0]);
|
|
|
|
SHELLEXECUTEINFOW sinfo;
|
|
memset(&sinfo, 0, sizeof(SHELLEXECUTEINFOW));
|
|
sinfo.cbSize = sizeof(SHELLEXECUTEINFOW);
|
|
sinfo.hwnd = nullptr;
|
|
sinfo.lpFile = wideFile.get();
|
|
sinfo.nShow = SW_SHOWNORMAL;
|
|
sinfo.fMask = SEE_MASK_FLAG_DDEWAIT |
|
|
SEE_MASK_NO_CONSOLE |
|
|
SEE_MASK_NOCLOSEPROCESS;
|
|
|
|
if (cmdLine) {
|
|
sinfo.lpParameters = cmdLine;
|
|
}
|
|
|
|
retVal = ShellExecuteExW(&sinfo);
|
|
if (!retVal) {
|
|
return NS_ERROR_FILE_EXECUTION_FAILED;
|
|
}
|
|
|
|
mProcess = sinfo.hProcess;
|
|
|
|
if (cmdLine) {
|
|
PR_Free(cmdLine);
|
|
}
|
|
|
|
mPid = GetProcessId(mProcess);
|
|
#elif defined(XP_MACOSX)
|
|
// Initialize spawn attributes.
|
|
posix_spawnattr_t spawnattr;
|
|
if (posix_spawnattr_init(&spawnattr) != 0) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Set spawn attributes.
|
|
size_t attr_count = ArrayLength(pref_cpu_types);
|
|
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;
|
|
}
|
|
|
|
// Note: |aMyArgv| is already null-terminated as required by posix_spawnp.
|
|
pid_t newPid = 0;
|
|
int result = posix_spawnp(&newPid, aMyArgv[0], nullptr, &spawnattr, aMyArgv,
|
|
*_NSGetEnviron());
|
|
mPid = static_cast<int32_t>(newPid);
|
|
|
|
posix_spawnattr_destroy(&spawnattr);
|
|
|
|
if (result != 0) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
#else
|
|
mProcess = PR_CreateProcess(aMyArgv[0], aMyArgv, nullptr, nullptr);
|
|
if (!mProcess) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
struct MYProcess
|
|
{
|
|
uint32_t pid;
|
|
};
|
|
MYProcess* ptrProc = (MYProcess*)mProcess;
|
|
mPid = ptrProc->pid;
|
|
#endif
|
|
|
|
NS_ADDREF_THIS();
|
|
mBlocking = aBlocking;
|
|
if (aBlocking) {
|
|
Monitor(this);
|
|
if (mExitValue < 0) {
|
|
return NS_ERROR_FILE_EXECUTION_FAILED;
|
|
}
|
|
} else {
|
|
mThread = PR_CreateThread(PR_SYSTEM_THREAD, Monitor, this,
|
|
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
|
|
PR_JOINABLE_THREAD, 0);
|
|
if (!mThread) {
|
|
NS_RELEASE_THIS();
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// It isn't a failure if we just can't watch for shutdown
|
|
nsCOMPtr<nsIObserverService> os =
|
|
mozilla::services::GetObserverService();
|
|
if (os) {
|
|
os->AddObserver(this, "xpcom-shutdown", false);
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsProcess::GetIsRunning(bool* aIsRunning)
|
|
{
|
|
if (mThread) {
|
|
*aIsRunning = true;
|
|
} else {
|
|
*aIsRunning = false;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsProcess::GetPid(uint32_t* aPid)
|
|
{
|
|
if (!mThread) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
if (mPid < 0) {
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
*aPid = mPid;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsProcess::Kill()
|
|
{
|
|
if (!mThread) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
#if defined(PROCESSMODEL_WINAPI)
|
|
if (TerminateProcess(mProcess, 0) == 0) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
#elif defined(XP_MACOSX)
|
|
if (kill(mPid, SIGKILL) != 0) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
#else
|
|
if (!mProcess || (PR_KillProcess(mProcess) != PR_SUCCESS)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
// We must null out mThread if we want IsRunning to return false immediately
|
|
// after this call.
|
|
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
|
|
if (os) {
|
|
os->RemoveObserver(this, "xpcom-shutdown");
|
|
}
|
|
PR_JoinThread(mThread);
|
|
mThread = nullptr;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsProcess::GetExitValue(int32_t* aExitValue)
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
|
|
*aExitValue = mExitValue;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsProcess::Observe(nsISupports* aSubject, const char* aTopic,
|
|
const char16_t* aData)
|
|
{
|
|
// Shutting down, drop all references
|
|
if (mThread) {
|
|
nsCOMPtr<nsIObserverService> os =
|
|
mozilla::services::GetObserverService();
|
|
if (os) {
|
|
os->RemoveObserver(this, "xpcom-shutdown");
|
|
}
|
|
mThread = nullptr;
|
|
}
|
|
|
|
mObserver = nullptr;
|
|
mWeakObserver = nullptr;
|
|
|
|
MutexAutoLock lock(mLock);
|
|
mShutdown = true;
|
|
|
|
return NS_OK;
|
|
}
|