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
Next Next commit
Try to fix memory leak in CgFieldStateManager
  • Loading branch information
@EgorkaKulikov
EgorkaKulikov committed Oct 4, 2022
commit a8401979d2bddc8bcc41c1f1312f20111952821d
6 changes: 3 additions & 3 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 @@ -148,7 +148,6 @@ 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,
CgFieldStateManager by CgComponents.getFieldStateManagerBy(context),
CgCallableAccessManager by CgComponents.getCallableAccessManagerBy(context),
CgStatementConstructor by CgComponents.getStatementConstructorBy(context) {

Expand Down Expand Up @@ -1275,6 +1274,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
rememberInitialStaticFields(statics)
val stateAnalyzer = ExecutionStateAnalyzer(execution)
val modificationInfo = stateAnalyzer.findModifiedFields()
val fieldStateManager = CgFieldStateManagerImpl(context)
// TODO: move such methods to another class and leave only 2 public methods: remember initial and final states
val mainBody = {
substituteStaticFields(statics)
Expand All @@ -1288,10 +1288,10 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
val name = paramNames[executableId]?.get(index)
methodArguments += variableConstructor.getOrCreateVariable(param, name)
}
rememberInitialEnvironmentState(modificationInfo)
fieldStateManager.rememberInitialEnvironmentState(modificationInfo)
recordActualResult()
generateResultAssertions()
rememberFinalEnvironmentState(modificationInfo)
fieldStateManager.rememberFinalEnvironmentState(modificationInfo)
generateFieldStateAssertions()
}

Expand Down
7 changes: 1 addition & 6 deletions ...mework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/CgComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ internal object CgComponents {
is TestNg -> testFrameworkManagers.getOrPut(context) { TestNgManager(context) }
}

fun getMockFrameworkManagerBy(context: CgContext) =
mockFrameworkManagers.getOrPut(context) { MockFrameworkManager(context) }

fun getFieldStateManagerBy(context: CgContext) =
fieldStateManagers.getOrPut(context) { CgFieldStateManagerImpl(context) }
fun getMockFrameworkManagerBy(context: CgContext) = mockFrameworkManagers.getOrPut(context) { MockFrameworkManager(context) }

fun getVariableConstructorBy(context: CgContext) = variableConstructors.getOrPut(context) { CgVariableConstructor(context) }

Expand All @@ -51,7 +47,6 @@ internal object CgComponents {
private val callableAccessManagers: MutableMap<CgContext, CgCallableAccessManager> = mutableMapOf()
private val testFrameworkManagers: MutableMap<CgContext, TestFrameworkManager> = mutableMapOf()
private val mockFrameworkManagers: MutableMap<CgContext, MockFrameworkManager> = mutableMapOf()
private val fieldStateManagers: MutableMap<CgContext, CgFieldStateManager> = mutableMapOf()

private val variableConstructors: MutableMap<CgContext, CgVariableConstructor> = mutableMapOf()
private val methodConstructors: MutableMap<CgContext, CgMethodConstructor> = mutableMapOf()
Expand Down