mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1595834: Make GeckoProcessManager interface e10s-multi aware; r=snorp 

This patch does not change any of the *internals* of process management in
`GeckoProcessManager`, however it upgrades the interface in preparation for
such changes.

* We add a java equivalent to Gecko's `GeckoProcessType` enumeration;
* We add the `GeckoProcessType.Selector` class which will be used for
  identifying running content processes;
* We update `ContentParent::MarkAsDead` to use `GeckoProcessType.Selector` for
  indicating which process should be marked.

Differential Revision: https://phabricator.services.mozilla.com/D60539

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Aaron Klotz 2020-01-23 18:12:51 +00:00
Родитель 3b96774e64
Коммит ce2204248f
6 изменённых файлов: 119 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
dom/ipc/ContentParent.cpp
Просмотреть файл

@ -1657,10 +1657,14 @@ void ContentParent::MarkAsDead() {
nsCOMPtr<nsIEventTarget> launcherThread(GetIPCLauncher());
MOZ_ASSERT(launcherThread);
launcherThread->Dispatch(
NS_NewRunnableFunction("ContentParent::MarkAsDead", []() {
java::GeckoProcessManager::MarkAsDead(
XRE_GeckoProcessTypeToString(GeckoProcessType_Content));
auto procType = java::GeckoProcessType::CONTENT();
auto selector =
java::GeckoProcessManager::Selector::New(procType, OtherPid());
launcherThread->Dispatch(NS_NewRunnableFunction(
"ContentParent::MarkAsDead",
[selector = java::GeckoProcessManager::Selector::GlobalRef(selector)]() {
java::GeckoProcessManager::MarkAsDead(selector);
}));
#endif
}

7
ipc/glue/GeckoChildProcessHost.cpp
Просмотреть файл

@ -289,7 +289,7 @@ class AndroidProcessLauncher : public PosixProcessLauncher {
protected:
virtual RefPtr<ProcessHandlePromise> DoLaunch() override;
RefPtr<ProcessHandlePromise> LaunchAndroidService(
const char* type, const std::vector<std::string>& argv,
const GeckoProcessType aType, const std::vector<std::string>& argv,
const base::file_handle_mapping_vector& fds_to_remap);
};
typedef AndroidProcessLauncher ProcessLauncher;
@ -1189,7 +1189,7 @@ bool PosixProcessLauncher::DoSetup() {
#if defined(MOZ_WIDGET_ANDROID)
RefPtr<ProcessHandlePromise> AndroidProcessLauncher::DoLaunch() {
return LaunchAndroidService(ChildProcessType(), mChildArgv,
return LaunchAndroidService(mProcessType, mChildArgv,
mLaunchOptions->fds_to_remap);
}
#endif // MOZ_WIDGET_ANDROID
@ -1603,7 +1603,7 @@ void GeckoChildProcessHost::GetQueuedMessages(std::queue<IPC::Message>& queue) {
#ifdef MOZ_WIDGET_ANDROID
RefPtr<ProcessHandlePromise> AndroidProcessLauncher::LaunchAndroidService(
const char* type, const std::vector<std::string>& argv,
const GeckoProcessType aType, const std::vector<std::string>& argv,
const base::file_handle_mapping_vector& fds_to_remap) {
MOZ_RELEASE_ASSERT((2 <= fds_to_remap.size()) && (fds_to_remap.size() <= 5));
JNIEnv* const env = mozilla::jni::GetEnvForThread();
@ -1634,6 +1634,7 @@ RefPtr<ProcessHandlePromise> AndroidProcessLauncher::LaunchAndroidService(
crashAnnotationFd = fds_to_remap[4].first;
}
auto type = java::GeckoProcessType::FromInt(aType);
auto genericResult = java::GeckoProcessManager::Start(
type, jargs, prefsFd, prefMapFd, ipcFd, crashFd, crashAnnotationFd);
auto typedResult = java::GeckoResult::LocalRef(std::move(genericResult));

3
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
Просмотреть файл

@ -9,6 +9,7 @@ import org.mozilla.gecko.annotation.RobocopTarget;
import org.mozilla.gecko.annotation.WrapForJNI;
import org.mozilla.gecko.mozglue.GeckoLoader;
import org.mozilla.gecko.process.GeckoProcessManager;
import org.mozilla.gecko.process.GeckoProcessType;
import org.mozilla.gecko.util.GeckoBundle;
import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.geckoview.BuildConfig;
@ -449,7 +450,7 @@ public class GeckoThread extends Thread {
if ((mInitInfo.flags & FLAG_PRELOAD_CHILD) != 0) {
// Preload the content ("tab") child process.
GeckoProcessManager.getInstance().preload("tab");
GeckoProcessManager.getInstance().preload(GeckoProcessType.CONTENT);
}
if ((mInitInfo.flags & FLAG_DEBUGGING) != 0) {

88
mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
Просмотреть файл

@ -55,15 +55,57 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
nativeGetEditableParent(child, contentId, tabId);
}
public static final class Selector {
private final GeckoProcessType mType;
private final int mPid;
@WrapForJNI
private Selector(@NonNull final GeckoProcessType type, final int pid) {
if (pid == INVALID_PID) {
throw new RuntimeException("Invalid PID");
}
mType = type;
mPid = pid;
}
public GeckoProcessType getType() {
return mType;
}
public int getPid() {
return mPid;
}
@Override
public boolean equals(final Object obj) {
if (obj == null) {
return false;
}
if (obj == ((Object)this)) {
return true;
}
final Selector other = (Selector) obj;
return mType == other.mType && mPid == other.mPid;
}
@Override
public int hashCode() {
return 31 * mType.hashCode() + mPid;
}
}
private static final class ChildConnection implements ServiceConnection,
IBinder.DeathRecipient {
private final String mType;
private final GeckoProcessType mType;
private IChildProcess mChild;
private GeckoResult<IChildProcess> mPendingBind;
private GeckoResult<Void> mPendingUnbind;
private int mPid;
public ChildConnection(final String type) {
public ChildConnection(@NonNull final GeckoProcessType type) {
mType = type;
}
@ -73,7 +115,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
try {
mPid = mChild.getPid();
} catch (final RemoteException e) {
Log.e(LOGTAG, "Cannot get pid for " + mType, e);
Log.e(LOGTAG, "Cannot get pid for " + mType.toString(), e);
}
}
return mPid;
@ -82,7 +124,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
private String buildLogMsg(@NonNull final String msgStart) {
final StringBuilder builder = new StringBuilder(msgStart);
builder.append(" ");
builder.append(mType);
builder.append(mType.toString());
int pid = getPid();
if (pid != INVALID_PID) {
@ -128,7 +170,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
final Context context = GeckoAppShell.getApplicationContext();
final Intent intent = new Intent();
intent.setClassName(context,
GeckoServiceChildProcess.class.getName() + '$' + mType);
GeckoServiceChildProcess.class.getName() + '$' + mType.toString());
mPendingBind = new GeckoResult<>();
try {
@ -267,13 +309,13 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
}
}
private final SimpleArrayMap<String, ChildConnection> mConnections;
private final SimpleArrayMap<GeckoProcessType, ChildConnection> mConnections;
private GeckoProcessManager() {
mConnections = new SimpleArrayMap<String, ChildConnection>();
mConnections = new SimpleArrayMap<GeckoProcessType, ChildConnection>();
}
private ChildConnection getConnection(final String type) {
private ChildConnection getConnection(final GeckoProcessType type) {
XPCOMEventTarget.assertOnLauncherThread();
ChildConnection connection = mConnections.get(type);
@ -284,15 +326,15 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
return connection;
}
public void preload(final String... types) {
public void preload(final GeckoProcessType... types) {
XPCOMEventTarget.launcherThread().dispatch(() -> {
for (final String type : types) {
for (final GeckoProcessType type : types) {
final ChildConnection connection = getConnection(type);
connection.bind().accept(child -> {
try {
child.getPid();
} catch (final RemoteException e) {
Log.e(LOGTAG, "Cannot get pid for " + type, e);
Log.e(LOGTAG, "Cannot get pid for " + type.toString(), e);
}
});
}
@ -301,7 +343,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
public void crashChild() {
XPCOMEventTarget.launcherThread().dispatch(() -> {
final ChildConnection conn = mConnections.get("tab");
final ChildConnection conn = mConnections.get(GeckoProcessType.CONTENT);
if (conn == null) {
return;
}
@ -316,9 +358,9 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
}
@WrapForJNI
private static void markAsDead(final String type) {
private static void markAsDead(final Selector selector) {
XPCOMEventTarget.assertOnLauncherThread();
final ChildConnection conn = INSTANCE.mConnections.get(type);
final ChildConnection conn = INSTANCE.mConnections.get(selector.getType());
if (conn == null) {
return;
}
@ -327,7 +369,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
}
@WrapForJNI
private static GeckoResult<Integer> start(final String type,
private static GeckoResult<Integer> start(final GeckoProcessType type,
final String[] args,
final int prefsFd,
final int prefMapFd,
@ -351,7 +393,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
return flags & GeckoThread.FLAG_ENABLE_NATIVE_CRASHREPORTER;
}
private void start(final GeckoResult<Integer> result, final String type,
private void start(final GeckoResult<Integer> result, final GeckoProcessType type,
final String[] args, final Bundle extras, final int flags,
final int prefsFd, final int prefMapFd, final int ipcFd,
final int crashFd, final int crashAnnotationFd,
@ -360,7 +402,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
crashFd, crashAnnotationFd, isRetry, /* prevException */ null);
}
private void start(final GeckoResult<Integer> result, final String type,
private void start(final GeckoResult<Integer> result, final GeckoProcessType type,
final String[] args, final Bundle extras, final int flags,
final int prefsFd, final int prefMapFd, final int ipcFd,
final int crashFd, final int crashAnnotationFd,
@ -384,7 +426,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
}
builder.append("; Type: ");
builder.append(type);
builder.append(type.toString());
result.completeExceptionally(new RuntimeException(builder.toString()));
});
@ -393,7 +435,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
private void start(final GeckoResult<Integer> result,
final ChildConnection connection,
final IChildProcess child,
final String type, final String[] args,
final GeckoProcessType type, final String[] args,
final Bundle extras, final int flags,
final int prefsFd, final int prefMapFd,
final int ipcFd, final int crashFd,
@ -442,7 +484,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
}
if (isRetry) {
Log.e(LOGTAG, "Cannot restart child " + type);
Log.e(LOGTAG, "Cannot restart child " + type.toString());
final StringBuilder builder = new StringBuilder("Cannot restart child.");
if (prevException != null) {
builder.append(" Initial RemoteException: ");
@ -454,14 +496,14 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
}
if (exception == null && prevException == null) {
builder.append(" No exceptions thrown; type = ");
builder.append(type);
builder.append(type.toString());
}
result.completeExceptionally(new RuntimeException(builder.toString()));
return;
}
final RemoteException captureException = exception;
Log.w(LOGTAG, "Attempting to kill running child " + type);
Log.w(LOGTAG, "Attempting to kill running child " + type.toString());
connection.unbind().accept(v -> {
start(result, type, args, extras, flags, prefsFd, prefMapFd, ipcFd,
crashFd, crashAnnotationFd, /* isRetry */ true, captureException);
@ -474,7 +516,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
}
builder.append("; Type = ");
builder.append(type);
builder.append(type.toString());
result.completeExceptionally(new RuntimeException(builder.toString()));
});

39
mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessType.java Normal file
Просмотреть файл

@ -0,0 +1,39 @@
/* 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/. */
package org.mozilla.gecko.process;
import org.mozilla.gecko.annotation.WrapForJNI;
@WrapForJNI
public enum GeckoProcessType {
// These need to match the stringified names from the GeckoProcessType enum
PARENT ("default"),
PLUGIN ("plugin"),
CONTENT ("tab"),
IPDLUNITTEST ("ipdlunittest"),
GMPLUGIN ("gmplugin"),
GPU ("gpu"),
VR ("vr"),
RDD ("rdd"),
SOCKET ("socket"),
REMOTESANDBOXBROKER ("sandboxbroker"),
FORKSERVER ("forkserver");
private final String mGeckoName;
private GeckoProcessType(final String geckoName) {
mGeckoName = geckoName;
}
@Override
public String toString() {
return mGeckoName;
}
private static final GeckoProcessType fromInt(final int type) {
return values()[type];
}
}

2
widget/android/nsAppShell.cpp
Просмотреть файл

@ -367,7 +367,7 @@ class XPCOMEventTargetWrapper final
java::XPCOMEventTarget::Natives<XPCOMEventTargetWrapper>::Init();
CreateWrapper(NS_LITERAL_STRING("main"), do_GetMainThread());
if (XRE_IsParentProcess()) {
CreateWrapper(NS_LITERAL_STRING("launcher"), ipc::GetIPCLauncher());
CreateWrapper(NS_LITERAL_STRING("launcher"), ipc::GetIPCLauncher());
}
}