mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
39770f3213
- Bug 1274192 part 1 - make the MediaDecoderReaderWrapper as a proxy of WaitForData(); r=jwwang (9debdca9a9) - Bug 1274192 part 2 - make MDSM and SeekTask to adopt new MediaDecoderReaderWrapper API; r=jwwang (156f924dc9) - Bug 1276495: Don't reset audio promises for video only seek. r=jwwang,jya (c4632c7ff6) - Bug 1276318, part 1 - Fix leading tabs in ipc/glue. r=billm (46bcc4ccb3) - Bug 1035125 Part 6: Take Chromium commit 3181ba39ee787e1b40f4aea4be23f4f666ad0945 to add Windows 10 version to enumeration. r=aklotz (af62c8065f) - Bug 1270752 - Fix lifetime of buffer passed to PR_SetEnv(). r=jduell (bfce06ebea) - Bug 1275117 - Fix static strings leaks when mozlogging is on. r=jduell (8e9066c5d7) - Bug 1273048 - Add MOZ_GCC_VERSION_AT_MOST macro. r=froydnj (cfb5acdbe6) - Bug 1269968 - Remove unnecessary deduction on RefPtr.h. r=froydnj (30cf9bbf47) - Bug 525063 - add attribute to mark member variables that should be skipped by clang plugin initialization checker. r=nfroyd (78aa863f88) - Bug 1278391 - add move constructor to EnumeratedArray (r=njn) (5effe4e473) - Bug 1268518: Update basic-integer tests for rotations + clean up; r=sunfish (46827b6211) - Bug 1270370 - Part 1: Move SetIteratorObject to MapObject.h; r=jorendorff (01a27fbd50) - Bug 1270370 - Part 2: Expose MapIterator and SetIterator through ESClassValues; r=jorendorff (3edb3c7551) - Bug 1267551 (part 3) - Use MOZ_MUST_USE more in js/src/builtin/. r=jonco. (ea96d0fae0) - Bug 1267551 (part 4) - Use MOZ_MUST_USE more in js/src/asmjs/. r=bbouvier. (3e622c736d) - Bug 1268910: Refactor WebAssembly trap handling; r=luke (b59394a287) - Bug 1268910: Trap on edge cases for integer div/mod; r=sunfish (3d85230cc8) - Bug 1267551 (part 5) - Use MOZ_MUST_USE more in js/src/ctypes/. r=sfink. (e6580fb645) - Bug 1267551 (part 6) - Remove dead GenerateBlockId declaration. r=jorendorff. (74afcc549e) - Bug 1240072 - Add public JS APIs related to modules r=shu Bug 1267551 (part 7) - Use MOZ_MUST_USE more in js/src/frontend/. r=jorendorff. (5275c57768) - Bug 1267551 (part 8) - Use MOZ_MUST_USE more in js/src/gc/. r=terrence. (2572cc1c58) - Bug 1261063 - Part 1 - Remove public Telemetry functions that return raw histogram instances. r=chutten (3a68653c8f) - Bug 1261063 - Part 2 - Expose C++ function to clear Telemetry histograms. r=chutten (1f42f6aa1e) - Bug 1261063 - Part 3 - Make RasterImage use the public Telemetry API. r=tnikkel (0f564f3836) - Bug 1261063 - Part 4 - Use a count histogram for WebRTC call counts. r=jesup (b6b7b649e0) - Bug 1270073 - Point to Telemetry documentation in Telemetry.h. r=chutten (517279b284) - Bug 1261052 - Move C++ histogram implementation code into a separate module. r=gfritzsche. (66bcb1e167) - Bug 1145164 - Allow non-unitary increments to count histograms. r=gfritzsche (507e076e28) - Bug 1173447 - Add test for incremental pre-barriers when storing things under roots, r=jonco (caf8bd16be) - Bug 1267551 (part 10) - Use MOZ_MUST_USE in AutoVectorRooterBase. r=terrence. (2c5ed87a9f) - This catches a missing check. (b2fcd30fc5) - Bug 1267551 (part 11b) - Follow-up to fix Android bustage. r=me (f464ca7b98) - Bug 1271854 - Part 1: Allow specifying multiple GC zeal levels; r=terrence (da3c3e1281) - Bug 1271854 - Part 2: Allow specifying zeal modes by name as well; r=terrence (f63926e45b) - Bug 1271854 - Part 3: Avoid saving the GC zeal string inside the JS shell; r=terrence (f09b262e55) - Bug 1270062 - Unbust Windows full duplex. a=Tomcat (3c8b5887b6) - Bug 1270062 - Update libcubeb. rs=jesup (71805cb0e0) - Bug 1270004 - Update libcubeb. rs=jesup (2d90b9662f) - Bug 1280280 - Update cubeb to 073c9f011114. r=kinetik (6bee6a7f21) - Bug 1280280 - Update media/libcube/update.sh to add cubeb_jack.cpp, and sort the list of files. r=kinetik (430b7533c4) - Bug 1272604 - Add a zeal mode to check the heap after a moving GC r=terrence (85c018d71f) - Bug 1272604 - Fix bad implicit conversion constructor build error r=me (5c4e1dbc44) - Bug 1272604 - Fix hazard analysis failure r=me (0591aa2dca) - Bug 1232417 - Use a Variant to represent the CrossCompartmentWrapperMap key; r=jonco (512da0bab3) - Bug 1269928 - Fold DirectProxyHandler into Wrapper, which is now its only (non-test) consumer. r=efaust (7c6bb6e898) - Bug 1273639 - Add a nonunified spidermonkey build, r=terrence (d6fa13545c) - Bug 1273639 - Fix nonunified spidermonkey builds, r=terrence (3e0544510d) - Bug 1273180 - Trigger major GC if necessary after minor GC r=terrence (a9a9be8b17) - Bug 1268992 - Assert that the heap is empty after a shutdown GC; r=jonco (fe3ac5bdd6) - Bug 1273908 - Refactor GC to make it easier to add new kinds of GC thing r=terrence (51c92e1b05)
256 lines
8.2 KiB
C++
256 lines
8.2 KiB
C++
/* 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/. */
|
|
|
|
#ifndef __IPC_GLUE_GECKOCHILDPROCESSHOST_H__
|
|
#define __IPC_GLUE_GECKOCHILDPROCESSHOST_H__
|
|
|
|
#include "base/file_path.h"
|
|
#include "base/process_util.h"
|
|
#include "base/waitable_event.h"
|
|
#include "chrome/common/child_process_host.h"
|
|
|
|
#include "mozilla/Atomics.h"
|
|
#include "mozilla/DebugOnly.h"
|
|
#include "mozilla/ipc/FileDescriptor.h"
|
|
#include "mozilla/Monitor.h"
|
|
#include "mozilla/StaticPtr.h"
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsXULAppAPI.h" // for GeckoProcessType
|
|
#include "nsString.h"
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
#include "sandboxBroker.h"
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace ipc {
|
|
|
|
class GeckoChildProcessHost : public ChildProcessHost
|
|
{
|
|
protected:
|
|
typedef mozilla::Monitor Monitor;
|
|
typedef std::vector<std::string> StringVector;
|
|
|
|
public:
|
|
typedef base::ChildPrivileges ChildPrivileges;
|
|
typedef base::ProcessHandle ProcessHandle;
|
|
|
|
static ChildPrivileges DefaultChildPrivileges();
|
|
|
|
explicit GeckoChildProcessHost(GeckoProcessType aProcessType,
|
|
ChildPrivileges aPrivileges=base::PRIVILEGES_DEFAULT);
|
|
|
|
~GeckoChildProcessHost();
|
|
|
|
static nsresult GetArchitecturesForBinary(const char *path, uint32_t *result);
|
|
|
|
static uint32_t GetSupportedArchitecturesForProcessType(GeckoProcessType type);
|
|
|
|
static uint32_t GetUniqueID();
|
|
|
|
// Block until the IPC channel for our subprocess is initialized,
|
|
// but no longer. The child process may or may not have been
|
|
// created when this method returns.
|
|
bool AsyncLaunch(StringVector aExtraOpts=StringVector(),
|
|
base::ProcessArchitecture arch=base::GetCurrentProcessArchitecture());
|
|
|
|
virtual bool WaitUntilConnected(int32_t aTimeoutMs = 0);
|
|
|
|
// Block until the IPC channel for our subprocess is initialized and
|
|
// the OS process is created. The subprocess may or may not have
|
|
// connected back to us when this method returns.
|
|
//
|
|
// NB: on POSIX, this method is relatively cheap, and doesn't
|
|
// require disk IO. On win32 however, it requires at least the
|
|
// analogue of stat(). This difference induces a semantic
|
|
// difference in this method: on POSIX, when we return, we know the
|
|
// subprocess has been created, but we don't know whether its
|
|
// executable image can be loaded. On win32, we do know that when
|
|
// we return. But we don't know if dynamic linking succeeded on
|
|
// either platform.
|
|
bool LaunchAndWaitForProcessHandle(StringVector aExtraOpts=StringVector());
|
|
|
|
// Block until the child process has been created and it connects to
|
|
// the IPC channel, meaning it's fully initialized. (Or until an
|
|
// error occurs.)
|
|
bool SyncLaunch(StringVector aExtraOpts=StringVector(),
|
|
int32_t timeoutMs=0,
|
|
base::ProcessArchitecture arch=base::GetCurrentProcessArchitecture());
|
|
|
|
virtual bool PerformAsyncLaunch(StringVector aExtraOpts=StringVector(),
|
|
base::ProcessArchitecture aArch=base::GetCurrentProcessArchitecture());
|
|
|
|
virtual void OnChannelConnected(int32_t peer_pid);
|
|
virtual void OnMessageReceived(IPC::Message&& aMsg);
|
|
virtual void OnChannelError();
|
|
virtual void GetQueuedMessages(std::queue<IPC::Message>& queue);
|
|
|
|
virtual void InitializeChannel();
|
|
|
|
virtual bool CanShutdown() { return true; }
|
|
|
|
virtual void OnWaitableEventSignaled(base::WaitableEvent *event);
|
|
|
|
IPC::Channel* GetChannel() {
|
|
return channelp();
|
|
}
|
|
|
|
base::WaitableEvent* GetShutDownEvent() {
|
|
return GetProcessEvent();
|
|
}
|
|
|
|
// Returns a "borrowed" handle to the child process - the handle returned
|
|
// by this function must not be closed by the caller.
|
|
ProcessHandle GetChildProcessHandle() {
|
|
return mChildProcessHandle;
|
|
}
|
|
|
|
GeckoProcessType GetProcessType() {
|
|
return mProcessType;
|
|
}
|
|
|
|
#ifdef XP_MACOSX
|
|
task_t GetChildTask() {
|
|
return mChildTask;
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* Must run on the IO thread. Cause the OS process to exit and
|
|
* ensure its OS resources are cleaned up.
|
|
*/
|
|
void Join();
|
|
|
|
// For bug 943174: Skip the EnsureProcessTerminated call in the destructor.
|
|
void SetAlreadyDead();
|
|
|
|
// This associates an actor telling the process host to stay alive at least
|
|
// until DissociateActor has been called.
|
|
void AssociateActor() { mAssociatedActors++; }
|
|
|
|
// This gets called when actors get destroyed and will schedule the object
|
|
// for deletion when all actors have cleared their associations.
|
|
void DissociateActor();
|
|
|
|
protected:
|
|
GeckoProcessType mProcessType;
|
|
ChildPrivileges mPrivileges;
|
|
Monitor mMonitor;
|
|
FilePath mProcessPath;
|
|
|
|
// This value must be accessed while holding mMonitor.
|
|
enum {
|
|
// This object has been constructed, but the OS process has not
|
|
// yet.
|
|
CREATING_CHANNEL = 0,
|
|
// The IPC channel for our subprocess has been created, but the OS
|
|
// process has still not been created.
|
|
CHANNEL_INITIALIZED,
|
|
// The OS process has been created, but it hasn't yet connected to
|
|
// our IPC channel.
|
|
PROCESS_CREATED,
|
|
// The process is launched and connected to our IPC channel. All
|
|
// is well.
|
|
PROCESS_CONNECTED,
|
|
PROCESS_ERROR
|
|
} mProcessState;
|
|
|
|
static int32_t mChildCounter;
|
|
|
|
void PrepareLaunch();
|
|
|
|
#ifdef XP_WIN
|
|
void InitWindowsGroupID();
|
|
nsString mGroupId;
|
|
|
|
#ifdef MOZ_SANDBOX
|
|
SandboxBroker mSandboxBroker;
|
|
std::vector<std::wstring> mAllowedFilesRead;
|
|
std::vector<std::wstring> mAllowedFilesReadWrite;
|
|
std::vector<std::wstring> mAllowedDirectories;
|
|
bool mEnableSandboxLogging;
|
|
int32_t mSandboxLevel;
|
|
#endif
|
|
#endif // XP_WIN
|
|
|
|
#if defined(OS_POSIX)
|
|
base::file_handle_mapping_vector mFileMap;
|
|
#endif
|
|
|
|
base::WaitableEventWatcher::Delegate* mDelegate;
|
|
|
|
ProcessHandle mChildProcessHandle;
|
|
#if defined(OS_MACOSX)
|
|
task_t mChildTask;
|
|
#endif
|
|
|
|
void OpenPrivilegedHandle(base::ProcessId aPid);
|
|
|
|
private:
|
|
DISALLOW_EVIL_CONSTRUCTORS(GeckoChildProcessHost);
|
|
|
|
// Does the actual work for AsyncLaunch, on the IO thread.
|
|
bool PerformAsyncLaunchInternal(std::vector<std::string>& aExtraOpts,
|
|
base::ProcessArchitecture arch);
|
|
|
|
bool RunPerformAsyncLaunch(StringVector aExtraOpts=StringVector(),
|
|
base::ProcessArchitecture aArch=base::GetCurrentProcessArchitecture());
|
|
|
|
static void GetPathToBinary(FilePath& exePath);
|
|
|
|
// The buffer is passed to preserve its lifetime until we are done
|
|
// with launching the sub-process.
|
|
void SetChildLogName(const char* varName, const char* origLogName,
|
|
nsACString &buffer);
|
|
|
|
// 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
|
|
// because we have no idea what to do with those messages. So queue
|
|
// them here until we hand off the eventual listener.
|
|
//
|
|
// FIXME/cjones: this strongly indicates bad design. Shame on us.
|
|
std::queue<IPC::Message> mQueue;
|
|
|
|
// This tracks how many actors are associated with this process that require
|
|
// it to stay alive and have not yet been destroyed.
|
|
Atomic<int32_t> mAssociatedActors;
|
|
|
|
// Remember original env values so we can restore it (there is no other
|
|
// simple way how to change environment of a child process than to modify
|
|
// the current environment).
|
|
nsCString mRestoreOrigNSPRLogName;
|
|
nsCString mRestoreOrigMozLogName;
|
|
|
|
static uint32_t sNextUniqueID;
|
|
};
|
|
|
|
#ifdef MOZ_NUWA_PROCESS
|
|
class GeckoExistingProcessHost final : public GeckoChildProcessHost
|
|
{
|
|
public:
|
|
GeckoExistingProcessHost(GeckoProcessType aProcessType,
|
|
base::ProcessHandle aProcess,
|
|
const FileDescriptor& aFileDescriptor,
|
|
ChildPrivileges aPrivileges=base::PRIVILEGES_DEFAULT);
|
|
|
|
~GeckoExistingProcessHost();
|
|
|
|
virtual bool PerformAsyncLaunch(StringVector aExtraOpts=StringVector(),
|
|
base::ProcessArchitecture aArch=base::GetCurrentProcessArchitecture()) override;
|
|
|
|
virtual void InitializeChannel() override;
|
|
|
|
private:
|
|
base::ProcessHandle mExistingProcessHandle;
|
|
mozilla::ipc::FileDescriptor mExistingFileDescriptor;
|
|
};
|
|
#endif /* MOZ_NUWA_PROCESS */
|
|
|
|
} /* namespace ipc */
|
|
} /* namespace mozilla */
|
|
|
|
#endif /* __IPC_GLUE_GECKOCHILDPROCESSHOST_H__ */
|