Merge changes from topic "jul15" (0e27faa0) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/com/android/internal/util/FastDataPerfTest.java

+59 −12

Original line number	Diff line number	Diff line
		@@ -52,21 +52,45 @@ public class FastDataPerfTest {
		while (state.keepRunning()) {
		os.reset();
		final BufferedOutputStream bos = new BufferedOutputStream(os, BUFFER_SIZE);
		final DataOutput out = new DataOutputStream(bos);
		final DataOutputStream out = new DataOutputStream(bos);
		try {
		doWrite(out);
		bos.flush();
		out.flush();
		} finally {
		out.close();
		}
		}
		}

		@Test
		public void timeWrite_LocalUsing4ByteSequences() throws IOException {
		final ByteArrayOutputStream os = new ByteArrayOutputStream(OUTPUT_SIZE);
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		os.reset();
		final FastDataOutput out = FastDataOutput.obtainUsing4ByteSequences(os);
		try {
		doWrite(out);
		out.flush();
		} finally {
		out.release();
		}
		}
		}

		@Test
		public void timeWrite_Local() throws IOException {
		public void timeWrite_LocalUsing3ByteSequences() throws IOException {
		final ByteArrayOutputStream os = new ByteArrayOutputStream(OUTPUT_SIZE);
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		os.reset();
		final FastDataOutput out = new FastDataOutput(os, BUFFER_SIZE);
		final FastDataOutput out = FastDataOutput.obtainUsing3ByteSequences(os);
		try {
		doWrite(out);
		out.flush();
		} finally {
		out.release();
		}
		}
		}

		@@ -77,19 +101,42 @@ public class FastDataPerfTest {
		while (state.keepRunning()) {
		is.reset();
		final BufferedInputStream bis = new BufferedInputStream(is, BUFFER_SIZE);
		final DataInput in = new DataInputStream(bis);
		final DataInputStream in = new DataInputStream(bis);
		try {
		doRead(in);
		} finally {
		in.close();
		}
		}
		}

		@Test
		public void timeRead_Local() throws Exception {
		public void timeRead_LocalUsing4ByteSequences() throws Exception {
		final ByteArrayInputStream is = new ByteArrayInputStream(doWrite());
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		is.reset();
		final DataInput in = new FastDataInput(is, BUFFER_SIZE);
		final FastDataInput in = FastDataInput.obtainUsing4ByteSequences(is);
		try {
		doRead(in);
		} finally {
		in.release();
		}
		}
		}

		@Test
		public void timeRead_LocalUsing3ByteSequences() throws Exception {
		final ByteArrayInputStream is = new ByteArrayInputStream(doWrite());
		final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		is.reset();
		final FastDataInput in = FastDataInput.obtainUsing3ByteSequences(is);
		try {
		doRead(in);
		} finally {
		in.release();
		}
		}
		}

core/java/android/util/CharsetUtils.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,12 @@ import dalvik.annotation.optimization.FastNative;
		* <p>
		* These methods purposefully accept only non-movable byte array addresses to
		* avoid extra JNI overhead.
		* <p>
		* Callers are cautioned that there is a long-standing ART bug that emits
		* non-standard 4-byte sequences, as described by {@code kUtfUse4ByteSequence}
		* in {@code art/runtime/jni/jni_internal.cc}. If precise modified UTF-8
		* encoding is required, use {@link com.android.internal.util.ModifiedUtf8}
		* instead.
		*
		* @hide
		*/
		@@ -33,6 +39,12 @@ public class CharsetUtils {
		/**
		* Attempt to encode the given string as modified UTF-8 into the destination
		* byte array without making any new allocations.
		* <p>
		* Callers are cautioned that there is a long-standing ART bug that emits
		* non-standard 4-byte sequences, as described by
		* {@code kUtfUse4ByteSequence} in {@code art/runtime/jni/jni_internal.cc}.
		* If precise modified UTF-8 encoding is required, use
		* {@link com.android.internal.util.ModifiedUtf8} instead.
		*
		* @param src string value to be encoded
		* @param dest destination byte array to encode into
		@@ -50,6 +62,12 @@ public class CharsetUtils {
		/**
		* Attempt to encode the given string as modified UTF-8 into the destination
		* byte array without making any new allocations.
		* <p>
		* Callers are cautioned that there is a long-standing ART bug that emits
		* non-standard 4-byte sequences, as described by
		* {@code kUtfUse4ByteSequence} in {@code art/runtime/jni/jni_internal.cc}.
		* If precise modified UTF-8 encoding is required, use
		* {@link com.android.internal.util.ModifiedUtf8} instead.
		*
		* @param src string value to be encoded
		* @param srcLen exact length of string to be encoded
		@@ -66,6 +84,12 @@ public class CharsetUtils {

		/**
		* Attempt to decode a modified UTF-8 string from the source byte array.
		* <p>
		* Callers are cautioned that there is a long-standing ART bug that emits
		* non-standard 4-byte sequences, as described by
		* {@code kUtfUse4ByteSequence} in {@code art/runtime/jni/jni_internal.cc}.
		* If precise modified UTF-8 encoding is required, use
		* {@link com.android.internal.util.ModifiedUtf8} instead.
		*
		* @param src source byte array to decode from
		* @param srcOff offset into source where decoding should begin

core/java/android/util/TEST_MAPPING

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"include-filter": "android.util.CharsetUtilsTest"
		},
		{
		"include-filter": "com.android.internal.util.FastDataTest"
		}
		],
		"file_patterns": ["CharsetUtils\|FastData"]
		},
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"include-filter": "android.util.XmlTest"
		},
		{
		"include-filter": "android.util.BinaryXmlTest"
		}
		],
		"file_patterns": ["Xml"]
		}
		]
		}

core/java/com/android/internal/util/BinaryXmlPullParser.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -73,12 +73,6 @@ import java.util.Objects;
		* </ul>
		*/
		public final class BinaryXmlPullParser implements TypedXmlPullParser {
		/**
		* Default buffer size, which matches {@code FastXmlSerializer}. This should
		* be kept in sync with {@link BinaryXmlPullParser}.
		*/
		private static final int BUFFER_SIZE = 32_768;

		private FastDataInput mIn;

		private int mCurrentToken = START_DOCUMENT;
		@@ -100,7 +94,12 @@ public final class BinaryXmlPullParser implements TypedXmlPullParser {
		throw new UnsupportedOperationException();
		}

		mIn = new FastDataInput(is, BUFFER_SIZE);
		if (mIn != null) {
		mIn.release();
		mIn = null;
		}

		mIn = FastDataInput.obtainUsing4ByteSequences(is);

		mCurrentToken = START_DOCUMENT;
		mCurrentDepth = 0;

core/java/com/android/internal/util/BinaryXmlSerializer.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -91,12 +91,6 @@ public final class BinaryXmlSerializer implements TypedXmlSerializer {
		static final int TYPE_BOOLEAN_TRUE = 12 << 4;
		static final int TYPE_BOOLEAN_FALSE = 13 << 4;

		/**
		* Default buffer size, which matches {@code FastXmlSerializer}. This should
		* be kept in sync with {@link BinaryXmlPullParser}.
		*/
		private static final int BUFFER_SIZE = 32_768;

		private FastDataOutput mOut;

		/**
		@@ -124,7 +118,7 @@ public final class BinaryXmlSerializer implements TypedXmlSerializer {
		throw new UnsupportedOperationException();
		}

		mOut = new FastDataOutput(os, BUFFER_SIZE);
		mOut = FastDataOutput.obtainUsing4ByteSequences(os);
		mOut.write(PROTOCOL_MAGIC_VERSION_0);

		mTagCount = 0;
		@@ -138,8 +132,10 @@ public final class BinaryXmlSerializer implements TypedXmlSerializer {

		@Override
		public void flush() throws IOException {
		if (mOut != null) {
		mOut.flush();
		}
		}

		@Override
		public void startDocument(@Nullable String encoding, @Nullable Boolean standalone)
		@@ -157,6 +153,9 @@ public final class BinaryXmlSerializer implements TypedXmlSerializer {
		public void endDocument() throws IOException {
		mOut.writeByte(END_DOCUMENT \| TYPE_NULL);
		flush();

		mOut.release();
		mOut = null;
		}

		@Override