android: Pass CPU properties from browser to renderer process.

content/public/android/java/src/org/chromium/content/browser/SandboxedProcessConnection.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
 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;
 import org.chromium.content.common.ISandboxedProcessService;
 import org.chromium.content.common.TraceEvent;
 
 public class SandboxedProcessConnection implements ServiceConnection {
     interface DeathCallback {
         void onSandboxedProcessDied(int pid);
     }
 
     // Names of items placed in the bind intent or connection bundle.
     public static final String EXTRA_COMMAND_LINE =
             "com.google.android.apps.chrome.extra.sandbox_command_line";
     public static final String EXTRA_NATIVE_LIBRARY_NAME =
             "com.google.android.apps.chrome.extra.sandbox_native_library_name";
     // Note the FDs may only be passed in the connection bundle.
     public static final String EXTRA_FILES_PREFIX =
             "com.google.android.apps.chrome.extra.sandbox_extraFile_";
     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;
 
     // Synchronization: While most internal flow occurs on the UI thread, the public API
     // (specifically bind and unbind) may be called from any thread, hence all entry point methods
     // into the class are synchronized on the SandboxedProcessConnection instance to protect access
     // to these members. But see also the TODO where AsyncBoundServiceConnection is created.
     private ISandboxedProcessService mService = null;
     private boolean mServiceConnectComplete = false;
@@ skipping 175 matching lines @@
                         Log.e(TAG,
                               "Invalid FD provided for process connection, aborting connection.",
                               e);
                         return;
                     }
 
                 }
                 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 have been removed. How do we
import the generated BuildConfig.java file from this package, it seems it's full
package name depends on the component being built.

+
             try {
                 mPID = mService.setupConnection(bundle, mConnectionParams.mCallback);
             } catch (android.os.RemoteException re) {
                 Log.e(TAG, "Failed to setup connection.", re);
             }
             // We proactivley close the FDs rather than wait for GC & finalizer.
             try {
                 for (ParcelFileDescriptor parcelFile : parcelFiles) {
                     if (parcelFile != null) parcelFile.close();
                 }
@@ skipping 82 matching lines @@
         }
     }
 
     /**
      * @return The connection PID, or 0 if not yet connected.
      */
     synchronized public int getPid() {
         return mPID;
     }
 }