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
Fix bug
  • Loading branch information
@egiptipavel
egiptipavel committed Aug 11, 2023
commit 9c61a346d15d8ea0bae109bd7dd6e1048f326f85
2 changes: 1 addition & 1 deletion 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 @@ -320,7 +320,7 @@ 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 params = GetResultOfInstrumentationParams(methodUnderTest.classId.name, methodUnderTest.signature)
val result = instrumentedProcessModel.getResultOfInstrumentation.startSuspending(lifetime, params)
kryoHelper.readObject(result.result)
}
Expand Down
10 changes: 5 additions & 5 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 @@ -52,7 +52,7 @@ data class PutStaticInstruction(

private data class ClassToMethod(
val className: String,
val methodName: String
val methodSignature: String
)

class ProcessingStorage {
Expand All @@ -77,8 +77,8 @@ class ProcessingStorage {
return classToId[className]!!.toLong() * SHIFT + localId
}

fun addClassMethod(className: String, methodName: String): Int {
val classToMethod = ClassToMethod(className, methodName)
fun addClassMethod(className: String, methodSignature: String): Int {
val classToMethod = ClassToMethod(className, methodSignature)
val id = classMethodToId.getOrPut(classToMethod) { classMethodToId.size }
idToClassMethod.putIfAbsent(id, classToMethod)
return id
Expand Down Expand Up @@ -106,8 +106,8 @@ class ProcessingStorage {
return instructionsData.getValue(id)
}

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

Expand Down
2 changes: 1 addition & 1 deletion ...ntation/src/main/kotlin/org/utbot/instrumentation/instrumentation/et/TraceListStrategy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class TraceListStrategy(
methodVisitor: MethodVisitor
) {
currentMethodSignature = name + descriptor
currentClassMethodId = storage.addClassMethod(className, name)
currentClassMethodId = storage.addClassMethod(className, currentMethodSignature)
}

override fun visitCode(mv: MethodVisitor, lvs: LocalVariablesSorter) {
Expand Down
4 changes: 2 additions & 2 deletions ...n/org/utbot/instrumentation/instrumentation/execution/SimpleUtExecutionInstrumentation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ class SimpleUtExecutionInstrumentation(
}
}

override fun getResultOfInstrumentation(className: String, methodName: String): ResultOfInstrumentation =
ResultOfInstrumentation(traceHandler.processingStorage.getInstructionsIds(className, methodName))
override fun getResultOfInstrumentation(className: String, methodSignature: String): ResultOfInstrumentation =
ResultOfInstrumentation(traceHandler.processingStorage.getInstructionsIds(className, methodSignature))

override fun getStaticField(fieldId: FieldId): Result<UtModel> =
delegateInstrumentation.getStaticField(fieldId).map { value ->
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 @@ -56,7 +56,7 @@ interface UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult
phasesWrapper: PhasesController.(invokeBasePhases: () -> UtConcreteExecutionResult) -> UtConcreteExecutionResult
): UtConcreteExecutionResult

fun getResultOfInstrumentation(className: String, methodName: String): ResultOfInstrumentation
fun getResultOfInstrumentation(className: String, methodSignature: String): ResultOfInstrumentation

interface Factory<out TInstrumentation : UtExecutionInstrumentation> : Instrumentation.Factory<UtConcreteExecutionResult, TInstrumentation> {
override fun create(): TInstrumentation = create(SimpleInstrumentationContext())
Expand Down
4 changes: 2 additions & 2 deletions ...tlin/org/utbot/instrumentation/instrumentation/spring/SpringUtExecutionInstrumentation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ class SpringUtExecutionInstrumentation(
}
}

override fun getResultOfInstrumentation(className: String, methodName: String): ResultOfInstrumentation =
delegateInstrumentation.getResultOfInstrumentation(className, methodName)
override fun getResultOfInstrumentation(className: String, methodSignature: String): ResultOfInstrumentation =
delegateInstrumentation.getResultOfInstrumentation(className, methodSignature)

override fun getStaticField(fieldId: FieldId): Result<*> = delegateInstrumentation.getStaticField(fieldId)

Expand Down
5 changes: 3 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 @@ -155,8 +155,9 @@ private fun InstrumentedProcessModel.setup(kryoHelper: KryoHelper, watchdog: Idl
}
watchdog.measureTimeForActiveCall(getResultOfInstrumentation, "Getting instrumentation result") { params ->
HandlerClassesLoader.loadClass(params.className)
val result = (instrumentation as UtExecutionInstrumentation)
.getResultOfInstrumentation(params.className, params.methodName)
val result = (instrumentation as UtExecutionInstrumentation).getResultOfInstrumentation(
params.className, params.methodSignature
)
GetResultOfInstrumentationResult(kryoHelper.writeObject(result))
}
watchdog.measureTimeForActiveCall(addPaths, "User and dependency classpath setup") { params ->
Expand Down
16 changes: 8 additions & 8 deletions .../main/kotlin/org/utbot/instrumentation/rd/generated/InstrumentedProcessModel.Generated.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class InstrumentedProcessModel private constructor(
}


const val serializationHash = -7487216533584583779L
const val serializationHash = 5470408548487674098L

}
override val serializersOwner: ISerializersOwner get() = InstrumentedProcessModel
Expand Down Expand Up @@ -505,7 +505,7 @@ data class ComputeStaticFieldResult (
*/
data class GetResultOfInstrumentationParams (
val className: String,
val methodName: String
val methodSignature: String
) : IPrintable {
//companion

Expand All @@ -515,13 +515,13 @@ data class GetResultOfInstrumentationParams (
@Suppress("UNCHECKED_CAST")
override fun read(ctx: SerializationCtx, buffer: AbstractBuffer): GetResultOfInstrumentationParams {
val className = buffer.readString()
val methodName = buffer.readString()
return GetResultOfInstrumentationParams(className, methodName)
val methodSignature = buffer.readString()
return GetResultOfInstrumentationParams(className, methodSignature)
}

override fun write(ctx: SerializationCtx, buffer: AbstractBuffer, value: GetResultOfInstrumentationParams) {
buffer.writeString(value.className)
buffer.writeString(value.methodName)
buffer.writeString(value.methodSignature)
}


Expand All @@ -538,23 +538,23 @@ data class GetResultOfInstrumentationParams (
other as GetResultOfInstrumentationParams

if (className != other.className) return false
if (methodName != other.methodName) return false
if (methodSignature != other.methodSignature) return false

return true
}
//hash code trait
override fun hashCode(): Int {
var __r = 0
__r = __r*31 + className.hashCode()
__r = __r*31 + methodName.hashCode()
__r = __r*31 + methodSignature.hashCode()
return __r
}
//pretty print
override fun print(printer: PrettyPrinter) {
printer.println("GetResultOfInstrumentationParams (")
printer.indent {
print("className = "); className.print(printer); println()
print("methodName = "); methodName.print(printer); println()
print("methodSignature = "); methodSignature.print(printer); println()
}
printer.print(")")
}
Expand Down
2 changes: 1 addition & 1 deletion utbot-rd/src/main/rdgen/org/utbot/rd/models/InstrumentedProcessModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object InstrumentedProcessModel : Ext(InstrumentedProcessRoot) {

val GetResultOfInstrumentationParams = structdef {
field("className", PredefinedType.string)
field("methodName", PredefinedType.string)
field("methodSignature", PredefinedType.string)
}

val GetResultOfInstrumentationResult = structdef {
Expand Down