Skip to content

Commit

Permalink
8259: Several JFR pages throwing exceptions after JMC-8244
Browse files Browse the repository at this point in the history 
Reviewed-by: aptmac
  • Loading branch information
Suchita Chaturvedi committed Sep 26, 2024
1 parent 2927e05 commit f114fb5
Showing 1 changed file with 59 additions and 55 deletions.
114 changes: 59 additions & 55 deletions ...dk.jmc.flightrecorder/src/main/java/org/openjdk/jmc/flightrecorder/jdk/JdkAttributes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,32 @@ public IQuantity getMember(U i) {
}
});

public static final IAttribute<IQuantity> RECORDING_ID = attr("id", Messages.getString(Messages.ATTR_RECORDING_ID), //$NON-NLS-1$
NUMBER);
private static IAttribute<IQuantity> convertNumberToQuantity(
String identifier, String name, String description, IAttribute<Number> attribute) {
return Attribute.canonicalize(new Attribute<IQuantity>(identifier, name, //$NON-NLS-1$
description, NUMBER) {
@Override
public <U> IMemberAccessor<IQuantity, U> customAccessor(IType<U> type) {

final IMemberAccessor<Number, U> accessor = attribute.getAccessor(type);
return accessor == null ? null : new IMemberAccessor<IQuantity, U>() {
@Override
public IQuantity getMember(U i) {
Number countNumber = accessor.getMember(i);
return countNumber == null ? null : UnitLookup.NUMBER_UNITY.quantity(countNumber);
}
};
}
});
}

public static final IAttribute<Number> RECORDING_ID_NUMBER = attr("id", //$NON-NLS-1$
Messages.getString(Messages.ATTR_RECORDING_ID), Messages.getString(Messages.ATTR_RECORDING_ID), RAW_NUMBER);

public static final IAttribute<IQuantity> RECORDING_ID = convertNumberToQuantity("id",
Messages.getString(Messages.ATTR_RECORDING_ID), Messages.getString(Messages.ATTR_RECORDING_ID),
RECORDING_ID_NUMBER);

public static final IAttribute<String> RECORDING_NAME = attr("name", //$NON-NLS-1$
Messages.getString(Messages.ATTR_RECORDING_NAME), PLAIN_TEXT);
public static final IAttribute<IQuantity> RECORDING_START = attr("recordingStart", //$NON-NLS-1$
Expand Down Expand Up @@ -752,8 +776,15 @@ public String getMember(U i) {
Messages.getString(Messages.ATTR_FLAG_OLD_VALUE_TEXT), PLAIN_TEXT);
public static final IAttribute<String> FLAG_ORIGIN = attr("origin", Messages.getString(Messages.ATTR_FLAG_ORIGIN), //$NON-NLS-1$
PLAIN_TEXT);
public static final IAttribute<IQuantity> FLAG_VALUE_NUMBER = attr("value", //$NON-NLS-1$
Messages.getString(Messages.ATTR_FLAG_VALUE_NUMBER), NUMBER);

public static final IAttribute<Number> FLAG_VALUE_NUMBER_RAW = attr("value", //$NON-NLS-1$
Messages.getString(Messages.ATTR_FLAG_VALUE_NUMBER), Messages.getString(Messages.ATTR_FLAG_VALUE_NUMBER),
RAW_NUMBER);

public static final IAttribute<IQuantity> FLAG_VALUE_NUMBER = convertNumberToQuantity("value",
Messages.getString(Messages.ATTR_FLAG_VALUE_NUMBER), Messages.getString(Messages.ATTR_FLAG_VALUE_NUMBER),
FLAG_VALUE_NUMBER_RAW);

public static final IAttribute<Boolean> FLAG_VALUE_BOOLEAN = attr("value", //$NON-NLS-1$
Messages.getString(Messages.ATTR_FLAG_VALUE_BOOLEAN), FLAG);
public static final IAttribute<String> FLAG_VALUE_TEXT = attr("value", //$NON-NLS-1$
Expand Down Expand Up @@ -797,26 +828,18 @@ public <U> IMemberAccessor<IMCThread, U> customAccessor(IType<U> type) {
Messages.getString(Messages.ATTR_CLASSLOADER_LOADED_COUNT),
Messages.getString(Messages.ATTR_CLASSLOADER_LOADED_COUNT_DESC), RAW_NUMBER);

public static final IAttribute<IQuantity> CLASSLOADER_LOADED_COUNT = Attribute.canonicalize(
new Attribute<IQuantity>("loadedClassCount", Messages.getString(Messages.ATTR_CLASSLOADER_LOADED_COUNT), //$NON-NLS-1$
Messages.getString(Messages.ATTR_CLASSLOADER_LOADED_COUNT_DESC), NUMBER) {
@Override
public <U> IMemberAccessor<IQuantity, U> customAccessor(IType<U> type) {
public static final IAttribute<IQuantity> CLASSLOADER_LOADED_COUNT = convertNumberToQuantity("loadedClassCount",
Messages.getString(Messages.ATTR_CLASSLOADER_LOADED_COUNT),
Messages.getString(Messages.ATTR_CLASSLOADER_LOADED_COUNT_DESC), CLASSLOADER_LOADED_COUNT_NUMBER);

final IMemberAccessor<Number, U> accessor = CLASSLOADER_LOADED_COUNT_NUMBER.getAccessor(type);
return accessor == null ? null : new IMemberAccessor<IQuantity, U>() {
@Override
public IQuantity getMember(U i) {
Number countNumber = accessor.getMember(i);
return countNumber == null ? null : UnitLookup.NUMBER_UNITY.quantity(countNumber);
}
};
}
});
public static final IAttribute<Number> CLASSLOADER_UNLOADED_COUNT_NUMBER = attr("unloadedClassCount", //$NON-NLS-1$
Messages.getString(Messages.ATTR_CLASSLOADER_UNLOADED_COUNT),
Messages.getString(Messages.ATTR_CLASSLOADER_UNLOADED_COUNT_DESC), RAW_NUMBER);

public static final IAttribute<IQuantity> CLASSLOADER_UNLOADED_COUNT = attr("unloadedClassCount", //$NON-NLS-1$
public static final IAttribute<IQuantity> CLASSLOADER_UNLOADED_COUNT = convertNumberToQuantity("unloadedClassCount",
Messages.getString(Messages.ATTR_CLASSLOADER_UNLOADED_COUNT),
Messages.getString(Messages.ATTR_CLASSLOADER_UNLOADED_COUNT_DESC), NUMBER);
Messages.getString(Messages.ATTR_CLASSLOADER_UNLOADED_COUNT_DESC), CLASSLOADER_UNLOADED_COUNT_NUMBER);

private static final IAttribute<IMCType> CLASS_DEFINING_CLASSLOADER_V0 = attr("definingClassLoader", //$NON-NLS-1$
Messages.getString(Messages.ATTR_CLASS_DEFINING_CLASSLOADER), CLASS);
private static final IAttribute<IMCType> CLASS_INITIATING_CLASSLOADER_V0 = attr("initiatingClassLoader", //$NON-NLS-1$
Expand Down Expand Up @@ -1151,22 +1174,9 @@ public IQuantity getMember(U i) {
Messages.getString(Messages.ATTR_EXCEPTION_THROWABLES_COUNT),
Messages.getString(Messages.ATTR_EXCEPTION_THROWABLES_COUNT_DESC), RAW_NUMBER);

public static final IAttribute<IQuantity> EXCEPTION_THROWABLES_COUNT = Attribute.canonicalize(
new Attribute<IQuantity>("throwables", Messages.getString(Messages.ATTR_EXCEPTION_THROWABLES_COUNT), //$NON-NLS-1$
Messages.getString(Messages.ATTR_EXCEPTION_THROWABLES_COUNT_DESC), NUMBER) {
@Override
public <U> IMemberAccessor<IQuantity, U> customAccessor(IType<U> type) {

final IMemberAccessor<Number, U> accessor = EXCEPTION_THROWABLES_COUNT_NUMBER.getAccessor(type);
return accessor == null ? null : new IMemberAccessor<IQuantity, U>() {
@Override
public IQuantity getMember(U i) {
Number countNumber = accessor.getMember(i);
return countNumber == null ? null : UnitLookup.NUMBER_UNITY.quantity(countNumber);
}
};
}
});
public static final IAttribute<IQuantity> EXCEPTION_THROWABLES_COUNT = convertNumberToQuantity("throwables",
Messages.getString(Messages.ATTR_EXCEPTION_THROWABLES_COUNT),
Messages.getString(Messages.ATTR_EXCEPTION_THROWABLES_COUNT_DESC), EXCEPTION_THROWABLES_COUNT_NUMBER);

public static final IAttribute<IMCType> EXCEPTION_THROWNCLASS = attr("thrownClass", //$NON-NLS-1$
Messages.getString(Messages.ATTR_EXCEPTION_THROWNCLASS), CLASS);
Expand Down Expand Up @@ -1212,8 +1222,15 @@ public <U> IMemberAccessor<IQuantity, U> customAccessor(IType<U> type) {
});
public static final IAttribute<String> REFERENCE_STATISTICS_TYPE = attr("type", //$NON-NLS-1$
Messages.getString(Messages.ATTR_REFERENCE_STATISTICS_TYPE), PLAIN_TEXT);
public static final IAttribute<IQuantity> REFERENCE_STATISTICS_COUNT = attr("count", //$NON-NLS-1$
Messages.getString(Messages.ATTR_REFERENCE_STATISTICS_COUNT), NUMBER);

public static final IAttribute<Number> REFERENCE_STATISTICS_COUNT_NUMBER = attr("count", //$NON-NLS-1$
Messages.getString(Messages.ATTR_REFERENCE_STATISTICS_COUNT),
Messages.getString(Messages.ATTR_REFERENCE_STATISTICS_COUNT), RAW_NUMBER);

public static final IAttribute<IQuantity> REFERENCE_STATISTICS_COUNT = convertNumberToQuantity("count", //$NON-NLS-1$
Messages.getString(Messages.ATTR_REFERENCE_STATISTICS_COUNT),
Messages.getString(Messages.ATTR_REFERENCE_STATISTICS_COUNT), REFERENCE_STATISTICS_COUNT_NUMBER);

public static final IAttribute<IQuantity> GC_SUM_OF_PAUSES = attr("sumOfPauses", //$NON-NLS-1$
Messages.getString(Messages.ATTR_GC_SUM_OF_PAUSES), Messages.getString(Messages.ATTR_GC_SUM_OF_PAUSES_DESC),
TIMESPAN);
Expand Down Expand Up @@ -1347,22 +1364,9 @@ public IQuantity getMember(U i) {
Messages.getString(Messages.ATTR_TOTAL_FINALIZERS_RUN),
Messages.getString(Messages.ATTR_TOTAL_FINALIZERS_RUN_DESC), RAW_NUMBER);

public static final IAttribute<IQuantity> TOTAL_FINALIZERS_RUN = Attribute.canonicalize(
new Attribute<IQuantity>("totalFinalizersRun", Messages.getString(Messages.ATTR_TOTAL_FINALIZERS_RUN), //$NON-NLS-1$
Messages.getString(Messages.ATTR_TOTAL_FINALIZERS_RUN_DESC), NUMBER) {
@Override
public <U> IMemberAccessor<IQuantity, U> customAccessor(IType<U> type) {

final IMemberAccessor<Number, U> accessor = TOTAL_FINALIZERS_RUN_NUMBER.getAccessor(type);
return accessor == null ? null : new IMemberAccessor<IQuantity, U>() {
@Override
public IQuantity getMember(U i) {
Number countNumber = accessor.getMember(i);
return countNumber == null ? null : UnitLookup.NUMBER_UNITY.quantity(countNumber);
}
};
}
});
public static final IAttribute<IQuantity> TOTAL_FINALIZERS_RUN = convertNumberToQuantity("totalFinalizersRun",
Messages.getString(Messages.ATTR_TOTAL_FINALIZERS_RUN),
Messages.getString(Messages.ATTR_TOTAL_FINALIZERS_RUN_DESC), TOTAL_FINALIZERS_RUN_NUMBER);

public static final IAttribute<IMCType> FINALIZABLE_CLASS = attr("finalizableClass", //$NON-NLS-1$
Messages.getString(Messages.ATTR_FINALIZABLE_CLASS),
Expand Down

0 comments on commit f114fb5

Please sign in to comment.