chore: Address deprecations due to Kotlin 1.5

This change addresses the deprecations that were caused by the migration
to Kotlin 1.5.

13 files changed, 18 insertions, 20 deletions

diff --git a/opendc-compute/opendc-compute-service/src/main/kotlin/org/opendc/compute/service/scheduler/FilterScheduler.kt b/opendc-compute/opendc-compute-service/src/main/kotlin/org/opendc/compute/service/scheduler/FilterScheduler.kt
index 0fd5b2a4..1fe90454 100644
--- a/opendc-compute/opendc-compute-service/src/main/kotlin/org/opendc/compute/service/scheduler/FilterScheduler.kt
+++ b/opendc-compute/opendc-compute-service/src/main/kotlin/org/opendc/compute/service/scheduler/FilterScheduler.kt
@@ -59,7 +59,7 @@ public class FilterScheduler(private val filters: List<HostFilter>, private val
                 true
             }
             .sortedByDescending { host ->
-                weighers.sumByDouble { (weigher, factor) -> weigher.getWeight(host, server) * factor }
+                weighers.sumOf { (weigher, factor) -> weigher.getWeight(host, server) * factor }
             }
             .firstOrNull()
     }
diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/telemetry/parquet/ParquetEventWriter.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/telemetry/parquet/ParquetEventWriter.kt
index 38930ee5..4fa6ae66 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/telemetry/parquet/ParquetEventWriter.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/telemetry/parquet/ParquetEventWriter.kt
@@ -52,6 +52,7 @@ public open class ParquetEventWriter<in T : Event>(
     /**
      * The writer to write the Parquet file.
      */
+    @Suppress("DEPRECATION")
     private val writer = AvroParquetWriter.builder<GenericData.Record>(Path(path.absolutePath))
         .withSchema(schema)
         .withCompressionCodec(CompressionCodecName.SNAPPY)
diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/Sc20RawParquetTraceReader.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/Sc20RawParquetTraceReader.kt
index ffbf46d4..bd27cf02 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/Sc20RawParquetTraceReader.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/Sc20RawParquetTraceReader.kt
@@ -105,7 +105,7 @@ public class Sc20RawParquetTraceReader(private val path: File) {
                 val uid = UUID.nameUUIDFromBytes("$id-${counter++}".toByteArray())
 
                 val vmFragments = fragments.getValue(id).asSequence()
-                val totalLoad = vmFragments.sumByDouble { it.usage } * 5 * 60 // avg MHz * duration = MFLOPs
+                val totalLoad = vmFragments.sumOf { it.usage } * 5 * 60 // avg MHz * duration = MFLOPs
                 val workload = SimTraceWorkload(vmFragments)
                 entries.add(
                     TraceEntry(
diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/Sc20TraceConverter.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/Sc20TraceConverter.kt
index 7713c06f..1f9e289c 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/Sc20TraceConverter.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/Sc20TraceConverter.kt
@@ -109,6 +109,7 @@ public class TraceConverterCli : CliktCommand(name = "trace-converter") {
             traceParquet.delete()
         }
 
+        @Suppress("DEPRECATION")
         val metaWriter = AvroParquetWriter.builder<GenericData.Record>(Path(metaParquet.toURI()))
             .withSchema(metaSchema)
             .withCompressionCodec(CompressionCodecName.SNAPPY)
@@ -116,6 +117,7 @@ public class TraceConverterCli : CliktCommand(name = "trace-converter") {
             .withRowGroupSize(16 * 1024 * 1024) // For write buffering (Page size)
             .build()
 
+        @Suppress("DEPRECATION")
         val writer = AvroParquetWriter.builder<GenericData.Record>(Path(traceParquet.toURI()))
             .withSchema(schema)
             .withCompressionCodec(CompressionCodecName.SNAPPY)
diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/WorkloadSampler.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/WorkloadSampler.kt
index 5c8727ea..6de3f265 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/WorkloadSampler.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/trace/WorkloadSampler.kt
@@ -69,7 +69,7 @@ public fun sampleRegularWorkload(
     val totalLoad = if (workload is CompositeWorkload) {
         workload.totalLoad
     } else {
-        shuffled.sumByDouble { it.meta.getValue("total-load") as Double }
+        shuffled.sumOf { it.meta.getValue("total-load") as Double }
     }
     var currentLoad = 0.0
 
@@ -129,7 +129,7 @@ public fun sampleHpcWorkload(
     val totalLoad = if (workload is CompositeWorkload) {
         workload.totalLoad
     } else {
-        trace.sumByDouble { it.meta.getValue("total-load") as Double }
+        trace.sumOf { it.meta.getValue("total-load") as Double }
     }
 
     logger.debug { "Total trace load: $totalLoad" }
diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt
index 411ddb59..83995fa1 100644
--- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt
+++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/keras/Sequential.kt
@@ -49,10 +49,10 @@ public class Sequential(vararg layers: Layer) : TrainableModel(*layers) {
     }
 
     override fun forward(): Double {
-        return layers.sumByDouble { it.forward() }
+        return layers.sumOf { it.forward() }
     }
 
     override fun backward(): Double {
-        return layers.sumByDouble { it.backward() }
+        return layers.sumOf { it.backward() }
     }
 }
diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt
index 75b11423..9771cc20 100644
--- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt
+++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/network/NetworkController.kt
@@ -82,7 +82,7 @@ public class NetworkController(context: CoroutineContext, clock: Clock) : AutoCl
 
         val target = channels[to] ?: return // Drop if destination not found
 
-        scheduler.startSingleTimer(message, delayTime) { target.offer(message) }
+        scheduler.startSingleTimer(message, delayTime) { target.trySend(message) }
     }
 
     /**
diff --git a/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt b/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt
index 0d1f3cea..50ab652e 100644
--- a/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt
+++ b/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt
@@ -69,8 +69,6 @@ public class SwfTraceReader(
         var cores: Int
         var memory: Long
         var slicedWaitTime: Long
-        var flopsPerSecond: Long
-        var flopsPartialSlice: Long
         var runtimePartialSliceRemainder: Long
 
         BufferedReader(FileReader(file)).use { reader ->
@@ -121,9 +119,7 @@ public class SwfTraceReader(
 
                     // Insert run time slices
 
-                    flopsPerSecond = 4_000L * cores
                     runtimePartialSliceRemainder = runTime % sliceDuration
-                    flopsPartialSlice = flopsPerSecond * runtimePartialSliceRemainder
 
                     for (
                         tick in (submitTime + slicedWaitTime)
diff --git a/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/SimFunctionDeployer.kt b/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/SimFunctionDeployer.kt
index 0605eaac..b5516b4d 100644
--- a/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/SimFunctionDeployer.kt
+++ b/opendc-serverless/opendc-serverless-simulator/src/main/kotlin/org/opendc/serverless/simulator/SimFunctionDeployer.kt
@@ -102,7 +102,7 @@ public class SimFunctionDeployer(
             check(state != FunctionInstanceState.Deleted) { "Function instance has been released" }
             return suspendCancellableCoroutine { cont ->
                 queue.add(InvocationRequest(cont))
-                chan.offer(Unit)
+                chan.trySend(Unit)
             }
         }
 
diff --git a/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/SimAbstractMachine.kt b/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/SimAbstractMachine.kt
index f6324e13..e501033a 100644
--- a/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/SimAbstractMachine.kt
+++ b/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/SimAbstractMachine.kt
@@ -80,7 +80,7 @@ public abstract class SimAbstractMachine(private val clock: Clock) : SimMachine
     override suspend fun run(workload: SimWorkload, meta: Map<String, Any>): Unit = withContext(context) {
         require(!isTerminated) { "Machine is terminated" }
         val ctx = Context(meta)
-        val totalCapacity = model.cpus.sumByDouble { it.frequency }
+        val totalCapacity = model.cpus.sumOf { it.frequency }
 
         _speed = DoubleArray(model.cpus.size) { 0.0 }
         var totalSpeed = 0.0
diff --git a/opendc-simulator/opendc-simulator-resources/src/main/kotlin/org/opendc/simulator/resources/SimAbstractResourceAggregator.kt b/opendc-simulator/opendc-simulator-resources/src/main/kotlin/org/opendc/simulator/resources/SimAbstractResourceAggregator.kt
index 6ae04f27..653b53e0 100644
--- a/opendc-simulator/opendc-simulator-resources/src/main/kotlin/org/opendc/simulator/resources/SimAbstractResourceAggregator.kt
+++ b/opendc-simulator/opendc-simulator-resources/src/main/kotlin/org/opendc/simulator/resources/SimAbstractResourceAggregator.kt
@@ -82,7 +82,7 @@ public abstract class SimAbstractResourceAggregator(private val scheduler: SimRe
 
                 return if (_remainingWorkFlush < now) {
                     _remainingWorkFlush = now
-                    _inputConsumers.sumByDouble { it._ctx?.remainingWork ?: 0.0 }.also { _remainingWork = it }
+                    _inputConsumers.sumOf { it._ctx?.remainingWork ?: 0.0 }.also { _remainingWork = it }
                 } else {
                     _remainingWork
                 }
@@ -132,7 +132,7 @@ public abstract class SimAbstractResourceAggregator(private val scheduler: SimRe
 
         private fun updateCapacity() {
             // Adjust capacity of output resource
-            context.capacity = _inputConsumers.sumByDouble { it._ctx?.capacity ?: 0.0 }
+            context.capacity = _inputConsumers.sumOf { it._ctx?.capacity ?: 0.0 }
         }
 
         /* Input */
diff --git a/opendc-utils/src/main/kotlin/org/opendc/utils/TimerScheduler.kt b/opendc-utils/src/main/kotlin/org/opendc/utils/TimerScheduler.kt
index aa2f3367..d7da7f99 100644
--- a/opendc-utils/src/main/kotlin/org/opendc/utils/TimerScheduler.kt
+++ b/opendc-utils/src/main/kotlin/org/opendc/utils/TimerScheduler.kt
@@ -24,7 +24,6 @@ package org.opendc.utils
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.sendBlocking
 import kotlinx.coroutines.selects.select
 import java.time.Clock
 import java.util.*
@@ -145,9 +144,9 @@ public class TimerScheduler<T>(context: CoroutineContext, private val clock: Clo
             queue.poll()
 
             if (queue.isNotEmpty()) {
-                channel.sendBlocking(peek.timestamp)
+                channel.trySend(peek.timestamp)
             } else {
-                channel.sendBlocking(null)
+                channel.trySend(null)
             }
         }
     }
@@ -212,7 +211,7 @@ public class TimerScheduler<T>(context: CoroutineContext, private val clock: Clo
                 // Check if we need to push the interruption forward
                 // Note that we check by timer reference
                 if (queue.peek() === timer) {
-                    channel.offer(timer.timestamp)
+                    channel.trySend(timer.timestamp)
                 }
 
                 timer
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
index 2dd63340..e96a681d 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
@@ -73,7 +73,7 @@ public class TopologyParser(private val collection: MongoCollection<Document>) {
                 )
             }
 
-            val energyConsumptionW = machine.getList("cpus", Document::class.java).sumBy { it.getInteger("energyConsumptionW") }.toDouble()
+            val energyConsumptionW = machine.getList("cpus", Document::class.java).sumOf { it.getInteger("energyConsumptionW") }.toDouble()
 
             nodes.add(
                 MachineDef(