From 7a4b2c45a9926de59754b1d7219159656eea6e6d Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 9 Nov 2022 17:25:59 +0000
Subject: refactor: Use InstantSource as time source

This change updates the modules of OpenDC to always accept
the `InstantSource` interface as source of time. Previously we used
`java.time.Clock`, but this class is bound to a time zone which does not
make sense for our use-cases.

Since `java.time.Clock` implements `java.time.InstantSource`, it can be
used in places that require an `InstantSource` as parameter. Conversion
from `InstantSource` to `Clock` is also possible by invoking
`InstantSource#withZone`.
---
 .../src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'opendc-experiments/opendc-experiments-faas/src/main')

diff --git a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt
index c4001e2e..7a354d69 100644
--- a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt
+++ b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/TraceHelpers.kt
@@ -28,16 +28,16 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.opendc.faas.service.FaaSService
-import java.time.Clock
+import java.time.InstantSource
 import kotlin.math.max
 
 /**
  * Run a simulation of the [FaaSService] by replaying the workload trace given by [trace].
  *
- * @param clock A [Clock] instance tracking simulation time.
+ * @param clock An [InstantSource] instance tracking simulation time.
  * @param trace The trace to simulate.
  */
-public suspend fun FaaSService.replay(clock: Clock, trace: List<FunctionTrace>) {
+public suspend fun FaaSService.replay(clock: InstantSource, trace: List<FunctionTrace>) {
     val client = newClient()
     try {
         coroutineScope {
-- 
cgit v1.2.3


From fb2672afb2d8236d5291cd028196c99d8e4d47f1 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 9 Nov 2022 21:59:07 +0000
Subject: refactor: Replace use of CoroutineContext by Dispatcher

This change replaces the use of `CoroutineContext` for passing the
`SimulationDispatcher` across the different modules of OpenDC by the
lightweight `Dispatcher` interface of the OpenDC common module.
---
 .../org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'opendc-experiments/opendc-experiments-faas/src/main')

diff --git a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt
index 3b4200c8..e5c2f86a 100644
--- a/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt
+++ b/opendc-experiments/opendc-experiments-faas/src/main/kotlin/org/opendc/experiments/faas/FaaSServiceProvisioningStep.kt
@@ -56,10 +56,9 @@ public class FaaSServiceProvisioningStep internal constructor(
         } else {
             ZeroDelayInjector
         }
-        val deployer = SimFunctionDeployer(ctx.coroutineContext, ctx.clock, machineModel, delayInjector)
+        val deployer = SimFunctionDeployer(ctx.dispatcher, machineModel, delayInjector)
         val service = FaaSService(
-            ctx.coroutineContext,
-            ctx.clock,
+            ctx.dispatcher,
             deployer,
             routingPolicy(ctx),
             terminationPolicy(ctx)
-- 
cgit v1.2.3