resolved conflicts for merge of 41e99538 to master (c9ad7c6d) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -850,10 +850,6 @@ public final class ActivityThread {
		}

		private final class H extends Handler {
		private H() {
		SamplingProfiler.getInstance().setEventThread(mLooper.getThread());
		}

		public static final int LAUNCH_ACTIVITY = 100;
		public static final int PAUSE_ACTIVITY = 101;
		public static final int PAUSE_ACTIVITY_FINISHING= 102;

core/java/com/android/internal/os/SamplingProfilerIntegration.java

+45 −28

Original line number	Diff line number	Diff line
		@@ -16,16 +16,19 @@

		package com.android.internal.os;

		import android.content.pm.PackageInfo;
		import dalvik.system.SamplingProfiler;

		import java.io.BufferedOutputStream;
		import java.io.File;
		import java.io.FileNotFoundException;
		import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.PrintStream;
		import java.util.concurrent.Executor;
		import java.util.concurrent.Executors;
		import java.util.concurrent.atomic.AtomicBoolean;

		import android.content.pm.PackageInfo;
		import android.util.Log;
		import android.os.*;

		@@ -61,6 +64,8 @@ public class SamplingProfilerIntegration {
		}
		}

		private static SamplingProfiler INSTANCE;

		/**
		* Is profiling enabled?
		*/
		@@ -72,15 +77,22 @@ public class SamplingProfilerIntegration {
		* Starts the profiler if profiling is enabled.
		*/
		public static void start() {
		if (!enabled) return;
		SamplingProfiler.getInstance().start(samplingProfilerHz);
		if (!enabled) {
		return;
		}
		ThreadGroup group = Thread.currentThread().getThreadGroup();
		SamplingProfiler.ThreadSet threadSet = SamplingProfiler.newThreadGroupTheadSet(group);
		INSTANCE = new SamplingProfiler(4, threadSet);
		INSTANCE.start(samplingProfilerHz);
		}

		/**
		* Writes a snapshot if profiling is enabled.
		*/
		public static void writeSnapshot(final String processName, final PackageInfo packageInfo) {
		if (!enabled) return;
		if (!enabled) {
		return;
		}

		/*
		* If we're already writing a snapshot, don't bother enqueueing another
		@@ -122,18 +134,22 @@ public class SamplingProfilerIntegration {
		* Writes the zygote's snapshot to internal storage if profiling is enabled.
		*/
		public static void writeZygoteSnapshot() {
		if (!enabled) return;
		if (!enabled) {
		return;
		}
		writeSnapshot("zygote", null);
		INSTANCE.shutdown();
		INSTANCE = null;
		}

		/**
		* pass in PackageInfo to retrieve various values for snapshot header
		*/
		private static void writeSnapshot(String dir, String processName, PackageInfo packageInfo) {
		byte[] snapshot = SamplingProfiler.getInstance().snapshot();
		if (snapshot == null) {
		if (!enabled) {
		return;
		}
		INSTANCE.stop();

		/*
		* We use the current time as a unique ID. We can't use a counter
		@@ -143,21 +159,22 @@ public class SamplingProfilerIntegration {
		long start = System.currentTimeMillis();
		String name = processName.replaceAll(":", ".");
		String path = dir + "/" + name + "-" +System.currentTimeMillis() + ".snapshot";
		FileOutputStream out = null;
		PrintStream out = null;
		try {
		out = new FileOutputStream(path);
		generateSnapshotHeader(name, packageInfo, out);
		out.write(snapshot);
		out = new PrintStream(new BufferedOutputStream(new FileOutputStream(path)));
		} catch (IOException e) {
		Log.e(TAG, "Error writing snapshot.", e);
		} finally {
		Log.e(TAG, "Could not open " + path + ":" + e);
		return;
		}
		try {
		if(out != null) {
		generateSnapshotHeader(name, packageInfo, out);
		INSTANCE.writeHprofData(out);
		} finally {
		out.close();
		}
		} catch (IOException ex) {
		// let it go.
		}
		if (out.checkError()) {
		Log.e(TAG, "Error writing snapshot.");
		return;
		}
		// set file readable to the world so that SamplingProfilerService
		// can put it to dropbox
		@@ -179,16 +196,16 @@ public class SamplingProfilerIntegration {
		* <the actual snapshot content begins here...>
		*/
		private static void generateSnapshotHeader(String processName, PackageInfo packageInfo,
		FileOutputStream out) throws IOException {
		PrintStream out) {
		// profiler version
		out.write("Version: 1\n".getBytes());
		out.write(("Process: " + processName + "\n").getBytes());
		out.println("Version: 2");
		out.println("Process: " + processName);
		if (packageInfo != null) {
		out.write(("Package: " + packageInfo.packageName + "\n").getBytes());
		out.write(("Package-Version: " + packageInfo.versionCode + "\n").getBytes());
		out.println("Package: " + packageInfo.packageName);
		out.println("Package-Version: " + packageInfo.versionCode);
		}
		out.write(("Build: " + Build.FINGERPRINT + "\n").getBytes());
		out.println("Build: " + Build.FINGERPRINT);
		// single blank line means the end of snapshot header.
		out.write("\n".getBytes());
		out.println();
		}
		}

core/java/com/android/internal/os/ZygoteInit.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -579,12 +579,8 @@ public class ZygoteInit {
		EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_END,
		SystemClock.uptimeMillis());

		if (SamplingProfilerIntegration.isEnabled()) {
		SamplingProfiler sp = SamplingProfiler.getInstance();
		sp.pause();
		// Finish profiling the zygote initialization.
		SamplingProfilerIntegration.writeZygoteSnapshot();
		sp.shutDown();
		}

		// Do an initial gc to clean up after startup
		gc();