Add minor performance improvements

JetBrains · Dec 12, 2024 · 2fd1a05 · 2fd1a05
1 parent b0d83e0
commit 2fd1a05
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/bootstrap/src/sun/nio/ch/lincheck/Injections.java b/bootstrap/src/sun/nio/ch/lincheck/Injections.java
@@ -319,14 +319,6 @@ public static void afterNewObjectCreation(Object obj) {
         getEventTracker().afterNewObjectCreation(obj);
     }
 
-    public static void updateSnapshotOnFieldAccess(Object obj, String className, String fieldName, int codeLocation) {
-        getEventTracker().updateSnapshotOnFieldAccess(obj, className, fieldName, codeLocation);
-    }
-
-    public static void updateSnapshotOnArrayElementAccess(Object array, int index, int codeLocation) {
-        getEventTracker().updateSnapshotOnArrayElementAccess(array, index, codeLocation);
-    }
-
     /**
      * Called from instrumented code before constructors' invocations,
      * where passed objects are subtypes of the constructor class type.

diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/Strategy.kt b/src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/Strategy.kt
@@ -91,11 +91,6 @@ abstract class Strategy protected constructor(
     override fun close() {
         runner.close()
     }
-
-    /**
-     * Restores recorded values of all memory reachable from static state.
-     */
-    open fun restoreStaticMemorySnapshot() {}
 }
 
 /**

diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/ManagedStrategy.kt b/src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/ManagedStrategy.kt
@@ -932,7 +932,7 @@ abstract class ManagedStrategy(
      * or one this objects which contains it is already stored.
      */
     fun updateSnapshotOnFieldAccess(obj: Any?, className: String, fieldName: String) = runInIgnoredSection {
-        staticMemorySnapshot.trackField(obj, Class.forName(className), fieldName)
+        staticMemorySnapshot.trackField(obj, className, fieldName)
     }
 
     /**

diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/SnapshotTracker.kt b/src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/SnapshotTracker.kt
@@ -50,8 +50,23 @@ class SnapshotTracker {
 
     fun trackField(obj: Any?, accessClass: Class<*>, fieldName: String) {
         if (obj != null && obj !in trackedObjects) return
+        trackFieldImpl(
+            obj = obj,
+            clazz = getDeclaringClass(obj, accessClass, fieldName),
+            fieldName = fieldName
+        )
+    }
+
+    fun trackField(obj: Any?, accessClassName: String, fieldName: String) {
+        if (obj != null && obj !in trackedObjects) return
+        trackFieldImpl(
+            obj = obj,
+            clazz = getDeclaringClass(obj, Class.forName(accessClassName), fieldName),
+            fieldName = fieldName
+        )
+    }
 
-        val clazz: Class<*> = getDeclaringClass(obj, accessClass, fieldName)
+    private fun trackFieldImpl(obj: Any?, clazz: Class<*>, fieldName: String) {
         val field = clazz.findField(fieldName)
         val readResult = readFieldSafely(obj, field)