Skip to content

Commit

Permalink
Merge pull request #16510 from mkouba/arc-interception-perf
Browse files Browse the repository at this point in the history 
ArC - improve the performance of intercepted subclasses
  • Loading branch information
@gsmet
gsmet authored Apr 14, 2021
2 parents 46e7641 + d762cdc commit 7b65f33
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 56 deletions.
112 changes: 57 additions & 55 deletions ...dent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public class SubclassGenerator extends AbstractGenerator {
static final String SUBCLASS_SUFFIX = "_Subclass";
static final String DESTROY_METHOD_NAME = "arc$destroy";

protected static final String FIELD_NAME_PREDESTROYS = "preDestroys";
protected static final String FIELD_NAME_METADATA = "metadata";
protected static final String FIELD_NAME_PREDESTROYS = "arc$preDestroys";
protected static final String FIELD_NAME_CONSTRUCTED = "arc$constructed";
protected static final FieldDescriptor FIELD_METADATA_METHOD = FieldDescriptor.of(InterceptedMethodMetadata.class, "method",
Method.class);
protected static final FieldDescriptor FIELD_METADATA_CHAIN = FieldDescriptor.of(InterceptedMethodMetadata.class, "chain",
Expand Down Expand Up @@ -228,20 +228,8 @@ protected FieldDescriptor createConstructor(ClassOutput classOutput, BeanInfo be
}

// Init intercepted methods and interceptor chains
// private final Map<String,SubclassMethodMetadata> metadata
// metadata = new HashMap<>()
int metadataMapCapacity = bean.getInterceptedMethods().size();
if (metadataMapCapacity < 3) {
metadataMapCapacity++;
} else {
metadataMapCapacity = (int) ((float) metadataMapCapacity / 0.75F + 1.0F);
}
FieldCreator metadataField = subclass.getFieldCreator(FIELD_NAME_METADATA, Map.class.getName())
FieldCreator constructedField = subclass.getFieldCreator(FIELD_NAME_CONSTRUCTED, boolean.class)
.setModifiers(ACC_PRIVATE | ACC_FINAL);
ResultHandle metadataHandle = constructor.newInstance(MethodDescriptor.ofConstructor(HashMap.class, int.class),
constructor.load(metadataMapCapacity));
constructor.writeInstanceField(metadataField.getFieldDescriptor(), constructor.getThis(),
metadataHandle);

// Shared interceptor bindings literals
Map<BindingKey, ResultHandle> bindingsLiterals = new HashMap<>();
Expand Down Expand Up @@ -309,10 +297,13 @@ public ResultHandle apply(List<InterceptorInfo> interceptors) {
InterceptionInfo interception = bean.getInterceptedMethods().get(method);
DecorationInfo decoration = bean.getDecoratedMethods().get(method);
MethodDescriptor forwardDescriptor = forwardingMethods.get(methodDescriptor);
List<Type> parameters = method.parameters();

if (interception != null) {
String methodId = "m" + methodIdx++;
ResultHandle methodIdHandle = constructor.load(methodId);
// Each intercepted method has a corresponding InterceptedMethodMetadata field
FieldCreator metadataField = subclass
.getFieldCreator("arc$" + methodIdx++, InterceptedMethodMetadata.class.getName())
.setModifiers(ACC_PRIVATE | ACC_FINAL);

// 1. Interceptor chain
ResultHandle chainHandle = interceptorChains.computeIfAbsent(interception.interceptors, interceptorChainsFun);
Expand All @@ -321,9 +312,9 @@ public ResultHandle apply(List<InterceptorInfo> interceptors) {
ResultHandle[] paramsHandles = new ResultHandle[3];
paramsHandles[0] = constructor.loadClass(providerTypeName);
paramsHandles[1] = constructor.load(method.name());
if (!method.parameters().isEmpty()) {
ResultHandle paramsArray = constructor.newArray(Class.class, constructor.load(method.parameters().size()));
for (ListIterator<Type> iterator = method.parameters().listIterator(); iterator.hasNext();) {
if (!parameters.isEmpty()) {
ResultHandle paramsArray = constructor.newArray(Class.class, constructor.load(parameters.size()));
for (ListIterator<Type> iterator = parameters.listIterator(); iterator.hasNext();) {
constructor.writeArrayValue(paramsArray, iterator.nextIndex(),
constructor.loadClass(iterator.next().name().toString()));
}
Expand All @@ -343,29 +334,28 @@ public ResultHandle apply(List<InterceptorInfo> interceptors) {
ResultHandle methodMetadataHandle = constructor.newInstance(
MethodDescriptors.INTERCEPTED_METHOD_METADATA_CONSTRUCTOR,
chainHandle, methodHandle, bindingsHandle);
// metadata.put("m1", new SubclassMethodMetadata(...))
constructor.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, metadataHandle, methodIdHandle,
methodMetadataHandle);

constructor.writeInstanceField(metadataField.getFieldDescriptor(), constructor.getThis(), methodMetadataHandle);

// Needed when running on native image
reflectionRegistration.registerMethod(method);

// Finally create the intercepted method
createInterceptedMethod(classOutput, bean, method, methodId, subclass, providerTypeName,
metadataField.getFieldDescriptor(), forwardDescriptor,
createInterceptedMethod(classOutput, bean, method, subclass, providerTypeName,
metadataField.getFieldDescriptor(), constructedField.getFieldDescriptor(), forwardDescriptor,
decoration != null ? decoration.decorators.get(0) : null);
} else {
// Only decorators are applied
MethodCreator decoratedMethod = subclass.getMethodCreator(methodDescriptor);

ResultHandle[] params = new ResultHandle[method.parameters().size()];
for (int i = 0; i < method.parameters().size(); ++i) {
ResultHandle[] params = new ResultHandle[parameters.size()];
for (int i = 0; i < parameters.size(); ++i) {
params[i] = decoratedMethod.getMethodParam(i);
}

// if(!this.bean == null) return super.foo()
// Delegate to super class if not constructed yet
BytecodeCreator notConstructed = decoratedMethod
.ifNull(decoratedMethod.readInstanceField(metadataField.getFieldDescriptor(),
.ifFalse(decoratedMethod.readInstanceField(constructedField.getFieldDescriptor(),
decoratedMethod.getThis()))
.trueBranch();
if (Modifier.isAbstract(method.flags())) {
Expand All @@ -392,6 +382,9 @@ public ResultHandle apply(List<InterceptorInfo> interceptors) {
.returnValue(decoratedMethod.invokeVirtualMethod(virtualMethodDescriptor, decoratorInstance, params));
}
}

constructor.writeInstanceField(constructedField.getFieldDescriptor(), constructor.getThis(), constructor.load(true));

constructor.returnValue(null);
return preDestroysField != null ? preDestroysField.getFieldDescriptor() : null;
}
Expand Down Expand Up @@ -509,8 +502,9 @@ private void processDecorator(DecoratorInfo decorator, BeanInfo bean, Type provi
ResultHandle delegateTo;

// Method params
ResultHandle[] params = new ResultHandle[method.parameters().size()];
for (int i = 0; i < method.parameters().size(); ++i) {
List<Type> parameters = method.parameters();
ResultHandle[] params = new ResultHandle[parameters.size()];
for (int i = 0; i < parameters.size(); ++i) {
params[i] = forward.getMethodParam(i);
}

Expand Down Expand Up @@ -646,8 +640,9 @@ private MethodDescriptor createForwardingMethod(ClassCreator subclass, String pr
methodDescriptor.getReturnType(),
methodDescriptor.getParameterTypes());
MethodCreator forward = subclass.getMethodCreator(forwardDescriptor);
ResultHandle[] params = new ResultHandle[method.parameters().size()];
for (int i = 0; i < method.parameters().size(); ++i) {
List<Type> parameters = method.parameters();
ResultHandle[] params = new ResultHandle[parameters.size()];
for (int i = 0; i < parameters.size(); ++i) {
params[i] = forward.getMethodParam(i);
}
MethodDescriptor virtualMethod = MethodDescriptor.ofMethod(providerTypeName, methodDescriptor.getName(),
Expand All @@ -656,27 +651,32 @@ private MethodDescriptor createForwardingMethod(ClassCreator subclass, String pr
return forwardDescriptor;
}

private void createInterceptedMethod(ClassOutput classOutput, BeanInfo bean, MethodInfo method, String methodId,
ClassCreator subclass,
String providerTypeName, FieldDescriptor metadataField,
private void createInterceptedMethod(ClassOutput classOutput, BeanInfo bean, MethodInfo method, ClassCreator subclass,
String providerTypeName, FieldDescriptor metadataField, FieldDescriptor constructedField,
MethodDescriptor forwardMethod, DecoratorInfo decorator) {

MethodDescriptor originalMethodDescriptor = MethodDescriptor.of(method);
MethodCreator interceptedMethod = subclass.getMethodCreator(originalMethodDescriptor);

// Params
// Object[] params = new Object[] {p1}
ResultHandle paramsHandle = interceptedMethod.newArray(Object.class,
interceptedMethod.load(method.parameters().size()));
for (int i = 0; i < method.parameters().size(); i++) {
interceptedMethod.writeArrayValue(paramsHandle, i, interceptedMethod.getMethodParam(i));
List<Type> parameters = method.parameters();
ResultHandle paramsHandle;
if (parameters.isEmpty()) {
paramsHandle = interceptedMethod.loadNull();
} else {
paramsHandle = interceptedMethod.newArray(Object.class,
interceptedMethod.load(parameters.size()));
for (int i = 0; i < parameters.size(); i++) {
interceptedMethod.writeArrayValue(paramsHandle, i, interceptedMethod.getMethodParam(i));
}
}

// if(!this.bean == null) return super.foo()
// Delegate to super class if not constructed yet
BytecodeCreator notConstructed = interceptedMethod
.ifNull(interceptedMethod.readInstanceField(metadataField, interceptedMethod.getThis())).trueBranch();
ResultHandle[] params = new ResultHandle[method.parameters().size()];
for (int i = 0; i < method.parameters().size(); ++i) {
.ifFalse(interceptedMethod.readInstanceField(constructedField, interceptedMethod.getThis())).trueBranch();
ResultHandle[] params = new ResultHandle[parameters.size()];
for (int i = 0; i < parameters.size(); ++i) {
params[i] = notConstructed.getMethodParam(i);
}
if (Modifier.isAbstract(method.flags())) {
Expand All @@ -696,15 +696,19 @@ private void createInterceptedMethod(ClassOutput classOutput, BeanInfo bean, Met
FunctionCreator func = interceptedMethod.createFunction(Function.class);
BytecodeCreator funcBytecode = func.getBytecode();
ResultHandle ctxHandle = funcBytecode.getMethodParam(0);
ResultHandle[] superParamHandles = new ResultHandle[method.parameters().size()];
ResultHandle ctxParamsHandle = funcBytecode.invokeInterfaceMethod(
MethodDescriptor.ofMethod(InvocationContext.class, "getParameters", Object[].class),
ctxHandle);
// autoboxing is handled inside Gizmo
for (int i = 0; i < superParamHandles.length; i++) {
superParamHandles[i] = funcBytecode.readArrayValue(ctxParamsHandle, i);
ResultHandle[] superParamHandles;
if (parameters.isEmpty()) {
superParamHandles = new ResultHandle[0];
} else {
superParamHandles = new ResultHandle[parameters.size()];
ResultHandle ctxParamsHandle = funcBytecode.invokeInterfaceMethod(
MethodDescriptor.ofMethod(InvocationContext.class, "getParameters", Object[].class),
ctxHandle);
// autoboxing is handled inside Gizmo
for (int i = 0; i < superParamHandles.length; i++) {
superParamHandles[i] = funcBytecode.readArrayValue(ctxParamsHandle, i);
}
}

// If a decorator is bound then invoke the method upon the decorator instance instead of the generated forwarding method
if (decorator != null) {
AssignableResultHandle funDecoratorInstance = funcBytecode.createVariable(Object.class);
Expand Down Expand Up @@ -761,9 +765,7 @@ private void createInterceptedMethod(ClassOutput classOutput, BeanInfo bean, Met
catchOtherExceptions.getCaughtException());
}
// InvocationContexts.performAroundInvoke(...)
ResultHandle methodIdHandle = tryCatch.load(methodId);
ResultHandle methodMetadataHandle = tryCatch.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
tryCatch.readInstanceField(metadataField, tryCatch.getThis()), methodIdHandle);
ResultHandle methodMetadataHandle = tryCatch.readInstanceField(metadataField, tryCatch.getThis());
ResultHandle ret = tryCatch.invokeStaticMethod(MethodDescriptors.INVOCATION_CONTEXTS_PERFORM_AROUND_INVOKE,
tryCatch.getThis(),
tryCatch.readInstanceField(FIELD_METADATA_METHOD, methodMetadataHandle), func.getInstance(), paramsHandle,
Expand Down
4 changes: 3 additions & 1 deletion ...ent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInvocationContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

abstract class AbstractInvocationContext implements ArcInvocationContext, Supplier<Map<String, Object>> {

private static final Object[] EMPTY_PARAMS = new Object[0];

protected final Method method;
protected final Constructor<?> constructor;
protected final Set<Annotation> interceptorBindings;
Expand All @@ -31,7 +33,7 @@ protected AbstractInvocationContext(Object target, Method method,
this.target = target;
this.method = method;
this.constructor = constructor;
this.parameters = parameters;
this.parameters = parameters != null ? parameters : EMPTY_PARAMS;
this.contextData = contextData != null ? contextData : new LazyValue<>(this);
this.interceptorBindings = interceptorBindings;
this.chain = chain;
Expand Down

0 comments on commit 7b65f33

Please sign in to comment.