Merge "Use resetJitCounters for boot image profiling" am: ce9a776f1d am: 39cbd1fb92 (6eed08ba) · Commits · e / os / android_frameworks_base

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

+16 −12

Original line number	Original line	Diff line number	Diff line
	@@ -254,18 +254,6 @@ public class ZygoteInit {

	InputStream is;		InputStream is;
	try {		try {
	// If we are profiling the boot image, avoid preloading classes.
	// Can't use device_config since we are the zygote.
	String prop = SystemProperties.get(
	"persist.device_config.runtime_native_boot.profilebootclasspath", "");
	// Might be empty if the property is unset since the default is "".
	if (prop.length() == 0) {
	prop = SystemProperties.get("dalvik.vm.profilebootclasspath", "");
	}
	if ("true".equals(prop)) {
	return;
	}

	is = new FileInputStream(PRELOADED_CLASSES);		is = new FileInputStream(PRELOADED_CLASSES);
	} catch (FileNotFoundException e) {		} catch (FileNotFoundException e) {
	Log.e(TAG, "Couldn't find " + PRELOADED_CLASSES + ".");		Log.e(TAG, "Couldn't find " + PRELOADED_CLASSES + ".");
	@@ -345,6 +333,22 @@ public class ZygoteInit {
	runtime.preloadDexCaches();		runtime.preloadDexCaches();
	Trace.traceEnd(Trace.TRACE_TAG_DALVIK);		Trace.traceEnd(Trace.TRACE_TAG_DALVIK);

			// If we are profiling the boot image, reset the Jit counters after preloading the
			// classes. We want to preload for performance, and we can use method counters to
			// infer what clases are used after calling resetJitCounters, for profile purposes.
			// Can't use device_config since we are the zygote.
			String prop = SystemProperties.get(
			"persist.device_config.runtime_native_boot.profilebootclasspath", "");
			// Might be empty if the property is unset since the default is "".
			if (prop.length() == 0) {
			prop = SystemProperties.get("dalvik.vm.profilebootclasspath", "");
			}
			if ("true".equals(prop)) {
			Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "ResetJitCounters");
			runtime.resetJitCounters();
			Trace.traceEnd(Trace.TRACE_TAG_DALVIK);
			}

	// Bring back root. We'll need it later if we're in the zygote.		// Bring back root. We'll need it later if we're in the zygote.
	if (droppedPriviliges) {		if (droppedPriviliges) {
	try {		try {