resolved conflicts for merge of 8b1082bb to master (f25d24b2) · Commits · e / os / android_frameworks_base

preloaded-classes

+943 −358

File changed.

Preview size limit exceeded, changes collapsed.

+12 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,11 @@ public class WritePreloadedClassFile {
		*/
		static final int MIN_LOAD_TIME_MICROS = 1250;

		/**
		* Preload any class that was loaded by at least MIN_PROCESSES processes.
		*/
		static final int MIN_PROCESSES = 10;

		public static void main(String[] args) throws IOException,
		ClassNotFoundException {
		if (args.length != 1) {
		@@ -58,6 +63,7 @@ public class WritePreloadedClassFile {
		out.write("# Automatically generated by frameworks/base/tools/preload/"
		+ WritePreloadedClassFile.class.getSimpleName() + ".java.\n");
		out.write("# MIN_LOAD_TIME_MICROS=" + MIN_LOAD_TIME_MICROS + "\n");
		out.write("# MIN_PROCESSES=" + MIN_PROCESSES + "\n");

		/*
		* The set of classes to preload. We preload a class if:
		@@ -73,7 +79,12 @@ public class WritePreloadedClassFile {
		// the memory associated with these classes will be shared.
		for (LoadedClass loadedClass : root.loadedClasses.values()) {
		Set<String> names = loadedClass.processNames();
		if (shouldPreload(loadedClass) && names.size() > 1) {
		if (!Policy.isPreloadable(loadedClass)) {
		continue;
		}

		if (names.size() >= MIN_PROCESSES \|\|
		(loadedClass.medianTimeMicros() > MIN_LOAD_TIME_MICROS && names.size() > 1)) {
		toPreload.add(loadedClass);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES := $(call all-subdir-java-files)
		LOCAL_MODULE_TAGS := tests

		LOCAL_MODULE := loadclass