Skip to content

Add way to get instrumentation result #2457

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

Open
egiptipavel wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Add way to get instrumentation result #2457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
03b36a8
Add way to get instrumentation result
egiptipavel Jul 28, 2023
f288f18
Move method getResultOfInstrumentation in SpringUtExecutionInstrument…
egiptipavel Jul 28, 2023
21865a5
Refactor imports
egiptipavel Jul 31, 2023
2a4ea7b
Delete lines for debug
egiptipavel Jul 31, 2023
1dfb8e6
Refactor
egiptipavel Aug 3, 2023
c62b204
Merge branch 'main' into egiptipavel/getting-instrumentation-result
egiptipavel Aug 4, 2023
9c61a34
Fix bug
egiptipavel Aug 11, 2023
90856ad
Merge branch 'main' into egiptipavel/getting-instrumentation-result
egiptipavel Aug 30, 2023
9970171
Implement getResultOfInstrumentation method in RemovingConstructFails…
egiptipavel Aug 30, 2023
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
Next Next commit
Refactor imports
  • Loading branch information
@egiptipavel
egiptipavel committed Jul 31, 2023
commit 21865a5103ec82aef2b0265157be55b9025358b7
21 changes: 13 additions & 8 deletions utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/ConcreteExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import mu.KotlinLogging
import org.utbot.framework.plugin.api.InstrumentedProcessDeathException
import org.utbot.common.logException
import org.utbot.framework.plugin.api.*
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.FieldId
import org.utbot.framework.plugin.api.ConcreteContextLoadingResult
import org.utbot.framework.plugin.api.SpringRepositoryId
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.util.UtContext
import org.utbot.framework.plugin.api.util.signature
import org.utbot.instrumentation.instrumentation.Instrumentation
Expand All @@ -30,7 +35,6 @@ import org.utbot.instrumentation.rd.InstrumentedProcess
import org.utbot.instrumentation.util.InstrumentedProcessError
import org.utbot.rd.generated.synchronizationModel
import org.utbot.rd.loggers.overrideDefaultRdLoggerFactoryWithKLogger
import org.utbot.rd.startBlocking

private val logger = KotlinLogging.logger {}

Expand Down Expand Up @@ -313,10 +317,11 @@ fun <T> ConcreteExecutor<*, *>.computeStaticField(fieldId: FieldId): Result<T> =
}
}

fun ConcreteExecutor<*, *>.getInstrumentationResult(methodUnderTest: ExecutableId): ResultOfInstrumentation = runBlocking {
withProcess {
val params = GetResultOfInstrumentationParams(methodUnderTest.classId.name, methodUnderTest.name)
val result = instrumentedProcessModel.getResultOfInstrumentation.startBlocking(params)
kryoHelper.readObject(result.result)
fun ConcreteExecutor<*, *>.getInstrumentationResult(methodUnderTest: ExecutableId): ResultOfInstrumentation =
runBlocking {
withProcess {
val params = GetResultOfInstrumentationParams(methodUnderTest.classId.name, methodUnderTest.name)
val result = instrumentedProcessModel.getResultOfInstrumentation.startSuspending(lifetime, params)
kryoHelper.readObject(result.result)
}
}
}
13 changes: 6 additions & 7 deletions ...trumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/et/TraceHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ package org.utbot.instrumentation.instrumentation.et

import com.jetbrains.rd.util.error
import com.jetbrains.rd.util.getLogger
import org.objectweb.asm.MethodVisitor
import org.objectweb.asm.Opcodes
import org.objectweb.asm.Type
import org.objectweb.asm.commons.LocalVariablesSorter
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.FieldId
import org.utbot.instrumentation.Settings
import kotlin.reflect.jvm.javaField
import kotlin.reflect.jvm.javaMethod
import org.objectweb.asm.MethodVisitor
import org.objectweb.asm.Opcodes
import org.objectweb.asm.Type
import org.objectweb.asm.commons.LocalVariablesSorter

sealed class InstructionData {
abstract val line: Int
Expand Down Expand Up @@ -94,7 +94,6 @@ class ProcessingStorage {
instructionsData.computeIfAbsent(id) {
val (className, _) = computeClassNameAndLocalId(id)
classToInstructionsCount.merge(className, 1, Long::plus)
// TODO refactor this
if (methodId !in methodIdToInstructionsIds) {
methodIdToInstructionsIds[methodId] = mutableListOf(id)
} else {
Expand All @@ -111,9 +110,9 @@ class ProcessingStorage {
return instructionsData.getValue(id)
}

fun getInstructionsIds(className: String, methodName: String): List<Long> {
fun getInstructionsIds(className: String, methodName: String): List<Long>? {
val methodId = classMethodToId[ClassToMethod(className, methodName)]
return methodIdToInstructionsIds[methodId]!!
return methodIdToInstructionsIds[methodId]
}

companion object {
Expand Down
2 changes: 1 addition & 1 deletion .../kotlin/org/utbot/instrumentation/instrumentation/execution/UtExecutionInstrumentation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data class UtConcreteExecutionResult(
}
}

data class ResultOfInstrumentation(val instructionsIds: List<Long>)
data class ResultOfInstrumentation(val instructionsIds: List<Long>?)

interface UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
override fun invoke(
Expand Down
11 changes: 9 additions & 2 deletions ...trumentation/src/main/kotlin/org/utbot/instrumentation/process/InstrumentedProcessMain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@ import org.utbot.framework.process.kryo.KryoHelper
import org.utbot.instrumentation.agent.Agent
import org.utbot.instrumentation.instrumentation.Instrumentation
import org.utbot.instrumentation.instrumentation.coverage.CoverageInstrumentation
import org.utbot.instrumentation.instrumentation.spring.SpringUtExecutionInstrumentation
import org.utbot.instrumentation.instrumentation.execution.UtExecutionInstrumentation
import org.utbot.instrumentation.instrumentation.execution.constructors.UtModelConstructor
import org.utbot.instrumentation.instrumentation.spring.SpringUtExecutionInstrumentation
import org.utbot.instrumentation.process.generated.*
import org.utbot.instrumentation.process.generated.CollectCoverageResult
import org.utbot.instrumentation.process.generated.GetSpringBeanResult
import org.utbot.instrumentation.process.generated.GetSpringRepositoriesResult
import org.utbot.instrumentation.process.generated.InstrumentedProcessModel
import org.utbot.instrumentation.process.generated.InvokeMethodCommandResult
import org.utbot.instrumentation.process.generated.TryLoadingSpringContextResult
import org.utbot.instrumentation.process.generated.instrumentedProcessModel
import org.utbot.instrumentation.process.generated.GetResultOfInstrumentationResult
import org.utbot.rd.IdleWatchdog
import org.utbot.rd.ClientProtocolBuilder
import org.utbot.rd.RdSettingsContainerFactory
Expand Down