Skip to content

Commit 104b26a

Browse files
committed
[utbot-rd]
simple fixes
1 parent fb4b6a3 commit 104b26a

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

utbot-framework-api/src/main/kotlin/org/utbot/framework/UtSettings.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ object UtSettings : AbstractSettings(
264264
*
265265
* False by default (for saving disk space).
266266
*/
267-
var logConcreteExecutionErrors by getBooleanProperty(true)
267+
var logConcreteExecutionErrors by getBooleanProperty(false)
268268

269269
/**
270270
* Number of branch instructions using for clustering executions in the test minimization phase.

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/process/EngineProcess.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ class EngineProcess(val lifetime:Lifetime) {
6161
<Configuration>
6262
<Appenders>
6363
<Console name="Console" target="SYSTEM_OUT">
64-
<ThresholdFilter level="TRACE" onMatch="NEUTRAL" onMismatch="DENY"/>
64+
<ThresholdFilter level="DEBUG" onMatch="NEUTRAL" onMismatch="DENY"/>
6565
<PatternLayout pattern="%d{HH:mm:ss.SSS} | %-5level | %c{1} | %msg%n"/>
6666
</Console>
6767
</Appenders>
6868
<Loggers>
69-
<Root level="trace">
69+
<Root level="debug">
7070
<AppenderRef ref="Console"/>
7171
</Root>
7272
</Loggers>
@@ -93,7 +93,7 @@ class EngineProcess(val lifetime:Lifetime) {
9393
}
9494

9595
addInstantiator(Collections.synchronizedCollection(mutableListOf<SootMethod>()).javaClass) {
96-
Collections.synchronizedCollection(mutableListOf<soot.SootMethod>())
96+
Collections.synchronizedCollection(mutableListOf<SootMethod>())
9797
}
9898
addInstantiator(Collections.synchronizedCollection(mutableListOf<Any>()).javaClass) {
9999
Collections.synchronizedCollection(mutableListOf<Any>())

utbot-rd/src/main/kotlin/org/utbot/rd/ClientProcessUtil.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package org.utbot.rd
22

33
import com.jetbrains.rd.framework.*
4-
import com.jetbrains.rd.framework.base.withId
54
import com.jetbrains.rd.framework.impl.RdCall
6-
import com.jetbrains.rd.framework.impl.RdSignal
75
import com.jetbrains.rd.framework.util.launch
8-
import com.jetbrains.rd.util.*
9-
import com.jetbrains.rd.util.lifetime.*
6+
import com.jetbrains.rd.util.getLogger
7+
import com.jetbrains.rd.util.info
8+
import com.jetbrains.rd.util.lifetime.Lifetime
9+
import com.jetbrains.rd.util.lifetime.LifetimeDefinition
10+
import com.jetbrains.rd.util.lifetime.isAlive
11+
import com.jetbrains.rd.util.lifetime.plusAssign
12+
import com.jetbrains.rd.util.threading.SingleThreadScheduler
13+
import com.jetbrains.rd.util.trace
1014
import kotlinx.coroutines.channels.Channel
1115
import kotlinx.coroutines.runBlocking
1216
import kotlinx.coroutines.withTimeoutOrNull
@@ -19,8 +23,6 @@ const val rdProcessDirName = "rdProcessSync"
1923
val processSyncDirectory = File(utBotTempDirectory.toFile(), rdProcessDirName)
2024
const val rdPortProcessArgumentTag = "rdPort"
2125
internal const val fileWaitTimeoutMillis = 10L
22-
val rdClientProtocolScheduler = UtSingleThreadScheduler("RdServerProtocolScheduler")
23-
val rdServerProtocolScheduler = UtSingleThreadScheduler("RdClientProtocolScheduler")
2426
private val logger = getLogger<ClientProtocolBuilder>()
2527

2628
internal fun childCreatedFileName(port: Int): String {
@@ -124,6 +126,7 @@ class ClientProtocolBuilder {
124126

125127
try {
126128
val name = "Client$port"
129+
val rdClientProtocolScheduler = SingleThreadScheduler(ldef, "Scheduler for $name")
127130
val clientProtocol = Protocol(
128131
name,
129132
Serializers(),

utbot-rd/src/main/kotlin/org/utbot/rd/UtRdUtil.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.jetbrains.rd.util.lifetime.LifetimeDefinition
88
import com.jetbrains.rd.util.lifetime.throwIfNotAlive
99
import com.jetbrains.rd.util.reactive.IScheduler
1010
import com.jetbrains.rd.util.reactive.ISource
11+
import com.jetbrains.rd.util.threading.SingleThreadScheduler
1112
import kotlinx.coroutines.CompletableDeferred
1213
import kotlinx.coroutines.Deferred
1314

@@ -80,6 +81,8 @@ suspend fun startUtProcessWithRdServer(
8081
val port = NetUtils.findFreePort(0)
8182

8283
return factory(port).withRdServer(lifetime) {
84+
val name = "Server$port"
85+
val rdServerProtocolScheduler = SingleThreadScheduler(it, "Scheduler for $name")
8386
Protocol(
8487
"Server",
8588
Serializers(),

0 commit comments

Comments
 (0)