jdk-sandbox: comparison src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java

equal deleted inserted replaced

-:c401c536cea1
+:a181612f0715
 private static final Type ANNOTATION_TYPE_NAME = Type.getType(Name.class);
 private static final Type ANNOTATION_TYPE_REGISTERED = Type.getType(Registered.class);
 private static final Type ANNOTATION_TYPE_ENABLED = Type.getType(Enabled.class);
 private static final Type TYPE_EVENT_HANDLER = Type.getType(EventHandler.class);
 private static final Type TYPE_SETTING_CONTROL = Type.getType(SettingControl.class);
+private static final Type TYPE_OBJECT  = Type.getType(Object.class);
 private static final Method METHOD_COMMIT = new Method("commit", Type.VOID_TYPE, new Type[0]);
 private static final Method METHOD_BEGIN = new Method("begin", Type.VOID_TYPE, new Type[0]);
 private static final Method METHOD_END = new Method("end", Type.VOID_TYPE, new Type[0]);
 private static final Method METHOD_IS_ENABLED = new Method("isEnabled", Type.BOOLEAN_TYPE, new Type[0]);
 private static final Method METHOD_TIME_STAMP = new Method("timestamp", Type.LONG_TYPE, new Type[0]);
 private final List<SettingInfo> settingInfos;
 private final List<FieldInfo> fieldInfos;;
 private final Method writeMethod;
 private final String eventHandlerXInternalName;
 private final String eventName;
+private final boolean untypedEventHandler;
 private boolean guardHandlerReference;
 private Class<?> superClass;
 EventInstrumentation(Class<?> superClass, byte[] bytes, long id) {
 this.superClass = superClass;
 this.classNode = createClassNode(bytes);
 this.settingInfos = buildSettingInfos(superClass, classNode);
 this.fieldInfos = buildFieldInfos(superClass, classNode);
+this.untypedEventHandler = hasUntypedHandler();
 this.writeMethod = makeWriteMethod(fieldInfos);
 this.eventHandlerXInternalName = ASMToolkit.getInternalName(EventHandlerCreator.makeEventHandlerName(id));
 String n =  annotationValue(classNode, ANNOTATION_TYPE_NAME.getDescriptor(), String.class);
 this.eventName = n == null ? classNode.name.replace("/", ".") : n;
+}
+private boolean hasUntypedHandler() {
+for (FieldNode field : classNode.fields) {
+if (FIELD_EVENT_HANDLER.equals(field.name)) {
+return field.desc.equals(TYPE_OBJECT.getDescriptor());
+}
+}
+throw new InternalError("Class missing handler field");
 }
 public String getClassName() {
 return classNode.name.replace("/",".");
 }
 }
 }
 }
 }
 }
-for (Class<?> c = superClass; c != Event.class; c = c.getSuperclass()) {
+for (Class<?> c = superClass; c != jdk.internal.event.Event.class; c = c.getSuperclass()) {
 for (java.lang.reflect.Method method : c.getDeclaredMethods()) {
 if (!methodSet.contains(method.getName())) {
 // skip private method in base classes
 if (!Modifier.isPrivate(method.getModifiers())) {
 if (method.getReturnType().equals(Boolean.TYPE)) {
 }
 }
 }
 }
 return settingInfos;
 }
 private static List<FieldInfo> buildFieldInfos(Class<?> superClass, ClassNode classNode) {
 Set<String> fieldSet = new HashSet<>();
 List<FieldInfo> fieldInfos = new ArrayList<>(classNode.fields.size());
 // in Java, instead of in native. It also means code for adding implicit
 // fields for native can be reused by Java.
 fieldInfos.add(new FieldInfo("startTime", Type.LONG_TYPE.getDescriptor(), classNode.name));
 fieldInfos.add(new FieldInfo("duration", Type.LONG_TYPE.getDescriptor(), classNode.name));
 for (FieldNode field : classNode.fields) {
-String className = Type.getType(field.desc).getClassName();
+if (!fieldSet.contains(field.name) && isValidField(field.access, Type.getType(field.desc).getClassName())) {
-if (!fieldSet.contains(field.name) && isValidField(field.access, className)) {
 FieldInfo fi = new FieldInfo(field.name, field.desc, classNode.name);
 fieldInfos.add(fi);
 fieldSet.add(field.name);
 }
 }
-for (Class<?> c = superClass; c != Event.class; c = c.getSuperclass()) {
+for (Class<?> c = superClass; c != jdk.internal.event.Event.class; c = c.getSuperclass()) {
 for (Field field : c.getDeclaredFields()) {
 // skip private field in base classes
 if (!Modifier.isPrivate(field.getModifiers())) {
 if (isValidField(field.getModifiers(), field.getType().getName())) {
 String fieldName = field.getName();
 private void makeInstrumented() {
 // MyEvent#isEnabled()
 updateMethod(METHOD_IS_ENABLED, methodVisitor -> {
 Label nullLabel = new Label();
 if (guardHandlerReference) {
-methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, TYPE_EVENT_HANDLER.getDescriptor());
+getEventHandler(methodVisitor);
 methodVisitor.visitJumpInsn(Opcodes.IFNULL, nullLabel);
 }
-methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, TYPE_EVENT_HANDLER.getDescriptor());
+getEventHandler(methodVisitor);
 ASMToolkit.invokeVirtual(methodVisitor, TYPE_EVENT_HANDLER.getInternalName(), METHOD_IS_ENABLED);
 methodVisitor.visitInsn(Opcodes.IRETURN);
 if (guardHandlerReference) {
 methodVisitor.visitLabel(nullLabel);
 methodVisitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
 methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, getInternalClassName(), METHOD_EVENT_SHOULD_COMMIT.getName(), METHOD_EVENT_SHOULD_COMMIT.getDescriptor(), false);
 Label end = new Label();
 // eventHandler.write(...);
 // }
 methodVisitor.visitJumpInsn(Opcodes.IFEQ, end);
-methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, Type.getDescriptor(EventHandler.class));
+getEventHandler(methodVisitor);
 methodVisitor.visitTypeInsn(Opcodes.CHECKCAST, eventHandlerXInternalName);
 for (FieldInfo fi : fieldInfos) {
 methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
 methodVisitor.visitFieldInsn(Opcodes.GETFIELD, fi.internalClassName, fi.fieldName, fi.fieldDescriptor);
 });
 // MyEvent#shouldCommit()
 updateMethod(METHOD_EVENT_SHOULD_COMMIT, methodVisitor -> {
 Label fail = new Label();
-// if (!eventHandler.shoouldCommit(duration) goto fail;
+// if (!eventHandler.shouldCommit(duration) goto fail;
-methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, Type.getDescriptor(EventHandler.class));
+getEventHandler(methodVisitor);
 methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
 methodVisitor.visitFieldInsn(Opcodes.GETFIELD, getInternalClassName(), FIELD_DURATION, "J");
 ASMToolkit.invokeVirtual(methodVisitor, TYPE_EVENT_HANDLER.getInternalName(), METHOD_EVENT_HANDLER_SHOULD_COMMIT);
 methodVisitor.visitJumpInsn(Opcodes.IFEQ, fail);
 for (SettingInfo si : settingInfos) {
 // if (!settingsMethod(eventHandler.settingX)) goto fail;
 methodVisitor.visitIntInsn(Opcodes.ALOAD, 0);
-methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, Type.getDescriptor(EventHandler.class));
+if (untypedEventHandler) {
+methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, TYPE_OBJECT.getDescriptor());
+} else {
+methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, Type.getDescriptor(EventHandler.class));
+}
 methodVisitor.visitTypeInsn(Opcodes.CHECKCAST, eventHandlerXInternalName);
 methodVisitor.visitFieldInsn(Opcodes.GETFIELD, eventHandlerXInternalName, si.fieldName, TYPE_SETTING_CONTROL.getDescriptor());
 methodVisitor.visitTypeInsn(Opcodes.CHECKCAST, si.internalSettingName);
 methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, getInternalClassName(), si.methodName, "(" + si.settingDescriptor + ")Z", false);
 methodVisitor.visitJumpInsn(Opcodes.IFEQ, fail);
 // return false
 methodVisitor.visitLabel(fail);
 methodVisitor.visitInsn(Opcodes.ICONST_0);
 methodVisitor.visitInsn(Opcodes.IRETURN);
 });
+}
+private void getEventHandler(MethodVisitor methodVisitor) {
+if (untypedEventHandler) {
+methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, TYPE_OBJECT.getDescriptor());
+methodVisitor.visitTypeInsn(Opcodes.CHECKCAST, TYPE_EVENT_HANDLER.getInternalName());
+} else {
+methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, getInternalClassName(), FIELD_EVENT_HANDLER, Type.getDescriptor(EventHandler.class));
+}
 }
 private void makeUninstrumented() {
 updateExistingWithReturnFalse(METHOD_EVENT_SHOULD_COMMIT);
 updateExistingWithReturnFalse(METHOD_IS_ENABLED);

changeset 52334	a181612f0715
parent 50113	caf115bb98ad
child 52698	ca6b58b8ffc5