feat(sim/compute): Add completion parameter to startWorkload

This change updates the interface of `SimMachine#startWorkload` to
introduce a parameter `completion` that is invoked when the workload
completes either succesfully or due to failure.

This functionality has often been implemented by wrapping a
`SimWorkload` and catching its exceptions. However, since this
functionality is used in all usages of `SimMachine#startWorkload` we
instead embed it into `SimMachine` itself.

1 files changed, 3 insertions, 26 deletions

diff --git a/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/Coroutines.kt b/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/Coroutines.kt
index c23f48dc..b354caff 100644
--- a/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/Coroutines.kt
+++ b/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/Coroutines.kt
@@ -39,31 +39,8 @@ public suspend fun SimMachine.runWorkload(workload: SimWorkload, meta: Map<Strin
     return suspendCancellableCoroutine { cont ->
         cont.invokeOnCancellation { this@runWorkload.cancel() }
 
-        startWorkload(
-            object : SimWorkload {
-                override fun onStart(ctx: SimMachineContext) {
-                    try {
-                        workload.onStart(ctx)
-                    } catch (cause: Throwable) {
-                        cont.resumeWithException(cause)
-                        throw cause
-                    }
-                }
-
-                override fun onStop(ctx: SimMachineContext) {
-                    try {
-                        workload.onStop(ctx)
-
-                        if (!cont.isCompleted) {
-                            cont.resume(Unit)
-                        }
-                    } catch (cause: Throwable) {
-                        cont.resumeWithException(cause)
-                        throw cause
-                    }
-                }
-            },
-            meta
-        )
+        startWorkload(workload, meta) { cause ->
+            if (cause != null) cont.resumeWithException(cause) else cont.resume(Unit)
+        }
     }
 }