Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package at.ac.uibk.dps.cirrina.execution.`object`
import at.ac.uibk.dps.cirrina.csm.Csml.EventChannel
import at.ac.uibk.dps.cirrina.csm.Csml.EventDescription
import at.ac.uibk.dps.cirrina.util.getInsecureUuid
import kotlin.time.Clock

data class Event(
val topic: String,
Expand All @@ -12,7 +11,7 @@ data class Event(
val target: String = "",
val source: String = "",
val id: String = getInsecureUuid().toString(),
val createdTime: Long = Clock.System.now().epochSeconds,
val emittedTime: Long = 0L,
) {
fun evaluateData(extent: Extent): Event = copy(data = data.map { it.evaluate(extent) })

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ 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.spec.Instance
import at.ac.uibk.dps.cirrina.spec.StateMachine as StateMachineSpec
import com.codahale.metrics.Timer
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import java.util.concurrent.TimeUnit
import kotlin.properties.Delegates
import kotlinx.coroutines.*
import kotlinx.coroutines.channels.Channel
Expand Down Expand Up @@ -78,6 +80,8 @@ internal constructor(

override val extent: Extent

private val eventTimer: Timer = runtime.metricRegistry.timer("event.latency")

init {
val transientContext = Context.from(specification.transient)
val instanceData = Context.from(instance.data).getAll()
Expand Down Expand Up @@ -132,6 +136,8 @@ internal constructor(
private fun processEvent(event: Event) {
if (isTerminated()) return

eventTimer.update((System.nanoTime() - event.emittedTime) / 1_000, TimeUnit.MICROSECONDS)

handleEvent(event)?.let { transition -> step(transition) }

if (event.channel == EventChannel.INTERNAL) stateMachineEventHandler.propagateToNested(event)
Expand Down Expand Up @@ -255,7 +261,8 @@ internal constructor(
override fun toString() = "StateMachine(name='$name')"

inner class StateMachineEventHandler(val eventHandler: EventHandler) {
fun emit(event: Event) = eventHandler.emit(event.copy(source = name))
fun emit(event: Event) =
eventHandler.emit(event.copy(source = name, emittedTime = System.nanoTime()))

fun propagateToParent(event: Event) {
parent?.stateMachineEventHandler?.propagateToParent(event) ?: pushEvent(event)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ object EventExchange {
.setTarget(event.target)
.setSource(event.source)
.setId(event.id)
.setCreatedTime(event.createdTime)
.setEmittedTime(event.emittedTime)

event.data.forEach { variable -> builder.addData(ContextVariableExchange.toProto(variable)) }

Expand Down Expand Up @@ -66,7 +66,7 @@ object EventExchange {
proto.target,
proto.source,
proto.id,
proto.createdTime,
proto.emittedTime,
)
}
}
2 changes: 1 addition & 1 deletion src/main/proto/Event.proto
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ message Event {
string target = 4;
string source = 5;
string id = 6;
int64 createdTime = 7;
int64 emittedTime = 7;
}
2 changes: 1 addition & 1 deletion src/test/kotlin/at/ac/uibk/dps/cirrina/CompleteTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class CompleteTest {
.addData(contextVariable)
.setSource("source")
.setId("someId")
.setCreatedTime(1)
.setEmittedTime(1)
.build()

assertThrows<NullPointerException> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class EventExchangeTest {
assertEquals(originalEvent.data[0].value, "some string")
assertEquals(originalEvent.source, "source")
assertEquals(originalEvent.id, "id")
assertEquals(originalEvent.createdTime, 1)
assertEquals(originalEvent.emittedTime, 1)

// Perform round-trip and verify the event properties
originalEvent.roundTrip().let { receivedEvent ->
Expand All @@ -40,7 +40,7 @@ class EventExchangeTest {
assertEquals(originalEvent.target, receivedEvent.target)
assertEquals(originalEvent.source, receivedEvent.source)
assertEquals(originalEvent.id, receivedEvent.id)
assertEquals(originalEvent.createdTime, receivedEvent.createdTime)
assertEquals(originalEvent.emittedTime, receivedEvent.emittedTime)
}
}

Expand Down
Loading