1.1 --- a/src/share/vm/jfr/metadata/metadata.xml Sat Dec 08 14:08:04 2018 +0100
1.2 +++ b/src/share/vm/jfr/metadata/metadata.xml Thu Dec 13 14:21:04 2018 +0100
1.3 @@ -65,19 +65,19 @@
1.4 <Field type="InflateCause" name="cause" label="Monitor Inflation Cause" description="Cause of inflation" />
1.5 </Event>
1.6
1.7 - <Event name="BiasedLockRevocation" category="Java Application" label="Biased Lock Revocation" description="Revoked bias of object" thread="true"
1.8 + <Event name="BiasedLockRevocation" category="Java Virtual Machine, Runtime" label="Biased Lock Revocation" description="Revoked bias of object" thread="true"
1.9 stackTrace="true">
1.10 <Field type="Class" name="lockClass" label="Lock Class" description="Class of object whose biased lock was revoked" />
1.11 <Field type="int" name="safepointId" label="Safepoint Identifier" relation="SafepointId" />
1.12 <Field type="Thread" name="previousOwner" label="Previous Owner" description="Thread owning the bias before revocation" />
1.13 </Event>
1.14
1.15 - <Event name="BiasedLockSelfRevocation" category="Java Application" label="Biased Lock Self Revocation" description="Revoked bias of object biased towards own thread"
1.16 + <Event name="BiasedLockSelfRevocation" category="Java Virtual Machine, Runtime" label="Biased Lock Self Revocation" description="Revoked bias of object biased towards own thread"
1.17 thread="true" stackTrace="true">
1.18 <Field type="Class" name="lockClass" label="Lock Class" description="Class of object whose biased lock was revoked" />
1.19 </Event>
1.20
1.21 - <Event name="BiasedLockClassRevocation" category="Java Application" label="Biased Lock Class Revocation" description="Revoked biases for all instances of a class"
1.22 + <Event name="BiasedLockClassRevocation" category="Java Virtual Machine, Runtime" label="Biased Lock Class Revocation" description="Revoked biases for all instances of a class"
1.23 thread="true" stackTrace="true">
1.24 <Field type="Class" name="revokedClass" label="Revoked Class" description="Class whose biased locks were revoked" />
1.25 <Field type="boolean" name="disableBiasing" label="Disable Further Biasing" description="Whether further biasing for instances of this class will be allowed" />
1.26 @@ -350,7 +350,7 @@
1.27 <Field type="ulong" contentType="bytes" name="recentMutatorAllocationSize" label="Recent Mutator Allocation Size"
1.28 description="Mutator allocation during mutator operation in the most recent interval" />
1.29 <Field type="long" contentType="millis" name="recentMutatorDuration" label="Recent Mutator Duration" description="Time the mutator ran in the most recent interval" />
1.30 - <Field type="double" name="recentAllocationRate" label="Recent Allocation Rate" description="Allocation rate of the mutator in the most recent interval in bytes/second" />
1.31 + <Field type="double" contentType="bytes-per-second" name="recentAllocationRate" label="Recent Allocation Rate" description="Allocation rate of the mutator in the most recent interval in bytes/second" />
1.32 <Field type="long" contentType="millis" name="lastMarkingDuration" label="Last Marking Duration" description="Last time from the end of the last initial mark to the first mixed GC" />
1.33 </Event>
1.34
1.35 @@ -362,7 +362,7 @@
1.36 <Field type="ulong" contentType="bytes" name="ihopTargetOccupancy" label="IHOP Target Occupancy" description="Internal target old generation occupancy to reach at the start of mixed GC" />
1.37 <Field type="ulong" contentType="bytes" name="currentOccupancy" label="Current Occupancy" description="Current old generation occupancy" />
1.38 <Field type="ulong" contentType="bytes" name="additionalBufferSize" label="Additional Buffer" description="Additional buffer size" experimental="true" />
1.39 - <Field type="double" name="predictedAllocationRate" label="Predicted Allocation Rate" description="Current predicted allocation rate for the mutator in bytes/second" />
1.40 + <Field type="double" contentType="bytes-per-second" name="predictedAllocationRate" label="Predicted Allocation Rate" description="Current predicted allocation rate for the mutator in bytes/second" />
1.41 <Field type="long" contentType="millis" name="predictedMarkingDuration" label="Predicted Marking Duration"
1.42 description="Current predicted time from the end of the last initial mark to the first mixed GC" />
1.43 <Field type="boolean" name="predictionActive" label="Prediction Active" description="Indicates whether the adaptive IHOP prediction is active" />
1.44 @@ -557,9 +557,9 @@
1.45 relation="SafepointId" />
1.46 </Event>
1.47
1.48 - <Event name="Shutdown" category="Java Virtual Machine, Runtime" label="VM Shutdown" description="VM shutting down" thread="true" stackTrace="true"
1.49 + <Event name="Shutdown" category="Java Virtual Machine, Runtime" label="JVM Shutdown" description="JVM shutting down" thread="true" stackTrace="true"
1.50 startTime="false">
1.51 - <Field type="string" name="reason" label="Reason" description="Reason for VM shutdown" />
1.52 + <Field type="string" name="reason" label="Reason" description="Reason for JVM shutdown" />
1.53 </Event>
1.54
1.55 <Event name="ObjectAllocationInNewTLAB" category="Java Application" label="Allocation in new TLAB" description="Allocation in new Thread Local Allocation Buffer"
1.56 @@ -575,7 +575,7 @@
1.57 <Field type="ulong" contentType="bytes" name="allocationSize" label="Allocation Size" />
1.58 </Event>
1.59
1.60 - <Event name="OldObjectSample" category="Java Application" label="Old Object Sample" description="A potential memory leak" stackTrace="true" thread="true"
1.61 + <Event name="OldObjectSample" category="Java Virtual Machine, Profiling" label="Old Object Sample" description="A potential memory leak" stackTrace="true" thread="true"
1.62 startTime="false" cutoff="true">
1.63 <Field type="Ticks" name="allocationTime" label="Allocation Time" />
1.64 <Field type="ulong" contentType="bytes" name="lastKnownHeapUsage" label="Last Known Heap Usage" />
1.65 @@ -640,8 +640,8 @@
1.66 <Event name="CPUTimeStampCounter" category="Operating System, Processor" label="CPU Time Stamp Counter" period="endChunk">
1.67 <Field type="boolean" name="fastTimeEnabled" label="Fast Time" />
1.68 <Field type="boolean" name="fastTimeAutoEnabled" label="Trusted Platform" />
1.69 - <Field type="long" name="osFrequency" label="OS Frequency Per Second" />
1.70 - <Field type="long" name="fastTimeFrequency" label="Fast Time Frequency per Second" />
1.71 + <Field type="long" contentType="hertz" name="osFrequency" label="OS Frequency" />
1.72 + <Field type="long" contentType="hertz" name="fastTimeFrequency" label="Fast Time Frequency" />
1.73 </Event>
1.74
1.75 <Event name="CPULoad" category="Operating System, Processor" label="CPU Load" description="OS CPU Load" period="everyChunk">
1.76 @@ -656,13 +656,13 @@
1.77 </Event>
1.78
1.79 <Event name="ThreadContextSwitchRate" category="Operating System, Processor" label="Thread Context Switch Rate" period="everyChunk">
1.80 - <Field type="float" name="switchRate" label="Switch Rate" description="Number of context switches per second" />
1.81 + <Field type="float" contentType="hertz" name="switchRate" label="Switch Rate" description="Number of context switches per second" />
1.82 </Event>
1.83
1.84 <Event name="NetworkUtilization" category="Operating System, Network" label="Network Utilization" period="everyChunk">
1.85 <Field type="NetworkInterfaceName" name="networkInterface" label="Network Interface" description="Network Interface Name"/>
1.86 - <Field type="long" contentType="bytes" name="readRate" label="Read Rate" description="Number of incoming bytes per second"/>
1.87 - <Field type="long" contentType="bytes" name="writeRate" label="Write Rate" description="Number of outgoing bytes per second"/>
1.88 + <Field type="long" contentType="bits-per-second" name="readRate" label="Read Rate" description="Number of incoming bits per second"/>
1.89 + <Field type="long" contentType="bits-per-second" name="writeRate" label="Write Rate" description="Number of outgoing bits per second"/>
1.90 </Event>
1.91
1.92 <Event name="JavaThreadStatistics" category="Java Application, Statistics" label="Java Thread Statistics" period="everyChunk">
1.93 @@ -680,7 +680,7 @@
1.94 <Event name="ClassLoaderStatistics" category="Java Application, Statistics" label="Class Loader Statistics" period="everyChunk">
1.95 <Field type="ClassLoader" name="classLoader" label="Class Loader" />
1.96 <Field type="ClassLoader" name="parentClassLoader" label="Parent Class Loader" />
1.97 - <Field type="ulong" contentType="address" name="classLoaderData" label="ClassLoaderData pointer" description="Pointer to the ClassLoaderData structure in the JVM" />
1.98 + <Field type="ulong" contentType="address" name="classLoaderData" label="ClassLoaderData Pointer" description="Pointer to the ClassLoaderData structure in the JVM" />
1.99 <Field type="long" name="classCount" label="Classes" description="Number of loaded classes" />
1.100 <Field type="ulong" contentType="bytes" name="chunkSize" label="Total Chunk Size" description="Total size of all allocated metaspace chunks (each chunk has several blocks)" />
1.101 <Field type="ulong" contentType="bytes" name="blockSize" label="Total Block Size" description="Total size of all allocated metaspace blocks (each chunk has several blocks)" />
1.102 @@ -735,8 +735,7 @@
1.103 <Event name="ModuleExport" category="Java Virtual Machine, Runtime, Modules" label="Module Export" thread="false" period="everyChunk">
1.104 <Field type="Package" name="exportedPackage" label="Exported Package" />
1.105 <Field type="Module" name="targetModule" label="Target Module"
1.106 - description="Module to which the package is qualifiedly exported.
1.107 - If null, the package is unqualifiedly exported" />
1.108 + description="Module to which the package is qualifiedly exported. If null or N/A, the package is unqualifiedly exported" />
1.109 </Event>
1.110 -->
1.111 <Event name="CompilerStatistics" category="Java Virtual Machine, Compiler" label="Compiler Statistics" thread="false" period="everyChunk" startTime="false">
1.112 @@ -1092,7 +1091,7 @@
1.113 <Field type="OldObjectArray" name="array" label="Array Information" description="Array or null if it is not an array" />
1.114 <Field type="OldObjectField" name="field" label="Field Information" description="Field or null if it is an array" />
1.115 <Field type="OldObject" name="object" label="Object" description="Object holder for this reference" />
1.116 - <Field type="int" name="skip" label="Skip value" description="The object is this many hops away" />
1.117 + <Field type="int" name="skip" label="Skip Value" description="The object is this many hops away" />
1.118 </Type>
1.119
1.120 <Type name="StackFrame">
1.121 @@ -1129,13 +1128,16 @@
1.122 <XmlType name="char" javaType="char" parameterType="char" fieldType="char"/>
1.123 <XmlType name="string" javaType="java.lang.String" parameterType="const char*" fieldType="const char*"/>
1.124
1.125 - <XmlContentType name="bytes" annotationType="jdk.jfr.DataAmount" annotationValue="BYTES" />
1.126 - <XmlContentType name="tickstamp" annotationType="jdk.jfr.Timestamp" annotationValue="TICKS" />
1.127 - <XmlContentType name="epochmillis" annotationType="jdk.jfr.Timestamp" annotationValue="MILLISECONDS_SINCE_EPOCH" />
1.128 - <XmlContentType name="tickspan" annotationType="jdk.jfr.Timespan" annotationValue="TICKS" />
1.129 - <XmlContentType name="address" annotationType="jdk.jfr.MemoryAddress" />
1.130 - <XmlContentType name="percentage" annotationType="jdk.jfr.Percentage" />
1.131 - <XmlContentType name="millis" annotationType="jdk.jfr.Timespan" annotationValue="MILLISECONDS" />
1.132 - <XmlContentType name="nanos" annotationType="jdk.jfr.Timespan" annotationValue="NANOSECONDS" />
1.133 -
1.134 + <XmlContentType name="bytes" annotation="jdk.jfr.DataAmount(BYTES)" />
1.135 + <XmlContentType name="tickstamp" annotation="jdk.jfr.Timestamp(TICKS)" />
1.136 + <XmlContentType name="epochmillis" annotation="jdk.jfr.Timestamp(MILLISECONDS_SINCE_EPOCH)" />
1.137 + <XmlContentType name="tickspan" annotation="jdk.jfr.Timespan(TICKS)" />
1.138 + <XmlContentType name="address" annotation="jdk.jfr.MemoryAddress" />
1.139 + <XmlContentType name="percentage" annotation="jdk.jfr.Percentage" />
1.140 + <XmlContentType name="millis" annotation="jdk.jfr.Timespan(MILLISECONDS)" />
1.141 + <XmlContentType name="nanos" annotation="jdk.jfr.Timespan(NANOSECONDS)" />
1.142 + <XmlContentType name="hertz" annotation="jdk.jfr.Frequency" />
1.143 + <XmlContentType name="bytes-per-second" annotation="jdk.jfr.DataAmount(BYTES), jdk.jfr.Frequency" />
1.144 + <XmlContentType name="bits-per-second" annotation="jdk.jfr.DataAmount(BITS), jdk.jfr.Frequency" />
1.145 +
1.146 </Metadata>
