Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tracepoint specifiers #11173

Merged
merged 1 commit into from
Nov 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions runtime/jvmti/j9jvmti.tdf
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,8 @@ TraceExit=Trc_JVMTI_jvmtiHookSampledObjectAlloc_Exit Overhead=1 Level=5 Noenv Te

TraceException=Trc_JVMTI_issueAgentOnLoadAttach_strConvertFailed Overhead=1 Level=1 Noenv Template="issueAgentOnLoadAttach: j9str_convert (%s) failed"

TraceEntry=Trc_JVMTI_lookupNativeAddressHelper_Entry Overhead=1 Level=3 Template="lookupNativeAddressHelper - nativeMethod (%p) methodName (%.*s) methodSignature (%.*s) prefixOffset (%llu) retransformFlag (%llu) functionArgCount (%llu) callback (%p)"
TraceEvent=Trc_JVMTI_lookupNativeAddressHelper_Bound_ClassLoader_Library Overhead=1 Level=3 Template="lookupNativeAddressHelper (bound with classloader library) - nativeMethod (%p) nativeLibrary (%p) longJNI (%s) shortJNI (%s) functionArgCount (%llu)"
TraceEvent=Trc_JVMTI_lookupNativeAddressHelper_Bound_Null_Library Overhead=1 Level=3 Template="lookupNativeAddressHelper (bound without classloader library) - nativeMethod (%p) longJNI (%s) shortJNI (%s) functionArgCount (%llu)"
TraceEvent=Trc_JVMTI_lookupNativeAddressHelper_Bound_Agent_Library Overhead=1 Level=3 Template="lookupNativeAddressHelper (bound with agent library) - nativeMethod (%p) nativeLibrary (%p) longJNI (%s) shortJNI (%s) functionArgCount (%llu)"
TraceExit=Trc_JVMTI_lookupNativeAddressHelper_Exit Overhead=1 Level=3 Template="lookupNativeAddressHelper - prefixOffset (%llu)"
TraceEntry=Trc_JVMTI_lookupNativeAddressHelper_Entry Overhead=1 Level=3 Template="lookupNativeAddressHelper - nativeMethod (%p) methodName (%.*s) methodSignature (%.*s) prefixOffset (%zu) retransformFlag (%zu) functionArgCount (%zu) callback (%p)"
TraceEvent=Trc_JVMTI_lookupNativeAddressHelper_Bound_ClassLoader_Library Overhead=1 Level=3 Template="lookupNativeAddressHelper (bound with classloader library) - nativeMethod (%p) nativeLibrary (%p) longJNI (%s) shortJNI (%s) functionArgCount (%zu)"
TraceEvent=Trc_JVMTI_lookupNativeAddressHelper_Bound_Null_Library Overhead=1 Level=3 Template="lookupNativeAddressHelper (bound without classloader library) - nativeMethod (%p) longJNI (%s) shortJNI (%s) functionArgCount (%zu)"
TraceEvent=Trc_JVMTI_lookupNativeAddressHelper_Bound_Agent_Library Overhead=1 Level=3 Template="lookupNativeAddressHelper (bound with agent library) - nativeMethod (%p) nativeLibrary (%p) longJNI (%s) shortJNI (%s) functionArgCount (%zu)"
TraceExit=Trc_JVMTI_lookupNativeAddressHelper_Exit Overhead=1 Level=3 Template="lookupNativeAddressHelper - prefixOffset (%zu)"
54 changes: 27 additions & 27 deletions runtime/vm/j9vm.tdf
Original file line number Diff line number Diff line change
Expand Up @@ -799,62 +799,62 @@ TraceException=Trc_VM_CreateRAMClassFromROMClass_circularity2 noEnv Overhead=1 L
TraceException=Trc_VM_CreateRAMClassFromROMClass_classIsNotPermittedBySealedSuperclass Overhead=1 Level=1 Template="Superclass (RAM class=%p) does not include %.*s in PermittedSubclasses list"
TraceException=Trc_VM_CreateRAMClassFromROMClass_classIsNotPermittedBySealedSuperinterface Overhead=1 Level=1 Template="Superinterface (RAM class=%p) does not include %.*s in PermittedSubclasses list"

TraceEntry=Trc_VM_bindNative_Entry Overhead=1 Level=3 Template="bindNative - nativeMethod (%p) longJNI (%s) shortJNI (%s) bindJNINative (%llu)"
TraceEvent=Trc_VM_bindNative_NativeLibrary_Success Overhead=1 Level=3 Template="bindNative success - nativeMethod (%p) nativeLibrary (%p) longJNI (%s) shortJNI (%s) bindJNINative (%llu)"
TraceEvent=Trc_VM_bindNative_NativeLibrary_OOM Overhead=1 Level=3 Template="bindNative OOM - nativeMethod (%p) nativeLibrary (%p) longJNI (%s) shortJNI (%s) bindJNINative (%llu)"
TraceEvent=Trc_VM_bindNative_NullNativeLibrary_Success Overhead=1 Level=3 Template="bindNative success (NULL Native Library) - nativeMethod (%p) longJNI (%s) shortJNI (%s) bindJNINative (%llu)"
TraceEvent=Trc_VM_bindNative_NullNativeLibrary_OOM Overhead=1 Level=3 Template="bindNative OOM (NULL Native Library) - nativeMethod (%p) longJNI (%s) shortJNI (%s) bindJNINative (%llu)"
TraceEntry=Trc_VM_bindNative_Entry Overhead=1 Level=3 Template="bindNative - nativeMethod (%p) longJNI (%s) shortJNI (%s) bindJNINative (%zu)"
TraceEvent=Trc_VM_bindNative_NativeLibrary_Success Overhead=1 Level=3 Template="bindNative success - nativeMethod (%p) nativeLibrary (%p) longJNI (%s) shortJNI (%s) bindJNINative (%zu)"
TraceEvent=Trc_VM_bindNative_NativeLibrary_OOM Overhead=1 Level=3 Template="bindNative OOM - nativeMethod (%p) nativeLibrary (%p) longJNI (%s) shortJNI (%s) bindJNINative (%zu)"
TraceEvent=Trc_VM_bindNative_NullNativeLibrary_Success Overhead=1 Level=3 Template="bindNative success (NULL Native Library) - nativeMethod (%p) longJNI (%s) shortJNI (%s) bindJNINative (%zu)"
TraceEvent=Trc_VM_bindNative_NullNativeLibrary_OOM Overhead=1 Level=3 Template="bindNative OOM (NULL Native Library) - nativeMethod (%p) longJNI (%s) shortJNI (%s) bindJNINative (%zu)"
TraceEvent=Trc_VM_bindNative_JVMTIAgent_Success Overhead=1 Level=3 Template="bindNative success (JVMTI Agent) - nativeMethod (%p) longJNI (%s) shortJNI (%s)"
TraceEvent=Trc_VM_bindNative_Fail Overhead=1 Level=3 Template="bindNative fail - nativeMethod (%p) longJNI (%s) shortJNI (%s) bindJNINative (%llu)"
TraceEvent=Trc_VM_bindNative_Fail Overhead=1 Level=3 Template="bindNative fail - nativeMethod (%p) longJNI (%s) shortJNI (%s) bindJNINative (%zu)"
TraceEntry=Trc_VM_lookupJNINative_Entry Overhead=1 Level=3 Template="lookupJNINative - nativeLibrary (%p) nativeMethod (%p) symbolName (%s) signature (%s)"
TraceEvent=Trc_VM_lookupJNINative_NullNativeLibrary Overhead=1 Level=3 Template="lookupJNINative (null native library) - nativeMethod (%p) symbolName (%s) signature (%s) functionAddress (%p)"
TraceExit=Trc_VM_lookupJNINative_Exit Overhead=1 Level=3 Template="lookupJNINative - nativeLibrary (%p) nativeMethod (%p) nativeMethod->extra (%p) symbolName (%s) signature (%s) lookupResult (%llu)"
TraceEntry=Trc_VM_lookupNativeAddress_Entry Overhead=1 Level=3 Template="lookupNativeAddress - nativeLibrary (%p) nativeMethod (%p) longJNI (%s) shortJNI (%s) functionArgCount (%llu) bindJNINative (%llu)"
TraceExit=Trc_VM_lookupNativeAddress_inlIntercept_Exit Overhead=1 Level=3 Template="lookupNativeAddress - nativeLibrary (%p) nativeMethod (%p) longJNI (%s) rc (%llu)"
TraceExit=Trc_VM_lookupJNINative_Exit Overhead=1 Level=3 Template="lookupJNINative - nativeLibrary (%p) nativeMethod (%p) nativeMethod->extra (%p) symbolName (%s) signature (%s) lookupResult (%zu)"
TraceEntry=Trc_VM_lookupNativeAddress_Entry Overhead=1 Level=3 Template="lookupNativeAddress - nativeLibrary (%p) nativeMethod (%p) longJNI (%s) shortJNI (%s) functionArgCount (%zu) bindJNINative (%zu)"
TraceExit=Trc_VM_lookupNativeAddress_inlIntercept_Exit Overhead=1 Level=3 Template="lookupNativeAddress - nativeLibrary (%p) nativeMethod (%p) longJNI (%s) rc (%zu)"
TraceExit=Trc_VM_lookupNativeAddress_bindmethod_shortJNI_Exit Overhead=1 Level=3 Template="lookupNativeAddress - nativeLibrary (%p) nativeMethod (%p) shortJNI (%s) argSignature (%s)"
TraceExit=Trc_VM_lookupNativeAddress_bindmethod_longJNI_Exit Overhead=1 Level=3 Template="lookupNativeAddress - nativeLibrary (%p) nativeMethod (%p) longJNI (%s) argSignature (%s)"
TraceExit=Trc_VM_lookupNativeAddress_fail_Exit Overhead=1 Level=3 Template="lookupNativeAddress - nativeLibrary (%p) nativeMethod (%p) argSignature (%s)"

TraceEntry=Trc_VM_registerBootstrapLibrary_Entry Overhead=1 Level=3 Template="registerBootstrapLibrary - libName (%s) libraryPtr (%p)"
TraceExit=Trc_VM_registerBootstrapLibrary_Exit Overhead=1 Level=3 Template="registerBootstrapLibrary - libName (%s) libraryPtr (%p) result (%llu)"
TraceExit=Trc_VM_registerBootstrapLibrary_Exit Overhead=1 Level=3 Template="registerBootstrapLibrary - libName (%s) libraryPtr (%p) result (%zu)"

TraceEvent=Trc_VM_ConvertToJavaFullyQualifiedName_Get_ClassName Overhead=1 Level=4 Template="ConvertToJavaFullyQualifiedName - get result (%s) from %.*s"
TraceEvent=Trc_VM_ConvertMethodSignature_Malformed_Signature Overhead=1 Level=1 Template="ConvertMethodSignature - malformed signature %.*s at index i = %d"
TraceEvent=Trc_VM_ConvertMethodSignature_Signature_BufferSize Overhead=1 Level=4 Template="ConvertMethodSignature - signature %.*s has bufferSize %d"
TraceEvent=Trc_VM_ConvertMethodSignature_Signature_Result Overhead=1 Level=4 Template="ConvertMethodSignature - result (%s) with resultLength %llu"
TraceEvent=Trc_VM_ConvertMethodSignature_Signature_Result Overhead=1 Level=4 Template="ConvertMethodSignature - result (%s) with resultLength %zu"

TraceEvent=Trc_VM_initializeModulesPathEntry_loadJImageFailed NoEnv Overhead=1 Level=1 Template="initializeModulesPathEntry - attempt to load %.*s as jimage file failed with error=%d"

TraceEvent=Trc_VM_GetCompleteNPEMessage_Not_Required Overhead=1 Level=3 Template="GetCompleteNPEMessage - No message generated for new NullPointerException().getMessage()"
TraceEntry=Trc_VM_ComputeNPEMsgAtPC_Entry Overhead=1 Level=3 Template="ComputeNPEMsgAtPC : romClass (%p) romMethod (%p) temps (%p) bytecodeOffset (%p) bcCurrent (0x%x) npePC (%u) npeFlag (%d) isMethodFlag (%d) npeMsg (%s)"
TraceEvent=Trc_VM_ComputeNPEMsgAtPC_Constants Overhead=1 Level=4 Template="ComputeNPEMsgAtPC - constants : bcCurrent (0x%x) constNum (%d) numLen (%u) npeMsgTemp (%s)"
TraceEvent=Trc_VM_ComputeNPEMsgAtPC_Operators Overhead=1 Level=4 Template="ComputeNPEMsgAtPC - operators : bcCurrent (0x%x) npeMsgTemp (%s) msgLen (%u)"
TraceEvent=Trc_VM_ComputeNPEMsgAtPC_NotScalarType Overhead=1 Level=1 Template="ComputeNPEMsgAtPC - NOT scalar type : romClass (%p) romMethod (%p) constantPool (%p) aaloadIndex (%llu) info (%p) cpType (0x%x)"
TraceEvent=Trc_VM_ComputeNPEMsgAtPC_NotScalarType Overhead=1 Level=1 Template="ComputeNPEMsgAtPC - NOT scalar type : romClass (%p) romMethod (%p) constantPool (%p) aaloadIndex (%zu) info (%p) cpType (0x%x)"
TraceEvent=Trc_VM_ComputeNPEMsgAtPC_Constants_UnexpectedBC Overhead=1 Level=1 Template="ComputeNPEMsgAtPC - constants unexpected bytecode : bcCurrent (0x%x)"
TraceEvent=Trc_VM_ComputeNPEMsgAtPC_SkippedBC Overhead=1 Level=1 Template="ComputeNPEMsgAtPC - skipped bytecode : bcCurrent (0x%x) npeFinalFlag (%d)"
TraceExit=Trc_VM_ComputeNPEMsgAtPC_Exit Overhead=1 Level=3 Template="ComputeNPEMsgAtPC : bcCurrent (0x%x) npePC (%u) npeFlag (%d) isMethodFlag (%d) npeMsg (%s)"
TraceEvent=Trc_VM_SimulateStack_BranchTarget Overhead=1 Level=3 Template="simulateStack - bytecodeMap[%llu] (0x%x) is BRANCH_TARGET with bcPos (%llu)"
TraceEvent=Trc_VM_SimulateStack_JustLoadedStack Overhead=1 Level=3 Template="simulateStack - justLoadedStack bytecodeMap[%llu] (0x%x) stackIndex (%llu) bcIndex (%p) currentBytecode (0x%llx) npePC (%llu)"
TraceEvent=Trc_VM_SimulateStack_AlreadyWalked Overhead=1 Level=3 Template="simulateStack - already walked, try next one in the queue : bytecodeMap[%llu] (0x%x) currentBytecode (0x%llx) npePC (%llu)"
TraceEvent=Trc_VM_SimulateStack_SkippedBC Overhead=1 Level=3 Template="simulateStack - skipped currentBytecode (0x%llx) pc (%llu) action (%llu)"
TraceEvent=Trc_VM_SimulateStack_UnimplementedBC Overhead=1 Level=1 Template="simulateStack - RTV_UNIMPLEMENTED detected at currentBytecode (0x%llx) pc (%llu) action (%llu)"
TraceEvent=Trc_VM_SimulateStack_MalformedStack_One Overhead=1 Level=1 Template="simulateStack - malformed stack (stackTop(%p) - popCount(%llx)) < stackBase(%p)"
TraceEvent=Trc_VM_SimulateStack_BranchTarget Overhead=1 Level=3 Template="simulateStack - bytecodeMap[%zu] (0x%x) is BRANCH_TARGET with bcPos (%zu)"
TraceEvent=Trc_VM_SimulateStack_JustLoadedStack Overhead=1 Level=3 Template="simulateStack - justLoadedStack bytecodeMap[%zu] (0x%x) stackIndex (%zu) bcIndex (%p) currentBytecode (0x%zx) npePC (%zu)"
TraceEvent=Trc_VM_SimulateStack_AlreadyWalked Overhead=1 Level=3 Template="simulateStack - already walked, try next one in the queue : bytecodeMap[%zu] (0x%x) currentBytecode (0x%zx) npePC (%zu)"
TraceEvent=Trc_VM_SimulateStack_SkippedBC Overhead=1 Level=3 Template="simulateStack - skipped currentBytecode (0x%zx) pc (%zu) action (%zu)"
TraceEvent=Trc_VM_SimulateStack_UnimplementedBC Overhead=1 Level=1 Template="simulateStack - RTV_UNIMPLEMENTED detected at currentBytecode (0x%zx) pc (%zu) action (%zu)"
TraceEvent=Trc_VM_SimulateStack_MalformedStack_One Overhead=1 Level=1 Template="simulateStack - malformed stack (stackTop(%p) - popCount(%zx)) < stackBase(%p)"
TraceEvent=Trc_VM_SimulateStack_MalformedStack_Two Overhead=1 Level=1 Template="simulateStack - malformed stack stackTop(%p) < stackBase(%p)"
TraceEvent=Trc_VM_SimulateStack_RtvPushNew_SkippedBC Overhead=1 Level=3 Template="simulateStack - skipped bytecode (0x%x)"
TraceExit=Trc_VM_SimulateStack_Exit Overhead=1 Level=3 Template="simulateStack exits - npeMsg (%s)"
TraceExit=Trc_VM_GetMsgWithAllocation_Exit Overhead=1 Level=3 Template="GetMsgWithAllocation : msgTemplate (%s) resultMsg (%s)"
TraceEntry=Trc_VM_GetFullyQualifiedMethodName_Entry Overhead=1 Level=3 Template="GetFullyQualifiedMethodName bc (0x%x) index (%u) bcIndex (%p)"
TraceExit=Trc_VM_GetFullyQualifiedMethodName_Exit Overhead=1 Level=3 Template="GetFullyQualifiedMethodName index (%u) info (%p) className (%s) methodSig (%s) result (%s)"
TraceEvent=Trc_VM_GetLocalsName_LocalVar Overhead=1 Level=3 Template="getLocalsName localVar (%u) temps[localVar] (%llu)"
TraceEvent=Trc_VM_GetLocalsName_LocalVar Overhead=1 Level=3 Template="getLocalsName localVar (%u) temps[localVar] (%zu)"
TraceExit=Trc_VM_GetLocalsName_Exit Overhead=1 Level=3 Template="GetLocalsName result (%s) localVar (%d) bcIndex (%u) temps (%p) methodInfo (%p)"
TraceExit=Trc_VM_PushViaSiganature_Exit Overhead=1 Level=4 Template="PushViaSiganature *signature (%c) stackTop (%p) bcPos (%llu)"
TraceEvent=Trc_VM_CopyToTargetStack_Copy Overhead=1 Level=3 Template="copyToTargetStack npeMsgData->unwalkedQueueTail (%llu) bytecodeMap[%llu] (0x%x)"
TraceEvent=Trc_VM_CopyToTargetStack_BranchTarget Overhead=1 Level=3 Template="copyToTargetStack BranchTarget at liveStackBaseIndexTemp (%llu) liveStack: (%llu) targetStack: (%llu)"
TraceEvent=Trc_VM_CopyToTargetStack_Mismatched_StackShape Overhead=1 Level=1 Template="copyToTargetStack mismatched stack shape: liveStack (%lld, %lld) targetStack (%lld, %lld)"
TraceEvent=Trc_VM_CopyToTargetStack_DumpLiveStack Overhead=1 Level=4 Test Template="copyToTargetStack - liveStack->stackBaseIndex (%llu) liveStack->stackTopIndex (%llu)"
TraceEvent=Trc_VM_CopyToTargetStack_DumpTargetStack Overhead=1 Level=4 Test Template="copyToTargetStack - targetStack->stackBaseIndex (%llu) targetStack->stackTopIndex (%llu)"
TraceExit=Trc_VM_CopyToTargetStack_Exit Overhead=1 Level=4 Template="copyToTargetStack bytecodeMap[%llu] (0x%x) targetStack (%p) liveStack (%p) targetStack->stackTopIndex (%llu) liveStack->stackTopIndex (%llu)"
TraceEvent=Trc_VM_InitStackFromMethodSignature_Result Overhead=1 Level=3 Template="InitStackFromMethodSignature - *stackTopPtr (%p) stackTop (%p) argCount (%llu)"
TraceExit=Trc_VM_PushViaSiganature_Exit Overhead=1 Level=4 Template="PushViaSiganature *signature (%c) stackTop (%p) bcPos (%zu)"
TraceEvent=Trc_VM_CopyToTargetStack_Copy Overhead=1 Level=3 Template="copyToTargetStack npeMsgData->unwalkedQueueTail (%zu) bytecodeMap[%zu] (0x%x)"
TraceEvent=Trc_VM_CopyToTargetStack_BranchTarget Overhead=1 Level=3 Template="copyToTargetStack BranchTarget at liveStackBaseIndexTemp (%zu) liveStack: (%zu) targetStack: (%zu)"
TraceEvent=Trc_VM_CopyToTargetStack_Mismatched_StackShape Overhead=1 Level=1 Template="copyToTargetStack mismatched stack shape: liveStack (%zd, %zd) targetStack (%zd, %zd)"
TraceEvent=Trc_VM_CopyToTargetStack_DumpLiveStack Overhead=1 Level=4 Test Template="copyToTargetStack - liveStack->stackBaseIndex (%zu) liveStack->stackTopIndex (%zu)"
TraceEvent=Trc_VM_CopyToTargetStack_DumpTargetStack Overhead=1 Level=4 Test Template="copyToTargetStack - targetStack->stackBaseIndex (%zu) targetStack->stackTopIndex (%zu)"
TraceExit=Trc_VM_CopyToTargetStack_Exit Overhead=1 Level=4 Template="copyToTargetStack bytecodeMap[%zu] (0x%x) targetStack (%p) liveStack (%p) targetStack->stackTopIndex (%zu) liveStack->stackTopIndex (%zu)"
TraceEvent=Trc_VM_InitStackFromMethodSignature_Result Overhead=1 Level=3 Template="InitStackFromMethodSignature - *stackTopPtr (%p) stackTop (%p) argCount (%zu)"

TraceEvent=Trc_VM_findNativeLibrariesLoad_nativeMethod Overhead=1 Level=3 Template="getCurrentClassLoader - find NativeLibrariesLoad nativeMethod (0x%p) nativeLibraryImplObject (0x%p) classLoader (0x%p)"
TraceEvent=Trc_VM_findNativeLibrariesLoad_nativeLibraryImplObject Overhead=1 Level=3 Template="getCurrentClassLoader - find NativeLibrariesLoad nativeLibraryImplObject (0x%p)"
Expand Down