Skip to content

Commit

Permalink
Remove println's and comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmitrii-artuhov
dmitrii-artuhov committed Nov 26, 2024
1 parent 22939e7 commit c77bef2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 71 deletions.
7 changes: 2 additions & 5 deletions src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/ManagedStrategy.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ abstract class ManagedStrategy(
}

override fun restoreStaticMemorySnapshot() {
// TODO: what is the appropriate location to call this function?
if (testCfg.restoreStaticMemory) {
staticMemorySnapshot.restoreValues()
super.restoreStaticMemorySnapshot()
Expand Down Expand Up @@ -943,8 +942,7 @@ abstract class ManagedStrategy(
*/
override fun updateSnapshotOnFieldAccess(obj: Any?, className: String, fieldName: String, codeLocation: Int) = runInIgnoredSection {
if (testCfg.restoreStaticMemory) {
val location = CodeLocations.stackTrace(codeLocation).toString()
staticMemorySnapshot.trackField(obj, className, fieldName, location)
staticMemorySnapshot.trackField(obj, className, fieldName)
}
}

Expand All @@ -953,8 +951,7 @@ abstract class ManagedStrategy(
*/
override fun updateSnapshotOnArrayElementAccess(array: Any, index: Int, codeLocation: Int) = runInIgnoredSection {
if (testCfg.restoreStaticMemory) {
val location = CodeLocations.stackTrace(codeLocation).toString()
staticMemorySnapshot.trackArrayCell(array, index, location)
staticMemorySnapshot.trackArrayCell(array, index)
}
}

Expand Down
69 changes: 3 additions & 66 deletions src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/SnapshotTracker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,60 +54,8 @@ class SnapshotTracker {
class ArrayCellNode(descriptor: ArrayCellDescriptor, initialValue: Any?) : MemoryNode(descriptor, initialValue)
}

fun size(): Int = (trackedObjects.keys.filter { it !is Class<*> } + trackedObjects.values.flatMap { it }.mapNotNull { it.initialValue }).toSet().size

// fun printRoots() {
// val rootSizes = mutableMapOf<Any, Int>()
// val mappedFromRoots = mutableMapOf<Any, MutableList<Any>>()
// trackedObjects.keys.filterIsInstance<Class<*>>().forEach { root ->
// var size = 0
// val countedObjs = mutableSetOf<Any>()
// mappedFromRoots[root] = mutableListOf()
//
// trackedObjects[root]!!.forEach nodesTraverse@{ node ->
// if (node.initialValue == null) return@nodesTraverse
//
// mappedFromRoots[root]!!.add(node.initialValue)
// size++
//
// traverseObjectGraph(
// node.initialValue,
// onArrayElement = { _, _, value ->
// if (value in trackedObjects && value !in countedObjs) {
// countedObjs.add(value!!)
// mappedFromRoots[root]!!.add(value)
// size++
// }
// value
// },
// onField = { _, _, value ->
// if (value in trackedObjects && value !in countedObjs) {
// countedObjs.add(value!!)
// mappedFromRoots[root]!!.add(value)
// size++
// }
// value
// }
// )
// }
//
// rootSizes[root] = size
// }
//
// val sizesSorted = rootSizes.entries
// .sortedBy { -it.value } // Sort by values
// .associate { it.key to it.value } // Convert back to a map
// mappedFromRoots.entries
// .sortedBy { -it.value.size }
// .toList()
//
//// println("Snapshot roots (${sizesSorted.size}): $sizesSorted")
// }

@OptIn(ExperimentalStdlibApi::class)
fun trackField(obj: Any?, className: String, fieldName: String, @Suppress("UNUSED_PARAMETER") location: String = "") {
//println("Consider ($location): obj=${obj?.javaClass?.simpleName}${if (obj != null) "@" + System.identityHashCode(obj).toHexString() else ""}, className=$className, fieldName=$fieldName")

fun trackField(obj: Any?, className: String, fieldName: String) {
if (obj != null && obj !in trackedObjects) return

val clazz: Class<*> = Class.forName(className).let {
Expand All @@ -119,8 +67,6 @@ class SnapshotTracker {

if (readResult.isSuccess) {
val fieldValue = readResult.getOrNull()
//println("Consider: value=${fieldValue}")

trackSingleField(obj, clazz, field, fieldValue) {
if (shouldTrackEnergetically(fieldValue)) {
trackHierarchy(fieldValue!!)
Expand All @@ -130,16 +76,13 @@ class SnapshotTracker {
}

@OptIn(ExperimentalStdlibApi::class)
fun trackArrayCell(array: Any, index: Int, @Suppress("UNUSED_PARAMETER") location: String) {
//println("Consider ($location): array=${array.javaClass.simpleName}@${System.identityHashCode(array).toHexString()}, index=$index")
fun trackArrayCell(array: Any, index: Int) {
if (array !in trackedObjects) return

val readResult = runCatching { readArrayElementViaUnsafe(array, index) }

if (readResult.isSuccess) {
val elementValue = readResult.getOrNull()
//println("Consider: element=${elementValue}")

trackSingleArrayCell(array, index, elementValue) {
if (shouldTrackEnergetically(elementValue)) {
trackHierarchy(elementValue!!)
Expand Down Expand Up @@ -206,7 +149,6 @@ class SnapshotTracker {
}

fun restoreValues() {
//println("====== START RESTORING ======")
val visitedObjects = Collections.newSetFromMap(IdentityHashMap<Any, Boolean>())
trackedObjects.keys
.filterIsInstance<Class<*>>()
Expand All @@ -233,7 +175,6 @@ class SnapshotTracker {
.any { it.field.name == field.name } // field is already tracked
) return

//println("SNAPSHOT: obj=${if (obj == null) "null" else obj.javaClass.simpleName + "@" + System.identityHashCode(obj).toHexString()}, className=${clazz.name}, fieldName=${field.name}, value=${fieldValue}")
val childNode = createMemoryNode(
obj,
FieldDescriptor(field, getFieldOffset(field)),
Expand All @@ -256,7 +197,6 @@ class SnapshotTracker {
nodesList.any { it is ArrayCellNode && (it.descriptor as ArrayCellDescriptor).index == index } // this array cell is already tracked
) return

//println("SNAPSHOT: array=${array.javaClass.simpleName}@${System.identityHashCode(array).toHexString()}, index=$index, value=${elementValue}")
val childNode = createMemoryNode(array, ArrayCellDescriptor(index), elementValue)

nodesList.add(childNode)
Expand All @@ -268,7 +208,6 @@ class SnapshotTracker {

@OptIn(ExperimentalStdlibApi::class)
private fun trackHierarchy(obj: Any) {
//println("Track hierarchy for object: ${obj.javaClass.simpleName}@${System.identityHashCode(obj).toHexString()}")
traverseObjectGraph(
obj,
onArrayElement = { array, index, elementValue ->
Expand All @@ -291,21 +230,20 @@ class SnapshotTracker {
return (
// TODO: in further development of snapshot restoring feature this check should be removed
// (and only check for java atomic classes inserted), see https://github.com/JetBrains/lincheck/pull/418#issue-2595977113
// right it is need for collections to be restored properly (because of missing support for `System.arrayCopy()` and other similar methods)
obj.javaClass.name.startsWith("java.util.")
)
}

@OptIn(ExperimentalStdlibApi::class)
private fun restoreValues(obj: Any, visitedObjects: MutableSet<Any>) {
if (obj in visitedObjects) return
//println("RESTORE: obj=${if (obj is Class<*>) obj.simpleName else obj.javaClass.simpleName}@${System.identityHashCode(obj).toHexString()}:")
visitedObjects.add(obj)

trackedObjects[obj]!!
.forEach { node ->
if (node is ArrayCellNode) {
val index = (node.descriptor as ArrayCellDescriptor).index
//println("\tRESTORE: arr=${obj.javaClass.simpleName}@${System.identityHashCode(obj).toHexString()}, index=$index, value=${node.initialValue}")

when (obj) {
// No need to add support for writing to atomicfu array elements,
Expand All @@ -317,7 +255,6 @@ class SnapshotTracker {
}
}
else if (!Modifier.isFinal((node.descriptor as FieldDescriptor).field.modifiers)) {
//println("\tRESTORE: obj=${if (obj is Class<*>) obj.simpleName else obj.javaClass.simpleName}@${System.identityHashCode(obj).toHexString()}, field=${node.descriptor.field.name}, value=${node.initialValue}")
writeField(
if (node is StaticFieldNode) null else obj,
node.descriptor.field,
Expand Down

0 comments on commit c77bef2

Please sign in to comment.