fix: removing in memory context creation for every event

Author: AlexZangerle

src/main/kotlin/at/ac/uibk/dps/cirrina/Runtime.kt

@@ -32,7 +32,7 @@ constructor(
   @Main main: URI,
   persistentContext: Context?,
   stateMachineFactory: StateMachine.Factory,
-  meterRegistry: MeterRegistry,
+  val meterRegistry: MeterRegistry,
 ) {
   val eventHandler = EventHandler()
   val extent = persistentContext?.let { Extent.of(it) } ?: Extent.of()

src/main/kotlin/at/ac/uibk/dps/cirrina/execution/object/ActionCommand.kt

@@ -2,6 +2,9 @@ package at.ac.uibk.dps.cirrina.execution.`object`
 
 import at.ac.uibk.dps.cirrina.csm.Csml.EventChannel
 import at.ac.uibk.dps.cirrina.execution.service.ServiceImplementationSelector
+import io.micrometer.core.instrument.MeterRegistry
+import io.micrometer.core.instrument.Tag
+import io.micrometer.core.instrument.Tags
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import mu.KotlinLogging
@@ -16,6 +19,7 @@ class ActionExecutor(
   private val selector: ServiceImplementationSelector,
   private val eventHandler: StateMachine.StateMachineEventHandler,
   private val coroutineScope: CoroutineScope,
+  private val meterRegistry: MeterRegistry,
 ) {
   fun execute(action: Action, scope: Scope): List<Action> =
     when (action) {
@@ -26,6 +30,7 @@ class ActionExecutor(
       is TimeoutAction -> listOf(action.triggers)
       is TimeoutResetAction -> emptyList()
       is LogAction -> executeLog(action, scope)
+      is IncrCtrAction -> executeIncrCtr(action, scope)
       else -> error("unknown action type: ${action::class.simpleName}")
     }
 
@@ -84,4 +89,13 @@ class ActionExecutor(
     action.message.execute(scope.extent).toString().also { logger.info(it) }
     return emptyList()
   }
+
+  private fun executeIncrCtr(action: IncrCtrAction, scope: Scope): List<Action> {
+    val tags =
+      Tags.of(
+        action.tag.map { (key, value) -> Tag.of(key, value.execute(scope.extent).toString()) }
+      )
+    meterRegistry.counter(action.counter, tags).increment(action.by.toDouble())
+    return emptyList()
+  }
 }

src/main/kotlin/at/ac/uibk/dps/cirrina/execution/object/Extent.kt

@@ -1,6 +1,10 @@
 package at.ac.uibk.dps.cirrina.execution.`object`
 
-class Extent private constructor(private val contexts: Array<Context>) {
+class Extent
+private constructor(
+  private val contexts: Array<Context>,
+  private val overlay: Map<String, Any?> = emptyMap(),
+) {
   val high: Context? = contexts.lastOrNull()
 
   fun setOrCreate(name: String, value: Any?): Int =
@@ -12,13 +16,16 @@ class Extent private constructor(private val contexts: Array<Context>) {
       ?: error("variable '$name' not found in any context")
 
   fun resolve(name: String): Any =
-    contexts.lastOrNull { it.has(name) }?.get(name)
+    overlay[name]
+      ?: contexts.lastOrNull { it.has(name) }?.get(name)
       ?: error("variable '$name' not found in any context")
 
-  fun has(name: String): Boolean = contexts.any { it.has(name) }
+  fun has(name: String): Boolean = name in overlay || contexts.any { it.has(name) }
 
   fun extend(high: Context): Extent = Extent(contexts + high)
 
+  fun with(overlay: Map<String, Any?>): Extent = Extent(contexts, overlay)
+
   companion object {
     fun empty() = Extent(emptyArray())
 

src/main/kotlin/at/ac/uibk/dps/cirrina/execution/object/StateMachine.kt

@@ -4,7 +4,6 @@ import TimeoutActionManager
 import at.ac.uibk.dps.cirrina.Runtime
 import at.ac.uibk.dps.cirrina.csm.Csml.EventChannel
 import at.ac.uibk.dps.cirrina.execution.`object`.StateMachine.Factory
-import at.ac.uibk.dps.cirrina.execution.provider.ContextInMemory
 import at.ac.uibk.dps.cirrina.spec.Instance
 import at.ac.uibk.dps.cirrina.spec.StateMachine as StateMachineSpec
 import at.ac.uibk.dps.cirrina.spec.Transition as TransitionSpec
@@ -47,7 +46,12 @@ internal constructor(
   private val timeoutActionManager = TimeoutActionManager(coroutineScope)
   private val stateMachineEventHandler = StateMachineEventHandler(runtime.eventHandler)
   private val actionExecutor =
-    ActionExecutor(runtime.selector, stateMachineEventHandler, coroutineScope)
+    ActionExecutor(
+      runtime.selector,
+      stateMachineEventHandler,
+      coroutineScope,
+      runtime.meterRegistry,
+    )
 
   private val stateInstances =
     specification.vertexSet().associate { it.name to stateFactory.create(it, this) }
@@ -140,11 +144,7 @@ internal constructor(
     if (candidates.isEmpty()) return null
 
     val evalExtent =
-      activeState!!
-        .extent
-        .extend(
-          ContextInMemory().apply { event.data.forEach { create(VAR_PREFIX + it.name, it.value) } }
-        )
+      activeState!!.extent.with(event.data.associate { VAR_PREFIX + it.name to it.value })
 
     return trySelect(candidates, evalExtent)?.also {
       event.data.forEach { d -> extent.setOrCreate(VAR_PREFIX + d.name, d.value) }