From 8df422ca5164bd712caf594951669ebeb656f5fb Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 31 Mar 2021 15:26:45 +0200
Subject: exp: Add experiment testing the serverless module

This change adds an experiments testing the OpenDC Serverless module.
---
 .../serverless/simulator/SimFunctionDeployer.kt    | 45 +++++++++++-----------
 .../simulator/workload/SimServerlessWorkload.kt    | 14 +------
 2 files changed, 25 insertions(+), 34 deletions(-)

(limited to 'simulator/opendc-serverless/opendc-serverless-simulator/src/main')

diff --git a/simulator/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/SimFunctionDeployer.kt b/simulator/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/SimFunctionDeployer.kt
index f28a926b..160f8ebb 100644
--- a/simulator/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/SimFunctionDeployer.kt
+++ b/simulator/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/SimFunctionDeployer.kt
@@ -111,33 +111,34 @@ public class SimFunctionDeployer(
         internal fun start() {
             check(state == FunctionInstanceState.Provisioning) { "Invalid state of function instance" }
             job = scope.launch {
-                workload.onStart()
+                launch {
+                    try {
+                        machine.run(workload)
+                    } finally {
+                        state = FunctionInstanceState.Terminated
+                    }
+                }
 
-                try {
-                    while (isActive) {
-                        chan.receive()
+                while (isActive) {
+                    chan.receive()
 
-                        if (queue.isNotEmpty()) {
-                            state = FunctionInstanceState.Active
-                        }
+                    if (queue.isNotEmpty()) {
+                        state = FunctionInstanceState.Active
+                    }
 
-                        while (queue.isNotEmpty()) {
-                            val request = queue.poll()
-                            try {
-                                machine.run(workload.onInvoke())
-                                request.cont.resume(Unit)
-                            } catch (cause: CancellationException) {
-                                request.cont.resumeWithException(cause)
-                                throw cause
-                            } catch (cause: Throwable) {
-                                request.cont.resumeWithException(cause)
-                            }
+                    while (queue.isNotEmpty()) {
+                        val request = queue.poll()
+                        try {
+                            workload.invoke()
+                            request.cont.resume(Unit)
+                        } catch (cause: CancellationException) {
+                            request.cont.resumeWithException(cause)
+                            throw cause
+                        } catch (cause: Throwable) {
+                            request.cont.resumeWithException(cause)
                         }
-                        state = FunctionInstanceState.Idle
                     }
-                } finally {
-                    state = FunctionInstanceState.Terminated
-                    workload.onStop()
+                    state = FunctionInstanceState.Idle
                 }
             }
         }
diff --git a/simulator/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/workload/SimServerlessWorkload.kt b/simulator/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/workload/SimServerlessWorkload.kt
index afdc05af..121bf915 100644
--- a/simulator/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/workload/SimServerlessWorkload.kt
+++ b/simulator/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/workload/SimServerlessWorkload.kt
@@ -27,19 +27,9 @@ import org.opendc.simulator.compute.workload.SimWorkload
 /**
  * A model for a serverless workload, which may be invoked multiple times.
  */
-public interface SimServerlessWorkload {
-    /**
-     * This method is invoked when a function instance is launched.
-     */
-    public fun onStart() {}
-
+public interface SimServerlessWorkload : SimWorkload {
     /**
      * This method is invoked when an active function instance is invoked.
      */
-    public fun onInvoke(): SimWorkload
-
-    /**
-     * This method is invoked when the function instance is stopped.
-     */
-    public fun onStop() {}
+    public suspend fun invoke()
 }
-- 
cgit v1.2.3