ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 21:17:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-6373: Write the object into the write exit event instead of null (#4320) (#7033)

Browse Source 
Co-authored-by: Ryan Fowler <fowlerrr@users.noreply.github.com>
This commit is contained in:
Adel El-Beik 2022-01-19 15:58:51 +00:00 committed by GitHub
parent 2d2289b3bf
commit bb55d93915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/checkpoint-agent/src/main/kotlin/net/corda/tools/CheckpointAgent.kt
View File

@ -306,8 +306,9 @@ object CheckpointHook : ClassFileTransformer {
(input.total() >= minimumSize) && (input.total() >= minimumSize) &&
(input.total() <= maximumSize))) { (input.total() <= maximumSize))) {
val sb = StringBuilder() val sb = StringBuilder()
if (checkpointId != null) if (checkpointId != null) {
sb.append("Checkpoint id: $checkpointId\n") sb.append("Checkpoint id: $checkpointId\n")
}
prettyStatsTree(0, StatsInfo("", Any::class.java), readTree(list, 0).second, sb) prettyStatsTree(0, StatsInfo("", Any::class.java), readTree(list, 0).second, sb)
log.info("[READ] $clazz\n$sb") log.info("[READ] $clazz\n$sb")
@ -329,7 +330,7 @@ object CheckpointHook : ClassFileTransformer {
@JvmStatic @JvmStatic
fun writeExit(output: Output, obj: Any) { fun writeExit(output: Output, obj: Any) {
val (list, count) = events[-Strand.currentStrand().id]!! val (list, count) = events[-Strand.currentStrand().id]!!
list.add(StatsEvent.Exit(obj.javaClass.name, output.total(), null)) list.add(StatsEvent.Exit(obj.javaClass.name, output.total(), obj))
log.debug { "writeExit: clazz[${obj.javaClass.name}], strandId[${Strand.currentStrand().id}], eventCount[$count]" } log.debug { "writeExit: clazz[${obj.javaClass.name}], strandId[${Strand.currentStrand().id}], eventCount[$count]" }
if (count.decrementAndGet() == 0) { if (count.decrementAndGet() == 0) {
// always log diagnostics for explicit checkpoint ids (eg. set dumpCheckpoints) // always log diagnostics for explicit checkpoint ids (eg. set dumpCheckpoints)
@ -338,6 +339,9 @@ object CheckpointHook : ClassFileTransformer {
(output.total() >= minimumSize) && (output.total() >= minimumSize) &&
(output.total() <= maximumSize))) { (output.total() <= maximumSize))) {
val sb = StringBuilder() val sb = StringBuilder()
if (checkpointId != null) {
sb.append("Checkpoint id: $checkpointId\n")
}
prettyStatsTree(0, StatsInfo("", Any::class.java), readTree(list, 0).second, sb) prettyStatsTree(0, StatsInfo("", Any::class.java), readTree(list, 0).second, sb)
log.info("[WRITE] $obj\n$sb") log.info("[WRITE] $obj\n$sb")
checkpointId = null checkpointId = null
@ -433,7 +437,7 @@ fun readTree(events: List<StatsEvent>, index: Int, idMap: IdentityHashMap<Any, I
if (idMap.containsKey(exit.value)) { if (idMap.containsKey(exit.value)) {
val identityInfo = idMap[exit.value]!! val identityInfo = idMap[exit.value]!!
idMap[exit.value] = IdentityInfo(identityInfo.tree, identityInfo.refCount + 1) idMap[exit.value] = IdentityInfo(identityInfo.tree, identityInfo.refCount + 1)
log.debug { "Skipping repeated StatsEvent.Enter: ${exit.value} (hashcode:${exit.value!!.hashCode()}) (count:${idMap[exit.value]?.refCount})" } log.debug { "Skipping repeated StatsEvent.Enter: ${exit.value} (hashcode:${exit.value?.hashCode()}) (count:${idMap[exit.value]?.refCount})" }
} else idMap[exit.value] = IdentityInfo(tree, 1) } else idMap[exit.value] = IdentityInfo(tree, 1)
return Pair(nextIndex + 1, idMap[exit.value]!!) return Pair(nextIndex + 1, idMap[exit.value]!!)
} }