Skip to content

Commit 840a9ad

Browse files
pshiptonpshipton
authored
Merge pull request #210 from amicic/MSS_trace_v0.46
(0.46) Fix trace format for MemorySubSpace
2 parents 372b65b + 76a1810 commit 840a9ad

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎gc/base/j9mm.tdf

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -868,36 +868,36 @@ TraceEvent=Trc_MM_SchedulingDelegate_estimateTotalFreeMemory Overhead=1 Level=1
868868
TraceEvent=Trc_MM_SchedulingDelegate_calculateKickoffHeadroom Overhead=1 Level=1 Group=reclaim Template="calculateKickoffHeadroom oldHeadroomInBytes=%zu, newHeadroomInBytes=%zu"
869869
TraceExit=Trc_MM_SchedulingDelegate_calculateAutomaticGMPIntermission_1_Exit Overhead=1 Level=1 Group=kickoff Template="MM_SchedulingDelegate_calculateAutomaticGMPIntermission remaining=%zu, kickoffHeadroomInBytes=%zu"
870870

871-
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"
872-
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"
873-
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"
874-
TraceExit=Trc_MM_MSSGeneric_allocate_exit Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu subspace %llx result %llx"
871+
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"
872+
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"
873+
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"
874+
TraceExit=Trc_MM_MSSGeneric_allocate_exit Overhead=1 Level=3 Group=allocate Template="MSSGeneric::allocate type %s size %zu subspace %p result %p"
875875

876-
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"
876+
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"
877877
TraceEvent=Trc_MM_MSSSS_allocate Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu event %u"
878878
TraceEvent=Trc_MM_MSSSS_allocate4 Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu event 4 shouldClimb %zu"
879-
TraceExit=Trc_MM_MSSSS_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu result %llx"
879+
TraceExit=Trc_MM_MSSSS_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSSS::allocate type %s size %zu result %p"
880880

881-
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"
881+
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"
882882
TraceEvent=Trc_MM_MSSSS_allocationRequestFailed Overhead=1 Level=1 Group=allocate Template="MSSSS::allocationRequestFailed size %zu event %u"
883-
TraceExit=Trc_MM_MSSSS_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSSS::allocationRequestFailed size %zu exit %zu result %llx"
883+
TraceExit=Trc_MM_MSSSS_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSSS::allocationRequestFailed size %zu exit %zu result %p"
884884

885-
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"
885+
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"
886886
TraceEvent=Trc_MM_MSSFlat_allocate Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocate type %s size %zu event %u"
887-
TraceExit=Trc_MM_MSSFlat_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocate type %s size %zu result %llx"
887+
TraceExit=Trc_MM_MSSFlat_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocate type %s size %zu result %p"
888888

889-
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"
889+
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"
890890
TraceEvent=Trc_MM_MSSFlat_allocationRequestFailed Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocationRequestFailed size %zu event %u"
891-
TraceExit=Trc_MM_MSSFlat_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocationRequestFailed size %zu exit %zu result %llx"
891+
TraceExit=Trc_MM_MSSFlat_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSFlat::allocationRequestFailed size %zu exit %zu result %p"
892892

893-
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"
894-
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"
895-
TraceExit=Trc_MM_MSSGenerational_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocate type %s size %zu exit %zu result %llx"
893+
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"
894+
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"
895+
TraceExit=Trc_MM_MSSGenerational_allocate_exit Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocate type %s size %zu exit %zu result %p"
896896

897-
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"
898-
TraceEvent=Trc_MM_MSSGenerational_allocationRequestFailed1 Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu prev != new %llx, allocate from old %llx"
897+
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"
898+
TraceEvent=Trc_MM_MSSGenerational_allocationRequestFailed1 Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu prev != new %p, allocate from old %p"
899899
TraceEvent=Trc_MM_MSSGenerational_allocationRequestFailed Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu event %u"
900-
TraceExit=Trc_MM_MSSGenerational_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu exit %zu result %llx"
900+
TraceExit=Trc_MM_MSSGenerational_allocationRequestFailed_exit Overhead=1 Level=1 Group=allocate Template="MSSGenerational::allocationRequestFailed size %zu exit %zu result %p"
901901

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

0 commit comments

Comments
 (0)