diff options
5 files changed, 92 insertions, 65 deletions
diff --git a/benchmarks/src/benchmarks/regression/ProviderBenchmark.java b/benchmarks/src/benchmarks/regression/ProviderBenchmark.java new file mode 100644 index 0000000..649aa01 --- /dev/null +++ b/benchmarks/src/benchmarks/regression/ProviderBenchmark.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2015 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 benchmarks.regression; + +import java.security.Provider; +import java.security.Security; +import javax.crypto.Cipher; + +import com.google.caliper.Param; +import com.google.caliper.SimpleBenchmark; +import javax.net.ssl.SSLSocketFactory; + +public class ProviderBenchmark extends SimpleBenchmark { + public void timeStableProviders(int reps) throws Exception { + for (int i = 0; i < reps; ++i) { + Cipher c = Cipher.getInstance("RSA"); + } + } + + public void timeWithNewProvider(int reps) throws Exception { + for (int i = 0; i < reps; ++i) { + Security.addProvider(new MockProvider()); + try { + Cipher c = Cipher.getInstance("RSA"); + } finally { + Security.removeProvider("Mock"); + } + } + } + + private static class MockProvider extends Provider { + public MockProvider() { + super("Mock", 1.0, "Mock me!"); + } + } +} diff --git a/luni/src/main/java/java/security/Provider.java b/luni/src/main/java/java/security/Provider.java index 1704b58..1a64ecc 100644 --- a/luni/src/main/java/java/security/Provider.java +++ b/luni/src/main/java/java/security/Provider.java @@ -368,8 +368,8 @@ public abstract class Provider extends Properties { } /** - * Get the service of the specified type - * + * Get the service of the specified {@code type} (e.g. "SecureRandom", + * "Signature"). */ synchronized Provider.Service getService(String type) { updatePropertyServiceTable(); diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java b/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java index 855a8c7..1c794e5 100644 --- a/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java +++ b/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java @@ -152,7 +152,8 @@ public final class Engine { } /** - * Returns a list of all possible matches for a given algorithm. + * Returns a list of all possible matches for a given algorithm. Returns + * {@code null} if no matches were found. */ public ArrayList<Provider.Service> getServices(String algorithm) { int newCacheVersion = Services.getCacheVersion(); @@ -163,8 +164,7 @@ public final class Engine { && newCacheVersion == cacheEntry.cacheVersion) { return cacheEntry.services; } - String name = this.serviceName + "." + algoUC; - ArrayList<Provider.Service> services = Services.getServices(name); + ArrayList<Provider.Service> services = Services.getServices(serviceName, algoUC); this.serviceCache = new ServiceCacheEntry(algoUC, newCacheVersion, services); return services; } diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/Services.java b/luni/src/main/java/org/apache/harmony/security/fortress/Services.java index c81bf6b..5f3dfe0 100644 --- a/luni/src/main/java/org/apache/harmony/security/fortress/Services.java +++ b/luni/src/main/java/org/apache/harmony/security/fortress/Services.java @@ -29,16 +29,6 @@ import java.util.Locale; * implementations for all "serviceName.algName". */ public class Services { - - /** - * The HashMap that contains information about preferred implementations for - * all serviceName.algName in the registered providers. - * Set the initial size to 600 so we don't grow to 1024 by default because - * initialization adds a few entries more than the growth threshold. - */ - private static final HashMap<String, ArrayList<Provider.Service>> services - = new HashMap<String, ArrayList<Provider.Service>>(600); - /** * Save default SecureRandom service as well. * Avoids similar provider/services iteration in SecureRandom constructor. @@ -71,7 +61,6 @@ public class Services { Provider p = (Provider) providerClass.newInstance(); providers.add(p); providersNames.put(p.getName(), p); - initServiceInfo(p); return true; } catch (ClassNotFoundException ignored) { } catch (IllegalAccessException ignored) { @@ -104,7 +93,7 @@ public class Services { } /** - * Returns a copy of the registered providers as an array. + * Returns the actual registered providers. */ public static synchronized ArrayList<Provider> getProviders() { return providers; @@ -144,54 +133,39 @@ public class Services { } /** - * Adds information about provider services into HashMap. - */ - public static synchronized void initServiceInfo(Provider p) { - for (Provider.Service service : p.getServices()) { - String type = service.getType(); - if (cachedSecureRandomService == null && type.equals("SecureRandom")) { - cachedSecureRandomService = service; - } - String key = type + "." + service.getAlgorithm().toUpperCase(Locale.US); - appendServiceLocked(key, service); - for (String alias : Engine.door.getAliases(service)) { - key = type + "." + alias.toUpperCase(Locale.US); - appendServiceLocked(key, service); + * Looks up the requested service by type and algorithm. The service + * {@code type} and should be provided in the same format used when + * registering a service with a provider, for example, "KeyFactory.RSA". + * Callers can cache the returned service information but such caches should + * be validated against the result of Service.getCacheVersion() before use. + * Returns {@code null} if there are no services found. + */ + public static synchronized ArrayList<Provider.Service> getServices(String type, + String algorithm) { + ArrayList<Provider.Service> services = null; + for (Provider p : providers) { + Provider.Service s = p.getService(type, algorithm); + if (s != null) { + if (services == null) { + services = new ArrayList<>(providers.size()); + } + services.add(s); } } + return services; } /** - * Add or append the service to the key. + * Finds the first service offered of {@code type} and returns it. */ - private static void appendServiceLocked(String key, Provider.Service service) { - ArrayList<Provider.Service> serviceList = services.get(key); - if (serviceList == null) { - serviceList = new ArrayList<Provider.Service>(1); - services.put(key, serviceList); + private static synchronized Provider.Service getFirstServiceOfType(String type) { + for (Provider p : providers) { + Provider.Service s = Engine.door.getService(p, type); + if (s != null) { + return s; + } } - serviceList.add(service); - } - - /** - * Returns true if services does not contain any provider information. - */ - public static synchronized boolean isEmpty() { - return services.isEmpty(); - } - - /** - * Looks up the requested service by type and algorithm. The - * service key should be provided in the same format used when - * registering a service with a provider, for example, - * "KeyFactory.RSA". - * - * Callers can cache the returned service information but such - * caches should be validated against the result of - * Service.getCacheVersion() before use. - */ - public static synchronized ArrayList<Provider.Service> getServices(String key) { - return services.get(key); + return null; } /** @@ -219,13 +193,7 @@ public class Services { public static synchronized int getCacheVersion() { if (needRefresh) { cacheVersion++; - synchronized (services) { - services.clear(); - } - cachedSecureRandomService = null; - for (Provider p : providers) { - initServiceInfo(p); - } + cachedSecureRandomService = getFirstServiceOfType("SecureRandom"); needRefresh = false; } return cacheVersion; diff --git a/luni/src/test/java/libcore/java/security/ProviderTest.java b/luni/src/test/java/libcore/java/security/ProviderTest.java index 0be558e..f234122 100644 --- a/luni/src/test/java/libcore/java/security/ProviderTest.java +++ b/luni/src/test/java/libcore/java/security/ProviderTest.java @@ -547,6 +547,15 @@ public class ProviderTest extends TestCase { } } + public void testProvider_removeProvider_Success() throws Exception { + MockProvider provider = new MockProvider("MockProvider"); + assertNotNull(Security.getProvider(provider.getName())); + Security.addProvider(provider); + assertNotNull(Security.getProvider(provider.getName())); + Security.removeProvider(provider.getName()); + assertNull(Security.getProvider(provider.getName())); + } + public static class MyCertStoreSpi extends CertStoreSpi { public MyCertStoreSpi(CertStoreParameters params) throws InvalidAlgorithmParameterException { super(params); |