-
Notifications
You must be signed in to change notification settings - Fork 469
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'spockframework/master' into AccessProte…
…ctedConst * spockframework/master: Use multiple locks in ByteBuddyMockFactory to reduce lock contention (#1778) Fixup LICENSE file after change to geantyref (#1773) # Conflicts: # spock-core/src/main/java/org/spockframework/mock/runtime/ByteBuddyMockFactory.java
- Loading branch information
Showing
5 changed files
with
285 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
146 changes: 146 additions & 0 deletions
146
...src/test/groovy/org/spockframework/mock/runtime/ByteBuddyMockFactoryConcurrentSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| /* | ||
| * Copyright 2023 the original author or authors. | ||
| * | ||
| * 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 | ||
| * | ||
| * https://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 org.spockframework.mock.runtime | ||
|
|
||
| import groovy.transform.Canonical | ||
| import spock.lang.Shared | ||
| import spock.lang.Specification | ||
| import spock.lang.Timeout | ||
|
|
||
| import java.util.concurrent.CompletableFuture | ||
| import java.util.concurrent.Phaser | ||
| import java.util.concurrent.TimeUnit | ||
| import java.util.function.Function | ||
|
|
||
| class ByteBuddyMockFactoryConcurrentSpec extends Specification { | ||
| private static final String IfA = "IfA" | ||
| private static final String IfB = "IfB" | ||
| private static final String IfC = "IfC" | ||
| @Shared | ||
| final IProxyBasedMockInterceptor interceptor = Stub() | ||
|
|
||
| def "ensure lockMask bit patterns"() { | ||
| expect: | ||
| 1 << Integer.bitCount(ByteBuddyMockFactory.CACHE_LOCK_MASK) - 1 == Integer.highestOneBit(ByteBuddyMockFactory.CACHE_LOCK_MASK) | ||
| } | ||
|
|
||
| // Just to be save to abort, normally the tests run in 2 secs. | ||
| @Timeout(40) | ||
| def "cacheLockingStressTest #test"() { | ||
| given: | ||
| int iterations = 5_000 | ||
| def tempClassLoader = new ByteBuddyTestClassLoader() | ||
| MockFeatures featA = toMockFeatures(mockSpecA, tempClassLoader) | ||
| MockFeatures featB = toMockFeatures(mockSpecB, tempClassLoader) | ||
| ByteBuddyMockFactory mockFactory = new ByteBuddyMockFactory() | ||
|
|
||
| Phaser phaser = new Phaser(4) | ||
| Function<Runnable, CompletableFuture<Void>> runCode = { Runnable code -> | ||
| CompletableFuture.runAsync { | ||
| phaser.arriveAndAwaitAdvance() | ||
| try { | ||
| for (int i = 0; i < iterations; i++) { | ||
| code.run() | ||
| } | ||
| } finally { | ||
| phaser.arrive() | ||
| } | ||
| } | ||
| } | ||
| when: | ||
| def mockFeatAFuture = runCode.apply { | ||
| Class<?> mockClass = mockClass(mockFactory, tempClassLoader, featA) | ||
| assertValidMockClass(featA, mockClass, tempClassLoader) | ||
| } | ||
|
|
||
| def mockFeatBFuture = runCode.apply { | ||
| Class<?> mockClass = mockClass(mockFactory, tempClassLoader, featB) | ||
| assertValidMockClass(featB, mockClass, tempClassLoader) | ||
| } | ||
|
|
||
| def cacheFuture = runCode.apply { mockFactory.CACHE.clear() } | ||
|
|
||
| phaser.arriveAndAwaitAdvance() | ||
| // Wait for test to end | ||
| int phase = phaser.arrive() | ||
| try { | ||
| phaser.awaitAdvanceInterruptibly(phase, 30, TimeUnit.SECONDS) | ||
| } finally { | ||
| // Collect exceptions from the futures, to make issues visible. | ||
| mockFeatAFuture.getNow(null) | ||
| mockFeatBFuture.getNow(null) | ||
| cacheFuture.getNow(null) | ||
| } | ||
| then: | ||
| noExceptionThrown() | ||
|
|
||
| where: | ||
| test | mockSpecA | mockSpecB | ||
| "same hashcode different mockType" | mockSpec(IfA, IfB) | mockSpec(IfB, IfA) | ||
| "same hashcode same mockType" | mockSpec(IfA) | mockSpec(IfA) | ||
| "different hashcode different interfaces" | mockSpec(IfA, IfB) | mockSpec(IfB, IfC) | ||
| "unrelated classes" | mockSpec(IfA) | mockSpec(IfB) | ||
| } | ||
|
|
||
| private Class<?> mockClass(ByteBuddyMockFactory mockFactory, ClassLoader cl, MockFeatures feature) { | ||
| return mockFactory.createMock( | ||
| feature.mockType, | ||
| feature.interfaces, | ||
| null, | ||
| interceptor, | ||
| cl, | ||
| false) | ||
| .getClass() | ||
| } | ||
|
|
||
| private static MockSpec mockSpec(String mockedType, String... interfaces) { | ||
| return new MockSpec(mockedType, interfaces as List) | ||
| } | ||
|
|
||
| private void assertValidMockClass(MockFeatures mockFeature, Class<?> mockClass, ClassLoader classLoader) { | ||
| assert mockClass.classLoader == classLoader | ||
| assert mockFeature.mockType.isAssignableFrom(mockClass) | ||
| mockFeature.interfaces.each { | ||
| assert it.isAssignableFrom(mockClass) | ||
| } | ||
| } | ||
|
|
||
| MockFeatures toMockFeatures(MockSpec mockFeaturesString, ByteBuddyTestClassLoader classLoader) { | ||
| def mockType = classLoader.defineInterface(mockFeaturesString.mockType) | ||
| def interfaces = mockFeaturesString.interfaces.collect { classLoader.defineInterface(it) } | ||
| return new MockFeatures(mockType, interfaces) | ||
| } | ||
|
|
||
| /** | ||
| * Class holding the loaded classes to mock. | ||
| */ | ||
| @Canonical | ||
| private static class MockFeatures { | ||
| final Class<?> mockType | ||
| final List<Class<?>> interfaces | ||
| } | ||
|
|
||
| /** | ||
| * Class holding the class names to mock. | ||
| * Which will be converted into a {@link MockFeatures} during test. | ||
| */ | ||
| @Canonical | ||
| private static class MockSpec { | ||
| final String mockType | ||
| final List<String> interfaces | ||
| } | ||
| } |
55 changes: 55 additions & 0 deletions
55
spock-specs/src/test/groovy/org/spockframework/mock/runtime/ByteBuddyTestClassLoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright 2023 the original author or authors. | ||
| * | ||
| * 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 | ||
| * | ||
| * https://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 org.spockframework.mock.runtime; | ||
|
|
||
| import net.bytebuddy.ByteBuddy; | ||
| import net.bytebuddy.description.type.TypeDescription; | ||
| import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| final class ByteBuddyTestClassLoader extends ClassLoader { | ||
| private final Map<String, Class<?>> cache = new HashMap<>(); | ||
|
|
||
| private final ClassLoadingStrategy<ByteBuddyTestClassLoader> loadingStrategy = (loader, types) -> { | ||
| Map<TypeDescription, Class<?>> result = new HashMap<>(); | ||
| for (Map.Entry<TypeDescription, byte[]> entry : types.entrySet()) { | ||
| TypeDescription description = entry.getKey(); | ||
| byte[] bytes = entry.getValue(); | ||
| Class<?> clazz = defineClass(description.getName(), bytes, 0, bytes.length); | ||
| result.put(description, clazz); | ||
| } | ||
| return result; | ||
| }; | ||
|
|
||
| /** | ||
| * Defines an empty interface with the passed {@code node}. | ||
| * | ||
| * @param name the name of the interface | ||
| * @return the loaded {@code Class} | ||
| */ | ||
| synchronized Class<?> defineInterface(String name) { | ||
| //noinspection resource | ||
| return cache.computeIfAbsent(name, nameKey -> new ByteBuddy() | ||
| .makeInterface() | ||
| .name(nameKey) | ||
| .make() | ||
| .load(this, loadingStrategy) | ||
| .getLoaded()); | ||
| } | ||
| } |