Address compilation warnings

13 files changed, 26 insertions, 35 deletions

diff --git a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ComparableAllocationPolicyLogic.kt b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ComparableAllocationPolicyLogic.kt
index 6aff2bab..8defe8b7 100644
--- a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ComparableAllocationPolicyLogic.kt
+++ b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ComparableAllocationPolicyLogic.kt
@@ -44,6 +44,6 @@ public interface ComparableAllocationPolicyLogic : AllocationPolicy.Logic {
                 val fitsCpu = hv.server.flavor.cpuCount >= image.flavor.cpuCount
                 fitsMemory && fitsCpu
             }
-            .minWith(comparator.thenBy { it.server.uid })
+            .minWithOrNull(comparator.thenBy { it.server.uid })
     }
 }
diff --git a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt
index fda863bb..5312f4da 100644
--- a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt
+++ b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/allocation/ReplayAllocationPolicy.kt
@@ -46,10 +46,10 @@ public class ReplayAllocationPolicy(private val vmPlacements: Map<String, String
 
             if (machinesInCluster.isEmpty()) {
                 logger.info { "Could not find any machines belonging to cluster $clusterName for image ${image.name}, assigning randomly." }
-                return hypervisors.maxBy { it.availableMemory }
+                return hypervisors.maxByOrNull { it.availableMemory }
             }
 
-            return machinesInCluster.maxBy { it.availableMemory }
+            return machinesInCluster.maxByOrNull { it.availableMemory }
                 ?: throw IllegalStateException("Cloud not find any machine and could not randomly assign")
         }
     }
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/Main.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/Main.kt
index b7bb0c23..8916261b 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/Main.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/Main.kt
@@ -41,7 +41,6 @@ import org.opendc.experiments.sc20.runner.internal.DefaultExperimentRunner
 import org.opendc.format.trace.sc20.Sc20PerformanceInterferenceReader
 import org.opendc.format.trace.sc20.Sc20VmPlacementReader
 import java.io.File
-import java.io.InputStream
 
 /**
  * The logger for this experiment.
@@ -74,7 +73,7 @@ public class ExperimentCli : CliktCommand(name = "sc20-experiment") {
         help = "path to the performance interference file"
     )
         .file(canBeDir = false)
-        .convert { it.inputStream() as InputStream }
+        .convert { it.inputStream() }
 
     /**
      * The path to the original VM placements file.
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
index 37e5d176..09f44199 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
@@ -227,8 +227,7 @@ public suspend fun processTrace(
     reader: TraceReader<VmWorkload>,
     scheduler: SimVirtProvisioningService,
     chan: Channel<Unit>,
-    monitor: ExperimentMonitor,
-    vmPlacements: Map<String, String> = emptyMap()
+    monitor: ExperimentMonitor
 ) {
     try {
         var submitted = 0
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
index 7a5b84e0..660fc882 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
@@ -131,8 +131,7 @@ public data class Run(override val parent: Scenario, val id: Int, val seed: Int)
                 trace,
                 scheduler,
                 chan,
-                monitor,
-                experiment.vmPlacements
+                monitor
             )
 
             logger.debug("SUBMIT=${scheduler.submittedVms}")
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
index 6ff3b518..3eb9362c 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
@@ -57,7 +57,7 @@ public class ParquetExperimentMonitor(base: File, partition: String, bufferSize:
             startTime = time
 
             // Update timestamp of initial event
-            currentHostEvent.replaceAll { k, v -> v.copy(timestamp = startTime) }
+            currentHostEvent.replaceAll { _, v -> v.copy(timestamp = startTime) }
         }
     }
 
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt
index dd6b15d0..bb2a75ee 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/Sc20TraceConverter.kt
@@ -187,11 +187,11 @@ public class SolvinityConversion : TraceConversion("Solvinity") {
             .filterNot { it.isDirectory }
             .filter { it.extension == "csv" || it.extension == "txt" }
             .toList()
-            .forEach { vmFile ->
+            .forEach file@{ vmFile ->
                 BufferedReader(FileReader(vmFile)).use { reader ->
                     reader.lineSequence()
                         .chunked(128)
-                        .forEachIndexed { idx, lines ->
+                        .forEach { lines ->
                             for (line in lines) {
                                 // Ignore comments in the trace
                                 if (line.startsWith("#") || line.isBlank()) {
@@ -212,7 +212,7 @@ public class SolvinityConversion : TraceConversion("Solvinity") {
                                 if (timestamp < minTimestamp) {
                                     minTimestamp = timestamp
                                 }
-                                return@forEach
+                                return@file
                             }
                         }
                 }
@@ -229,13 +229,13 @@ public class SolvinityConversion : TraceConversion("Solvinity") {
             .filterNot { it.isDirectory }
             .filter { it.extension == "csv" || it.extension == "txt" }
             .toList()
-            .forEachIndexed { idx, vmFile ->
+            .forEach { vmFile ->
                 println(vmFile)
 
                 var vmId = ""
                 var maxCores = -1
                 var requiredMemory = -1L
-                var cores = -1
+                var cores: Int
                 var minTime = Long.MAX_VALUE
 
                 val flopsFragments = sequence {
@@ -353,13 +353,13 @@ public class BitbrainsConversion : TraceConversion("Bitbrains") {
             .filterNot { it.isDirectory }
             .filter { it.extension == "csv" || it.extension == "txt" }
             .toList()
-            .forEachIndexed { idx, vmFile ->
+            .forEach { vmFile ->
                 println(vmFile)
 
                 var vmId = ""
                 var maxCores = -1
                 var requiredMemory = -1L
-                var cores = -1
+                var cores: Int
                 var minTime = Long.MAX_VALUE
 
                 val flopsFragments = sequence {
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/WorkloadSampler.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/WorkloadSampler.kt
index fa225cb0..a8b83aef 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/WorkloadSampler.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/trace/WorkloadSampler.kt
@@ -143,7 +143,6 @@ public fun sampleHpcWorkload(
 
     if (sampleOnLoad) {
         var currentLoad = 0.0
-        var i = 0
         for (entry in hpcSequence) {
             val entryLoad = entry.workload.image.tags.getValue("total-load") as Double
             if ((currentLoad + entryLoad) / totalLoad > fraction) {
diff --git a/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/sc20/Sc20TraceReader.kt b/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/sc20/Sc20TraceReader.kt
index 6d854fef..66efbcd0 100644
--- a/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/sc20/Sc20TraceReader.kt
+++ b/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/sc20/Sc20TraceReader.kt
@@ -64,7 +64,6 @@ public class Sc20TraceReader(
         val timestampCol = 0
         val cpuUsageCol = 1
         val coreCol = 12
-        val vmIdCol = 19
         val provisionedMemoryCol = 20
         val traceInterval = 5 * 60 * 1000L
 
diff --git a/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt b/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt
index f7b8a072..52d41c44 100644
--- a/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt
+++ b/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt
@@ -64,17 +64,17 @@ public class SwfTraceReader(
 
         val sliceDuration = 5 * 60L
 
-        var jobNumber = -1L
-        var submitTime = -1L
-        var waitTime = -1L
-        var runTime = -1L
-        var cores = -1
-        var memory = -1L
-        var slicedWaitTime = -1L
-        var flopsPerSecond = -1L
-        var flopsPartialSlice = -1L
-        var flopsFullSlice = -1L
-        var runtimePartialSliceRemainder = -1L
+        var jobNumber: Long
+        var submitTime: Long
+        var waitTime: Long
+        var runTime: Long
+        var cores: Int
+        var memory: Long
+        var slicedWaitTime: Long
+        var flopsPerSecond: Long
+        var flopsPartialSlice: Long
+        var flopsFullSlice: Long
+        var runtimePartialSliceRemainder: Long
 
         BufferedReader(FileReader(file)).use { reader ->
             reader.lineSequence()
diff --git a/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/wtf/WtfTraceReader.kt b/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/wtf/WtfTraceReader.kt
index e43d68d8..b2931468 100644
--- a/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/wtf/WtfTraceReader.kt
+++ b/simulator/opendc-format/src/main/kotlin/org/opendc/format/trace/wtf/WtfTraceReader.kt
@@ -70,8 +70,6 @@ public class WtfTraceReader(path: String) : TraceReader<Job> {
             val dependencies = (nextRecord.get("parents") as ArrayList<GenericRecord>).map {
                 it.get("item") as Long
             }
-            val inputSize: Long = 0
-            val outputSize: Long = 0
 
             val flops: Long = 4100 * (runtime / 1000) * cores
 
diff --git a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
index ca500770..26577ef2 100644
--- a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
+++ b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/Main.kt
@@ -277,8 +277,7 @@ public class RunnerCli : CliktCommand(name = "runner") {
                 trace,
                 scheduler,
                 chan,
-                monitor,
-                emptyMap()
+                monitor
             )
 
             logger.debug("SUBMIT=${scheduler.submittedVms}")
diff --git a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
index 244f2a3d..5e483271 100644
--- a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
+++ b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/TopologyParser.kt
@@ -60,7 +60,6 @@ public class TopologyParser(private val collection: MongoCollection<Document>, p
         val random = Random(0)
 
         for (machine in fetchMachines(id)) {
-            val machineId = machine.getString("_id")
             val clusterId = machine.getString("rack_id")
             val position = machine.getInteger("position")