Index: content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java b/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java |
index 719473de75260594b5debfe59751a84120eac60b..7e87510769c3fa1a5509dde2222b9894904fd1d3 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java |
@@ -20,6 +20,7 @@ import java.io.IOException; |
import java.util.concurrent.atomic.AtomicBoolean; |
import org.chromium.base.CalledByNative; |
+import org.chromium.base.CpuFeatures; |
import org.chromium.base.ThreadUtils; |
import org.chromium.content.common.CommandLine; |
import org.chromium.content.common.ISandboxedProcessCallback; |
@@ -42,6 +43,13 @@ public class SandboxedProcessConnection implements ServiceConnection { |
public static final String EXTRA_FILES_ID_SUFFIX = "_id"; |
public static final String EXTRA_FILES_FD_SUFFIX = "_fd"; |
+ // Used to pass the CPU core count to sandboxed processes. |
+ public static final String EXTRA_CPU_COUNT = |
+ "com.google.android.apps.chrome.extra.cpu_count"; |
+ // Used to pass the CPU features mask to sandboxed processes. |
+ public static final String EXTRA_CPU_FEATURES = |
+ "com.google.android.apps.chrome.extra.cpu_features"; |
+ |
private final Context mContext; |
private final int mServiceNumber; |
private final SandboxedProcessConnection.DeathCallback mDeathCallback; |
@@ -237,6 +245,11 @@ public class SandboxedProcessConnection implements ServiceConnection { |
bundle.putParcelable(fdName, parcelFiles[i]); |
bundle.putInt(idName, fileInfos[i].mId); |
} |
+ // Add the CPU properties now. |
+ bundle.putInt(EXTRA_CPU_COUNT, CpuFeatures.getCount()); |
+ bundle.putLong(EXTRA_CPU_FEATURES, CpuFeatures.getMask()); |
+ Log.i(TAG, "Sending CPU features: count=" + CpuFeatures.getCount() + " features=" + CpuFeatures.getMask()); |
bulach
2012/12/10 14:03:07
nit: >100cols
digit1
2012/12/10 14:44:56
Actually, this was a debug message that should hav
|
+ |
try { |
mPID = mService.setupConnection(bundle, mConnectionParams.mCallback); |
} catch (android.os.RemoteException re) { |