Skip to content

Try to fix memory leak in CgComponents #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EgorkaKulikov merged 4 commits into from
Oct 4, 2022
Merged

Try to fix memory leak in CgComponents #1057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a840197
Try to fix memory leak in CgFieldStateManager
EgorkaKulikov Oct 3, 2022
eac6370
Removed unused testClassConstructors
EgorkaKulikov Oct 3, 2022
9442d38
Make CgContext much more thin
EgorkaKulikov Oct 3, 2022
7b2c466
Clear content related maps before the processing of new test class
EgorkaKulikov Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Clear content related maps before the processing of new test class
  • Loading branch information
@EgorkaKulikov
EgorkaKulikov committed Oct 4, 2022
commit 7b2c46662470d92391f521c09a8a94b61779d9f4
7 changes: 4 additions & 3 deletions ...main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import org.utbot.framework.codegen.model.constructor.builtin.setAccessible
import org.utbot.framework.codegen.model.constructor.context.CgContext
import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
import org.utbot.framework.codegen.model.constructor.tree.CgCallableAccessManagerImpl.FieldAccessorSuitability.*
import org.utbot.framework.codegen.model.constructor.util.CgComponents
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getStatementConstructorBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getVariableConstructorBy
import org.utbot.framework.codegen.model.constructor.util.getAmbiguousOverloadsOf
import org.utbot.framework.codegen.model.constructor.util.importIfNeeded
import org.utbot.framework.codegen.model.constructor.util.isUtil
Expand Down Expand Up @@ -85,9 +86,9 @@ interface CgCallableAccessManager {
internal class CgCallableAccessManagerImpl(val context: CgContext) : CgCallableAccessManager,
CgContextOwner by context {

private val statementConstructor by lazy { CgComponents.getStatementConstructorBy(context) }
private val statementConstructor by lazy { getStatementConstructorBy(context) }

private val variableConstructor by lazy { CgComponents.getVariableConstructorBy(context) }
private val variableConstructor by lazy { getVariableConstructorBy(context) }

override operator fun CgExpression?.get(methodId: MethodId): CgIncompleteMethodCall =
CgIncompleteMethodCall(methodId, this)
Expand Down
7 changes: 4 additions & 3 deletions ...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgFieldStateManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import org.utbot.framework.codegen.model.constructor.builtin.forName
import org.utbot.framework.codegen.model.constructor.builtin.getArrayElement
import org.utbot.framework.codegen.model.constructor.context.CgContext
import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
import org.utbot.framework.codegen.model.constructor.util.CgComponents
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getCallableAccessManagerBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getStatementConstructorBy
import org.utbot.framework.codegen.model.constructor.util.CgFieldState
import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
import org.utbot.framework.codegen.model.constructor.util.FieldStateCache
Expand Down Expand Up @@ -44,8 +45,8 @@ internal interface CgFieldStateManager {
internal class CgFieldStateManagerImpl(val context: CgContext)
: CgContextOwner by context,
CgFieldStateManager,
CgCallableAccessManager by CgComponents.getCallableAccessManagerBy(context),
CgStatementConstructor by CgComponents.getStatementConstructorBy(context) {
CgCallableAccessManager by getCallableAccessManagerBy(context),
CgStatementConstructor by getStatementConstructorBy(context) {

override fun rememberInitialEnvironmentState(info: StateModificationInfo) {
rememberThisInstanceState(info, FieldState.INITIAL)
Expand Down
19 changes: 12 additions & 7 deletions ...src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@ import org.utbot.framework.codegen.model.constructor.builtin.invoke
import org.utbot.framework.codegen.model.constructor.builtin.newInstance
import org.utbot.framework.codegen.model.constructor.context.CgContext
import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
import org.utbot.framework.codegen.model.constructor.util.CgComponents
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getCallableAccessManagerBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getMockFrameworkManagerBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getNameGeneratorBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getStatementConstructorBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getTestFrameworkManagerBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getVariableConstructorBy
import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
import org.utbot.framework.codegen.model.constructor.util.EnvironmentFieldStateCache
import org.utbot.framework.codegen.model.constructor.util.FieldStateCache
Expand Down Expand Up @@ -148,14 +153,14 @@ import java.lang.reflect.ParameterizedType
private const val DEEP_EQUALS_MAX_DEPTH = 5 // TODO move it to plugin settings?

internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by context,
CgCallableAccessManager by CgComponents.getCallableAccessManagerBy(context),
CgStatementConstructor by CgComponents.getStatementConstructorBy(context) {
CgCallableAccessManager by getCallableAccessManagerBy(context),
CgStatementConstructor by getStatementConstructorBy(context) {

private val nameGenerator = CgComponents.getNameGeneratorBy(context)
private val testFrameworkManager = CgComponents.getTestFrameworkManagerBy(context)
private val nameGenerator = getNameGeneratorBy(context)
private val testFrameworkManager = getTestFrameworkManagerBy(context)

private val variableConstructor = CgComponents.getVariableConstructorBy(context)
private val mockFrameworkManager = CgComponents.getMockFrameworkManagerBy(context)
private val variableConstructor = getVariableConstructorBy(context)
private val mockFrameworkManager = getMockFrameworkManagerBy(context)

private val floatDelta: Float = 1e-6f
private val doubleDelta = 1e-6
Expand Down
165 changes: 57 additions & 108 deletions .../main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
package org.utbot.framework.codegen.model.constructor.tree

import org.utbot.common.appendHtmlLine
import org.utbot.framework.codegen.Junit4
import org.utbot.framework.codegen.Junit5
import org.utbot.framework.codegen.ParametrizedTestSource
import org.utbot.framework.codegen.TestNg
import org.utbot.framework.codegen.model.constructor.CgMethodTestSet
import org.utbot.framework.codegen.model.constructor.TestClassModel
import org.utbot.framework.codegen.model.constructor.builtin.TestClassUtilMethodProvider
import org.utbot.framework.codegen.model.constructor.context.CgContext
import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
import org.utbot.framework.codegen.model.constructor.util.CgComponents
import org.utbot.framework.codegen.model.constructor.name.CgNameGenerator
import org.utbot.framework.codegen.model.constructor.name.CgNameGeneratorImpl
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.clearContextRelatedStorage
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getMethodConstructorBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getNameGeneratorBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getStatementConstructorBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getTestFrameworkManagerBy
import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
import org.utbot.framework.codegen.model.tree.CgMethod
import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructorImpl
import org.utbot.framework.codegen.model.tree.CgAuxiliaryClass
import org.utbot.framework.codegen.model.tree.CgExecutableUnderTestCluster
import org.utbot.framework.codegen.model.tree.CgMethod
import org.utbot.framework.codegen.model.tree.CgParameterDeclaration
import org.utbot.framework.codegen.model.tree.CgRegion
import org.utbot.framework.codegen.model.tree.CgSimpleRegion
Expand All @@ -18,33 +29,32 @@ import org.utbot.framework.codegen.model.tree.CgTestClass
import org.utbot.framework.codegen.model.tree.CgTestClassFile
import org.utbot.framework.codegen.model.tree.CgTestMethod
import org.utbot.framework.codegen.model.tree.CgTestMethodCluster
import org.utbot.framework.codegen.model.tree.CgTestMethodType.*
import org.utbot.framework.codegen.model.tree.CgTripleSlashMultilineComment
import org.utbot.framework.codegen.model.tree.CgUtilEntity
import org.utbot.framework.codegen.model.tree.CgUtilMethod
import org.utbot.framework.codegen.model.tree.buildTestClass
import org.utbot.framework.codegen.model.tree.buildTestClassBody
import org.utbot.framework.codegen.model.tree.buildTestClassFile
import org.utbot.framework.codegen.model.visitor.importUtilMethodDependencies
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.MethodId
import org.utbot.framework.plugin.api.UtMethodTestSet
import org.utbot.framework.codegen.model.constructor.TestClassModel
import org.utbot.framework.codegen.model.tree.CgAuxiliaryClass
import org.utbot.framework.codegen.model.tree.CgUtilEntity
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.UtExecutionSuccess
import org.utbot.framework.plugin.api.UtMethodTestSet
import org.utbot.framework.plugin.api.util.description
import org.utbot.framework.plugin.api.util.humanReadableName
import org.utbot.framework.plugin.api.util.kClass
import kotlin.reflect.KClass

internal class CgTestClassConstructor(val context: CgContext) :
CgContextOwner by context,
CgStatementConstructor by CgComponents.getStatementConstructorBy(context) {
CgStatementConstructor by getStatementConstructorBy(context) {

init {
clearContextRelatedStorage()
}

private val methodConstructor = CgComponents.getMethodConstructorBy(context)
private val nameGenerator = CgComponents.getNameGeneratorBy(context)
private val testFrameworkManager = CgComponents.getTestFrameworkManagerBy(context)
private val methodConstructor = getMethodConstructorBy(context)
private val nameGenerator = getNameGeneratorBy(context)
private val testFrameworkManager = getTestFrameworkManagerBy(context)

private val testsGenerationReport: TestsGenerationReport = TestsGenerationReport()

Expand Down Expand Up @@ -279,106 +289,45 @@ internal class CgTestClassConstructor(val context: CgContext) :
*/
private val CgMethodTestSet.allErrors: Map<String, Int>
get() = errors + codeGenerationErrors.getOrDefault(this, mapOf())
}

typealias MethodGeneratedTests = MutableMap<ExecutableId, MutableSet<CgTestMethod>>
typealias ErrorsCount = Map<String, Int>

data class TestsGenerationReport(
val executables: MutableSet<ExecutableId> = mutableSetOf(),
var successfulExecutions: MethodGeneratedTests = mutableMapOf(),
var timeoutExecutions: MethodGeneratedTests = mutableMapOf(),
var failedExecutions: MethodGeneratedTests = mutableMapOf(),
var crashExecutions: MethodGeneratedTests = mutableMapOf(),
var errors: MutableMap<ExecutableId, ErrorsCount> = mutableMapOf()
) {
val classUnderTest: KClass<*>
get() = executables.firstOrNull()?.classId?.kClass
?: error("No executables found in test report")

val initialWarnings: MutableList<() -> String> = mutableListOf()
val hasWarnings: Boolean
get() = initialWarnings.isNotEmpty()

val detailedStatistics: String
get() = buildString {
appendHtmlLine("Class: ${classUnderTest.qualifiedName}")
val testMethodsStatistic = executables.map { it.countTestMethods() }
val errors = executables.map { it.countErrors() }
val overallErrors = errors.sum()

appendHtmlLine("Successful test methods: ${testMethodsStatistic.sumBy { it.successful }}")
appendHtmlLine(
"Failing because of unexpected exception test methods: ${testMethodsStatistic.sumBy { it.failing }}"
)
appendHtmlLine(
"Failing because of exceeding timeout test methods: ${testMethodsStatistic.sumBy { it.timeout }}"
)
appendHtmlLine(
"Failing because of possible JVM crash test methods: ${testMethodsStatistic.sumBy { it.crashes }}"
)
appendHtmlLine("Not generated because of internal errors test methods: $overallErrors")
internal object CgComponents {
/**
* Clears all stored data for current [CgContext].
* As far as context is created per class under test,
* no related data is required after it's processing.
*/
fun clearContextRelatedStorage() {
nameGenerators.clear()
statementConstructors.clear()
callableAccessManagers.clear()
testFrameworkManagers.clear()
mockFrameworkManagers.clear()
variableConstructors.clear()
methodConstructors.clear()
}

fun addMethodErrors(testSet: CgMethodTestSet, errors: Map<String, Int>) {
this.errors[testSet.executableId] = errors
}

fun addTestsByType(testSet: CgMethodTestSet, testMethods: List<CgTestMethod>) {
with(testSet.executableId) {
executables += this

testMethods.forEach {
when (it.type) {
SUCCESSFUL -> updateExecutions(it, successfulExecutions)
FAILING -> updateExecutions(it, failedExecutions)
TIMEOUT -> updateExecutions(it, timeoutExecutions)
CRASH -> updateExecutions(it, crashExecutions)
PARAMETRIZED -> {
// Parametrized tests are not supported in the tests report yet
// TODO JIRA:1507
}
}
}
}
}

fun toString(isShort: Boolean): String = buildString {
appendHtmlLine("Target: ${classUnderTest.qualifiedName}")
if (initialWarnings.isNotEmpty()) {
initialWarnings.forEach { appendHtmlLine(it()) }
appendHtmlLine()
}
private val nameGenerators: MutableMap<CgContext, CgNameGenerator> = mutableMapOf()
private val statementConstructors: MutableMap<CgContext, CgStatementConstructor> = mutableMapOf()
private val callableAccessManagers: MutableMap<CgContext, CgCallableAccessManager> = mutableMapOf()
private val testFrameworkManagers: MutableMap<CgContext, TestFrameworkManager> = mutableMapOf()
private val mockFrameworkManagers: MutableMap<CgContext, MockFrameworkManager> = mutableMapOf()

val testMethodsStatistic = executables.map { it.countTestMethods() }
val overallTestMethods = testMethodsStatistic.sumBy { it.count }
private val variableConstructors: MutableMap<CgContext, CgVariableConstructor> = mutableMapOf()
private val methodConstructors: MutableMap<CgContext, CgMethodConstructor> = mutableMapOf()

appendHtmlLine("Overall test methods: $overallTestMethods")
fun getNameGeneratorBy(context: CgContext) = nameGenerators.getOrPut(context) { CgNameGeneratorImpl(context) }
fun getCallableAccessManagerBy(context: CgContext) = callableAccessManagers.getOrPut(context) { CgCallableAccessManagerImpl(context) }
fun getStatementConstructorBy(context: CgContext) = statementConstructors.getOrPut(context) { CgStatementConstructorImpl(context) }

if (!isShort) {
appendHtmlLine(detailedStatistics)
fun getTestFrameworkManagerBy(context: CgContext) = when (context.testFramework) {
is Junit4 -> testFrameworkManagers.getOrPut(context) { Junit4Manager(context) }
is Junit5 -> testFrameworkManagers.getOrPut(context) { Junit5Manager(context) }
is TestNg -> testFrameworkManagers.getOrPut(context) { TestNgManager(context) }
}
}

override fun toString(): String = toString(false)

private fun ExecutableId.countTestMethods(): TestMethodStatistic = TestMethodStatistic(
testMethodsNumber(successfulExecutions),
testMethodsNumber(failedExecutions),
testMethodsNumber(timeoutExecutions),
testMethodsNumber(crashExecutions)
)

private fun ExecutableId.countErrors(): Int = errors.getOrDefault(this, emptyMap()).values.sum()

private fun ExecutableId.testMethodsNumber(executables: MethodGeneratedTests): Int =
executables.getOrDefault(this, emptySet()).size

private fun ExecutableId.updateExecutions(it: CgTestMethod, executions: MethodGeneratedTests) {
executions.getOrPut(this) { mutableSetOf() } += it
}

private data class TestMethodStatistic(val successful: Int, val failing: Int, val timeout: Int, val crashes: Int) {
val count: Int = successful + failing + timeout + crashes
fun getMockFrameworkManagerBy(context: CgContext) = mockFrameworkManagers.getOrPut(context) { MockFrameworkManager(context) }
fun getVariableConstructorBy(context: CgContext) = variableConstructors.getOrPut(context) { CgVariableConstructor(context) }
fun getMethodConstructorBy(context: CgContext) = methodConstructors.getOrPut(context) { CgMethodConstructor(context) }
}
}

13 changes: 8 additions & 5 deletions ...c/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgVariableConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import org.utbot.framework.codegen.model.constructor.builtin.forName
import org.utbot.framework.codegen.model.constructor.builtin.setArrayElement
import org.utbot.framework.codegen.model.constructor.context.CgContext
import org.utbot.framework.codegen.model.constructor.context.CgContextOwner
import org.utbot.framework.codegen.model.constructor.util.CgComponents
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getCallableAccessManagerBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getMockFrameworkManagerBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getNameGeneratorBy
import org.utbot.framework.codegen.model.constructor.tree.CgTestClassConstructor.CgComponents.getStatementConstructorBy
import org.utbot.framework.codegen.model.constructor.util.CgStatementConstructor
import org.utbot.framework.codegen.model.constructor.util.MAX_ARRAY_INITIALIZER_SIZE
import org.utbot.framework.codegen.model.constructor.util.arrayInitializer
Expand Down Expand Up @@ -73,11 +76,11 @@ import org.utbot.framework.plugin.api.util.wrapperByPrimitive
@Suppress("unused")
internal class CgVariableConstructor(val context: CgContext) :
CgContextOwner by context,
CgCallableAccessManager by CgComponents.getCallableAccessManagerBy(context),
CgStatementConstructor by CgComponents.getStatementConstructorBy(context) {
CgCallableAccessManager by getCallableAccessManagerBy(context),
CgStatementConstructor by getStatementConstructorBy(context) {

private val nameGenerator = CgComponents.getNameGeneratorBy(context)
private val mockFrameworkManager = CgComponents.getMockFrameworkManagerBy(context)
private val nameGenerator = getNameGeneratorBy(context)
private val mockFrameworkManager = getMockFrameworkManagerBy(context)

/**
* Take already created CgValue or construct either a new [CgVariable] or new [CgLiteral] for the given model.
Expand Down
Loading