Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Separate timeNumberFormatTrivialFormatLong into its own file and delete HostnameVerifierTest."

Browse Source
This commit is contained in:
Miguel Aranda
2022-05-13 08:54:04 +00:00
committed by Gerrit Code Review
parent e202bd7dcb 932b2253d3
commit 2385e75640
3 changed files with 49 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apct-tests/perftests/core/src/android/libcore/regression/ExpensiveObjectsPerfTest.java
View File

@@ -140,15 +140,6 @@ public class ExpensiveObjectsPerfTest {
} }
} }
@Test
public void timeNumberFormatTrivialFormatLong() {
NumberFormat nf = NumberFormat.getInstance(Locale.US);
BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
while (state.keepRunning()) {
nf.format(1024L);
}
}
@Test @Test
public void timeLongToString() { public void timeLongToString() {
BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

192
apct-tests/perftests/core/src/android/libcore/regression/HostnameVerifierPerfTest.java
View File

@@ -1,192 +0,0 @@
/*
* Copyright (C) 2022 The Android Open Source Project.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.libcore.regression;
import android.perftests.utils.BenchmarkState;
import android.perftests.utils.PerfStatusReporter;
import android.test.suitebuilder.annotation.LargeTest;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.io.ByteArrayInputStream;
import java.net.URL;
import java.security.Principal;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.util.Arrays;
import java.util.Collection;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSessionContext;
/**
* This benchmark makes a real HTTP connection to a handful of hosts and
* captures the served certificates as a byte array. It then verifies each
* certificate in the benchmark loop, being careful to convert from the
* byte[] to the certificate each time. Otherwise the certificate class
* caches previous results which skews the results of the benchmark: In practice
* each certificate instance is verified once and then released.
*/
@RunWith(Parameterized.class)
@LargeTest
public final class HostnameVerifierPerfTest {
@Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
@Parameters(name = "mHost({0})")
public static Collection<Object[]> data() {
return Arrays.asList(
new Object[][] {
{"m.google.com"},
{"www.google.com"},
{"www.amazon.com"},
{"www.ubs.com"}
});
}
@Parameterized.Parameter(0)
public String mHost;
private String mHostname;
private HostnameVerifier mHostnameVerifier;
private byte[][] mEncodedCertificates;
@Before
public void setUp() throws Exception {
URL url = new URL("https", mHost, "/");
mHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
connection.setHostnameVerifier(new HostnameVerifier() {
public boolean verify(String mHostname, SSLSession sslSession) {
try {
mEncodedCertificates = certificatesToBytes(sslSession.getPeerCertificates());
} catch (Exception e) {
throw new RuntimeException(e);
}
HostnameVerifierPerfTest.this.mHostname = mHostname;
return true;
}
});
connection.getInputStream();
connection.disconnect();
}
@Test
public void timeVerify() throws Exception {
BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
while (state.keepRunning()) {
final Certificate[] certificates = bytesToCertificates(mEncodedCertificates);
FakeSSLSession sslSession = new FakeSSLSession() {
@Override public Certificate[] getPeerCertificates() {
return certificates;
}
};
mHostnameVerifier.verify(mHostname, sslSession);
}
}
private byte[][] certificatesToBytes(Certificate[] certificates) throws Exception {
byte[][] result = new byte[certificates.length][];
for (int i = 0, certificatesLength = certificates.length; i < certificatesLength; i++) {
result[i] = certificates[i].getEncoded();
}
return result;
}
private Certificate[] bytesToCertificates(byte[][] encodedCertificates) throws Exception {
CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
Certificate[] result = new Certificate[encodedCertificates.length];
for (int i = 0; i < encodedCertificates.length; i++) {
result[i] = certificateFactory.generateCertificate(
new ByteArrayInputStream(encodedCertificates[i]));
}
return result;
}
private static class FakeSSLSession implements SSLSession {
public int getApplicationBufferSize() {
throw new UnsupportedOperationException();
}
public String getCipherSuite() {
throw new UnsupportedOperationException();
}
public long getCreationTime() {
throw new UnsupportedOperationException();
}
public byte[] getId() {
throw new UnsupportedOperationException();
}
public long getLastAccessedTime() {
throw new UnsupportedOperationException();
}
public Certificate[] getLocalCertificates() {
throw new UnsupportedOperationException();
}
public Principal getLocalPrincipal() {
throw new UnsupportedOperationException();
}
public int getPacketBufferSize() {
throw new UnsupportedOperationException();
}
public javax.security.cert.X509Certificate[] getPeerCertificateChain() {
throw new UnsupportedOperationException();
}
public Certificate[] getPeerCertificates() {
throw new UnsupportedOperationException();
}
public String getPeerHost() {
throw new UnsupportedOperationException();
}
public int getPeerPort() {
throw new UnsupportedOperationException();
}
public Principal getPeerPrincipal() {
throw new UnsupportedOperationException();
}
public String getProtocol() {
throw new UnsupportedOperationException();
}
public SSLSessionContext getSessionContext() {
throw new UnsupportedOperationException();
}
public Object getValue(String name) {
throw new UnsupportedOperationException();
}
public String[] getValueNames() {
throw new UnsupportedOperationException();
}
public void invalidate() {
throw new UnsupportedOperationException();
}
public boolean isValid() {
throw new UnsupportedOperationException();
}
public void putValue(String name, Object value) {
throw new UnsupportedOperationException();
}
public void removeValue(String name) {
throw new UnsupportedOperationException();
}
}
}

49
apct-tests/perftests/core/src/android/libcore/regression/NumberFormatTrivialFormatLongPerfTest.java Normal file
View File

@@ -0,0 +1,49 @@
/*
* Copyright (C) 2022 The Android Open Source Project.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.libcore.regression;
import android.perftests.utils.BenchmarkState;
import android.perftests.utils.PerfStatusReporter;
import android.test.suitebuilder.annotation.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.text.NumberFormat;
import java.util.Locale;
/**
* Benchmarks creation and cloning various expensive objects.
*/
@RunWith(AndroidJUnit4.class)
@LargeTest
public class NumberFormatTrivialFormatLongPerfTest {
@Rule
public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
@Test
public void timeNumberFormatTrivialFormatLong() {
NumberFormat nf = NumberFormat.getInstance(Locale.US);
BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
while (state.keepRunning()) {
nf.format(1024L);
}
}
}