Add support for non-string context fields

jbachorik · jbachorik · commit 9eccd666152b · 2023-10-18T11:49:52.000Z
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java
@@ -352,12 +352,18 @@ private static void addFields(Type type, boolean requestable, boolean hasDuratio
             type.add(STACK_TRACE_FIELD);
         }
         if (hasContext) {
-            var fldSuffix = 1;
             for (var descriptor : ContextRepository.registrations()) {
                 String name = descriptor.holderId() + "_" + descriptor.name();
                 var annos = createStandardAnnotations(name, descriptor.holderId() + ":" + descriptor.label(), descriptor.description());
-                type.add(PrivateAccess.getInstance().newValueDescriptor(name, Type.STRING, annos, 0, true, name));
-                fldSuffix++;
+                Class<?> varType = descriptor.access().varType();
+                Type fType = Type.LONG;
+                if (varType == String.class) {
+                    fType = Type.STRING;
+                } else if (varType == boolean.class) {
+                    fType = Type.BOOLEAN;
+                }
+                System.err.println("===> " + name + ": " + fType + ", " + (fType == Type.STRING));
+                type.add(PrivateAccess.getInstance().newValueDescriptor(name, fType, annos, 0, fType == Type.STRING, name));
             }
         }
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextRepository.java
@@ -58,14 +58,19 @@ private static <T extends BaseContextType> Set<ContextDescriptor> descriptorsOf(
             MethodHandles.Lookup lookup = MethodHandles.publicLookup();
             int order = 0;
             for (Field f : contextTypeClass.getFields()) {
-                Name nameAnnot = f.getAnnotation(Name.class);
-                Label labelAnnot = f.getAnnotation(Label.class);
-                Description descAnnot = f.getAnnotation(Description.class);
-                if (nameAnnot != null || labelAnnot != null || descAnnot != null) {
-                    String name = nameAnnot != null ? nameAnnot.value() : f.getName();
-                    String label = labelAnnot != null ? labelAnnot.value() : name;
-                    String desc = descAnnot != null ? descAnnot.value() : "";
-                    ctxDescriptors.add(new ContextDescriptor(order++, id, name, label, desc, lookup.unreflectVarHandle(f)));
+                Class<?> fType = f.getType();
+                if (fType == String.class || (fType.isPrimitive() && fType != float.class && fType != double.class)) {
+                    Name nameAnnot = f.getAnnotation(Name.class);
+                    Label labelAnnot = f.getAnnotation(Label.class);
+                    Description descAnnot = f.getAnnotation(Description.class);
+                    if (nameAnnot != null || labelAnnot != null || descAnnot != null) {
+                        String name = nameAnnot != null ? nameAnnot.value() : f.getName();
+                        String label = labelAnnot != null ? labelAnnot.value() : name;
+                        String desc = descAnnot != null ? descAnnot.value() : "";
+                        ctxDescriptors.add(new ContextDescriptor(order++, id, name, label, desc, lookup.unreflectVarHandle(f)));
+                    }
+                } else {
+                    throw new IllegalArgumentException("Only context fields of String, boolean, int, long, byte, short and char types are supported");
                 }
             }
             return ctxDescriptors;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/context/ContextWriter.java
@@ -1,5 +1,6 @@
 package jdk.jfr.internal.context;
 
+import java.lang.invoke.VarHandle;
 import java.nio.LongBuffer;
 import java.util.Collections;
 import java.util.Map;
@@ -36,8 +37,16 @@ void write(BaseContextType target) {
         }
         for (ContextDescriptor cd : descriptors) {
             if (cd.order() < 8) {
-                String value = (String) cd.access().get(target);
-                context.put(offset + cd.order(), value != null ? StringPool.addString(value, false) : 0);
+                VarHandle access= cd.access();
+                Class<?> vType = access.varType();
+                if (vType == String.class) {
+                    String value = (String) access.get(target);
+                    context.put(offset + cd.order(), value != null ? StringPool.addString(value, false) : 0);
+                } else if (vType == boolean.class) {
+                    context.put(offset + cd.order(), ((boolean) access.get(target) ? 0 : 1));
+                } else {
+                    context.put(offset + cd.order(), (long) access.get(target));
+                }
             }
         }
     }
@@ -53,7 +62,12 @@ void clear(BaseContextType target) {
         for (ContextDescriptor cd : descriptors) {
             if (cd.order() < 8) {
                 context.put(offset + cd.order(), 0L);
-                cd.access().set(target, null);
+                VarHandle access = cd.access();
+                if (access.varType() == String.class) {
+                    access.set(target, null);
+                } else {
+                    access.set(target, 0);
+                }
             }
         }
     }
diff --git a/test/jdk/jdk/jfr/api/context/TestJfrContext.java b/test/jdk/jdk/jfr/api/context/TestJfrContext.java
@@ -54,7 +54,10 @@ public static class TestContextType extends ContextType {
 
         @Name("result")
         @Description("TRUE/FALSE")
-        public String result; 
+        public boolean result;
+
+        @Name("value")
+        public byte value;
     }
 
     @Name("too_large")
@@ -99,7 +102,8 @@ public static void main(String[] args) throws Throwable {
 
         TestContextType captured = new TestContextType();
         captured.state = "enabled";
-        captured.result = "FALSE";
+        captured.result = false;
+        captured.value = -1;
         captured.set();
 
         ClassLoader classLoader = TestJfrContext.class.getClassLoader();
@@ -115,7 +119,8 @@ public static void main(String[] args) throws Throwable {
         }
         r.enable(eventClass).withThreshold(Duration.ofMillis(0)).withoutStackTrace();
         captured.state = "disabled";
-        captured.result = "TRUE";
+        captured.result = true;
+        captured.value = 1;
         captured.set();
         synchronized (captured) {
             TooLargeContextType tlct = new TooLargeContextType();
diff --git a/test/lib/jdk/test/lib/jfr/ContextAwareEvent.java b/test/lib/jdk/test/lib/jfr/ContextAwareEvent.java
@@ -27,8 +27,10 @@
 
 import jdk.jfr.ContextAware;
 import jdk.jfr.Event;
+import jdk.jfr.Name;
 
 @ContextAware
+@Name("test.ContextAware")
 public class ContextAwareEvent extends Event {
     public ContextAwareEvent(int id) {
         this.id = id;

Original file line number	Diff line number	Diff line change
`@@ -352,12 +352,18 @@ private static void addFields(Type type, boolean requestable, boolean hasDuratio`
`352`	`352`	`type.add(STACK_TRACE_FIELD);`
`353`	`353`	`}`
`354`	`354`	`if (hasContext) {`
`355`		`- var fldSuffix = 1;`
`356`	`355`	`for (var descriptor : ContextRepository.registrations()) {`
`357`	`356`	`String name = descriptor.holderId() + "_" + descriptor.name();`
`358`	`357`	`var annos = createStandardAnnotations(name, descriptor.holderId() + ":" + descriptor.label(), descriptor.description());`
`359`		`- type.add(PrivateAccess.getInstance().newValueDescriptor(name, Type.STRING, annos, 0, true, name));`
`360`		`- fldSuffix++;`
	`358`	`+ Class<?> varType = descriptor.access().varType();`
	`359`	`+ Type fType = Type.LONG;`
	`360`	`+ if (varType == String.class) {`
	`361`	`+ fType = Type.STRING;`
	`362`	`+ } else if (varType == boolean.class) {`
	`363`	`+ fType = Type.BOOLEAN;`
	`364`	`+ }`
	`365`	`+ System.err.println("===> " + name + ": " + fType + ", " + (fType == Type.STRING));`
	`366`	`+ type.add(PrivateAccess.getInstance().newValueDescriptor(name, fType, annos, 0, fType == Type.STRING, name));`
`361`	`367`	`}`
`362`	`368`	`}`
`363`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package jdk.jfr.internal.context;`
`2`	`2`
	`3`	`+import java.lang.invoke.VarHandle;`
`3`	`4`	`import java.nio.LongBuffer;`
`4`	`5`	`import java.util.Collections;`
`5`	`6`	`import java.util.Map;`
`@@ -36,8 +37,16 @@ void write(BaseContextType target) {`
`36`	`37`	`}`
`37`	`38`	`for (ContextDescriptor cd : descriptors) {`
`38`	`39`	`if (cd.order() < 8) {`
`39`		`- String value = (String) cd.access().get(target);`
`40`		`- context.put(offset + cd.order(), value != null ? StringPool.addString(value, false) : 0);`
	`40`	`+ VarHandle access= cd.access();`
	`41`	`+ Class<?> vType = access.varType();`
	`42`	`+ if (vType == String.class) {`
	`43`	`+ String value = (String) access.get(target);`
	`44`	`+ context.put(offset + cd.order(), value != null ? StringPool.addString(value, false) : 0);`
	`45`	`+ } else if (vType == boolean.class) {`
	`46`	`+ context.put(offset + cd.order(), ((boolean) access.get(target) ? 0 : 1));`
	`47`	`+ } else {`
	`48`	`+ context.put(offset + cd.order(), (long) access.get(target));`
	`49`	`+ }`
`41`	`50`	`}`
`42`	`51`	`}`
`43`	`52`	`}`
`@@ -53,7 +62,12 @@ void clear(BaseContextType target) {`
`53`	`62`	`for (ContextDescriptor cd : descriptors) {`
`54`	`63`	`if (cd.order() < 8) {`
`55`	`64`	`context.put(offset + cd.order(), 0L);`
`56`		`- cd.access().set(target, null);`
	`65`	`+ VarHandle access = cd.access();`
	`66`	`+ if (access.varType() == String.class) {`
	`67`	`+ access.set(target, null);`
	`68`	`+ } else {`
	`69`	`+ access.set(target, 0);`
	`70`	`+ }`
`57`	`71`	`}`
`58`	`72`	`}`
`59`	`73`	`}`