Skip to content

Commit

Permalink
Fix trace format for MemorySubSpace
Browse files Browse the repository at this point in the history 
Various trace points use %llx (long long - 64bit) while it should use
%zx or %p (size_t - 32/64 bit) format to print MemorySubSpace addresses
and allocation result (address in heap), what would work both for 32bit
and 64bit VMs. Settling with %p, since it's already predominant.

Signed-off-by: Aleksandar Micic <Aleksandar_Micic@ca.ibm.com>
  • Loading branch information
Aleksandar Micic authored and Aleksandar Micic committed Jun 17, 2024
1 parent 817c5ec commit de2d500
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions gc/base/j9mm.tdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,36 +868,36 @@ TraceEvent=Trc_MM_SchedulingDelegate_estimateTotalFreeMemory Overhead=1 Level=1
TraceEvent=Trc_MM_SchedulingDelegate_calculateKickoffHeadroom Overhead=1 Level=1 Group=reclaim Template="calculateKickoffHeadroom oldHeadroomInBytes=%zu, newHeadroomInBytes=%zu"
TraceExit=Trc_MM_SchedulingDelegate_calculateAutomaticGMPIntermission_1_Exit Overhead=1 Level=1 Group=kickoff Template="MM_SchedulingDelegate_calculateAutomaticGMPIntermission remaining=%zu, kickoffHeadroomInBytes=%zu"

TraceEntry=Trc_MM_MSSGeneric_allocate_entry Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu subspace this %llx/%s base %llx prev %llx _allocateAtSafePointOnly %zu shouldCollectOnFailure %zu _isAllocatable %zu"
TraceEvent=Trc_MM_MSSGeneric_allocate Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu event %u subspace %llx failed, trying parent %llx"
TraceEvent=Trc_MM_MSSGeneric_allocate3 Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu event 3 subspace %llx failed, trying parent %llx shouldCollectAndClimb %zu"
TraceExit=Trc_MM_MSSGeneric_allocate_exit Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu subspace %llx result %llx"
TraceEntry=Trc_MM_MSSGeneric_allocate_entry Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu subspace this %p/%s base %p prev %p _allocateAtSafePointOnly %zu shouldCollectOnFailure %zu _isAllocatable %zu"
TraceEvent=Trc_MM_MSSGeneric_allocate Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu event %u subspace %p failed, trying parent %p"
TraceEvent=Trc_MM_MSSGeneric_allocate3 Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu event 3 subspace %p failed, trying parent %p shouldCollectAndClimb %zu"
TraceExit=Trc_MM_MSSGeneric_allocate_exit Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu subspace %p result %p"

TraceEntry=Trc_MM_MSSSS_allocate_entry Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu subspace this %llx/%s base %llx prev %llx shouldCollectOnFailure %zu"
TraceEntry=Trc_MM_MSSSS_allocate_entry Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu subspace this %p/%s base %p prev %p shouldCollectOnFailure %zu"
TraceEvent=Trc_MM_MSSSS_allocate Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu event %u"
TraceEvent=Trc_MM_MSSSS_allocate4 Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu event 4 shouldClimb %zu"
TraceExit=Trc_MM_MSSSS_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu result %llx"
TraceExit=Trc_MM_MSSSS_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu result %p"

TraceEntry=Trc_MM_MSSSS_allocationRequestFailed_entry Overhead=1 Level=1 Group=allocate Template="MSSSS::allocationRequestFailed size %zu subspace this %llx/%s base %llx prev %llx allocationType %zu"
TraceEntry=Trc_MM_MSSSS_allocationRequestFailed_entry Overhead=1 Level=1 Group=allocate Template="MSSSS::allocationRequestFailed size %zu subspace this %p/%s base %p prev %p allocationType %zu"
TraceEvent=Trc_MM_MSSSS_allocationRequestFailed Overhead=1 Level=1 Group=allocate Template="MSSSS::allocationRequestFailed size %zu event %u"
TraceExit=Trc_MM_MSSSS_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSSS::allocationRequestFailed size %zu exit %zu result %llx"
TraceExit=Trc_MM_MSSSS_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSSS::allocationRequestFailed size %zu exit %zu result %p"

TraceEntry=Trc_MM_MSSFlat_allocate_entry Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocate type %s size %zu subspace this %llx/%s base %llx prev %llx shouldCollectOnFailure %zu"
TraceEntry=Trc_MM_MSSFlat_allocate_entry Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocate type %s size %zu subspace this %p/%s base %p prev %p shouldCollectOnFailure %zu"
TraceEvent=Trc_MM_MSSFlat_allocate Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocate type %s size %zu event %u"
TraceExit=Trc_MM_MSSFlat_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocate type %s size %zu result %llx"
TraceExit=Trc_MM_MSSFlat_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocate type %s size %zu result %p"

TraceEntry=Trc_MM_MSSFlat_allocationRequestFailed_entry Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocationRequestFailed size %zu subspace this %llx/%s base %llx prev %llx allocationType %zu"
TraceEntry=Trc_MM_MSSFlat_allocationRequestFailed_entry Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocationRequestFailed size %zu subspace this %p/%s base %p prev %p allocationType %zu"
TraceEvent=Trc_MM_MSSFlat_allocationRequestFailed Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocationRequestFailed size %zu event %u"
TraceExit=Trc_MM_MSSFlat_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocationRequestFailed size %zu exit %zu result %llx"
TraceExit=Trc_MM_MSSFlat_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocationRequestFailed size %zu exit %zu result %p"

TraceEntry=Trc_MM_MSSGenerational_allocate_entry Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocate type %s size %zu subspace this %llx/%s base %llx prev %llx shouldCollectOnFailure %zu"
TraceEvent=Trc_MM_MSSGenerational_allocate Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocate type %s size %zu prev != new %llx, allocate from old %llx"
TraceExit=Trc_MM_MSSGenerational_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocate type %s size %zu exit %zu result %llx"
TraceEntry=Trc_MM_MSSGenerational_allocate_entry Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocate type %s size %zu subspace this %p/%s base %p prev %p shouldCollectOnFailure %zu"
TraceEvent=Trc_MM_MSSGenerational_allocate Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocate type %s size %zu prev != new %p, allocate from old %p"
TraceExit=Trc_MM_MSSGenerational_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocate type %s size %zu exit %zu result %p"

TraceEntry=Trc_MM_MSSGenerational_allocationRequestFailed_entry Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu subspace this %llx/%s base %llx prev %llx allocationType %zu"
TraceEvent=Trc_MM_MSSGenerational_allocationRequestFailed1 Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu prev != new %llx, allocate from old %llx"
TraceEntry=Trc_MM_MSSGenerational_allocationRequestFailed_entry Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu subspace this %p/%s base %p prev %p allocationType %zu"
TraceEvent=Trc_MM_MSSGenerational_allocationRequestFailed1 Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu prev != new %p, allocate from old %p"
TraceEvent=Trc_MM_MSSGenerational_allocationRequestFailed Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu event %u"
TraceExit=Trc_MM_MSSGenerational_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu exit %zu result %llx"
TraceExit=Trc_MM_MSSGenerational_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu exit %zu result %p"

TraceEvent=Trc_MM_LOAResize_initialize Overhead=1 Level=1 Group=loaresize Template="LOA Initialize: SOA subpool %p LOA subpool %p"
TraceEvent=Trc_MM_LOAResize_resizeLOA1 Overhead=1 Level=1 Group=loaresize Template="post GC resize LOA: newLOAsize %zu"
Expand Down

0 comments on commit de2d500

Please sign in to comment.