Spin locks detection enhancements #228
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 16 commits
July 29, 2023 01:52
… caused by multiple spin cycle iterations.
…s' into spin-locks-detection-enhancements
added 4 commits
August 3, 2023 00:55
…on-enhancements # Conflicts: # src/jvm/main/org/jetbrains/kotlinx/lincheck/runner/InvocationResult.kt # src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/InterleavingSequenceTrackableSet.kt # src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/ManagedStrategy.kt # src/jvm/main/org/jetbrains/kotlinx/lincheck/strategy/managed/modelchecking/ModelCheckingStrategy.kt # src/jvm/test/org/jetbrains/kotlinx/lincheck_test/representation/SpinlockEventsCutTests.kt # src/jvm/test/resources/expected_logs/switch_in_the_middle_of_spin_cycle_causes_error.txt
ndkoval
requested changes
Aug 18, 2023
| @@ -52,6 +52,7 @@ kotlin { | |||
| api("org.ow2.asm:asm-commons:$asmVersion") | |||
| api("org.ow2.asm:asm-util:$asmVersion") | |||
| api("org.reflections:reflections:$reflectionsVersion") | |||
| api("net.sf.trove4j:trove4j:3.0.3") | |||
There was a problem hiding this comment.
Please repackage it to org.jetbrains.kotlinx.lincheck
|
|
||
| package org.jetbrains.kotlinx.lincheck.strategy.managed; | ||
|
|
||
| public class TrackMethodsFlagHolder { |
|
|
||
| package org.jetbrains.kotlinx.lincheck.strategy.managed; | ||
|
|
||
| public class TrackMethodsFlagHolder { |
There was a problem hiding this comment.
Do you use it only when detecting spin locks?
| @@ -84,7 +84,8 @@ private static boolean doNotTransform(String className) { | |||
| className.equals(kotlinx.coroutines.CoroutineContextKt.class.getName()) || | |||
| className.equals(kotlinx.coroutines.CancellableContinuation.class.getName()) || | |||
| className.equals(kotlinx.coroutines.CoroutineExceptionHandler.class.getName()) || | |||
| className.equals(kotlinx.coroutines.CoroutineDispatcher.class.getName()); | |||
| className.equals(kotlinx.coroutines.CoroutineDispatcher.class.getName()) || | |||
| className.equals(TrackMethodsFlagHolder.class.getName()); | |||
There was a problem hiding this comment.
Similarly to other Lincheck classes, it should not be transformed by default
| @@ -252,6 +260,7 @@ internal class ModelCheckingStrategy( | |||
| } | |||
|
|
|||
| fun rollbackAfterSpinCycleFound() { | |||
| lastNotInitializedNode = initialLastNotInitializedNode | |||
There was a problem hiding this comment.
Is this change related to another bug?
| ): InterleavingHistoryNode { | ||
| check(executions >= executionsBeforeCycle) | ||
| check(executions >= executionsBeforeCycle) { "?" } |
There was a problem hiding this comment.
Please replace "?" with a meaningful message
| @@ -241,7 +256,8 @@ internal class InterleavingSequenceTrackableSet { | |||
| fun mergeBranch(newChain: List<InterleavingHistoryNode>, startIndex: Int, executionsCountedEarlier: Int) { | |||
| if (startIndex > newChain.lastIndex) return | |||
| val firstNewNode = newChain[startIndex] | |||
| val firstNewNodeExecutions = (firstNewNode.executions + firstNewNode.spinCyclePeriod) - executionsCountedEarlier | |||
| val firstNewNodeExecutions = | |||
There was a problem hiding this comment.
Please revert the formatting
| @@ -263,7 +279,8 @@ internal class InterleavingSequenceTrackableSet { | |||
| transitions = transitions, | |||
| cyclePeriod = cyclePeriod, | |||
| cycleOccurred = cycleOccurred, | |||
| cycleLocationsHash = cycleLocationsHash | |||
| cycleLocationsHash = cycleLocationsHash, | |||
| executionsBeforeSpinCycleWithAdditionalEvents = executionsBeforeSpinCycleWithAdditionalEvents | |||
There was a problem hiding this comment.
Shorten the parameter name
| @@ -424,6 +444,8 @@ internal class InterleavingSequenceTrackableSet { | |||
| it.cycleOccurred && executionsCount == it.executions | |||
| } ?: false | |||
|
|
|||
| val executionsBeforeSpinCycleWithAdditionalEvents: Int get() = currentNode!!.executionsBeforeSpinCycleWithAdditionalEvents | |||
| } else CycleInfo( | ||
| minLastPositionNotRelatedToCycle + 1, | ||
| targetCycleLength | ||
| ) // number of prefix elements with first cycle |
There was a problem hiding this comment.
Is the comment in the correct place?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #219 #218 and adds recursive spin-locks support.
Subtasks:
developwithjavaagent2d