[K/N] Fix crash that occurs when no benchmarks where run

Kotlin · Oct 18, 2021 · dd8962d · dd8962d
1 parent d6040e6
commit dd8962d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/runtime/commonMain/src/kotlinx/benchmark/BenchmarkReportFormatter.kt b/runtime/commonMain/src/kotlinx/benchmark/BenchmarkReportFormatter.kt
@@ -21,7 +21,7 @@ internal object TextBenchmarkReportFormatter : BenchmarkReportFormatter() {
 
     override fun format(results: Collection<ReportBenchmarkResult>): String {
         fun columnLength(column: String, selector: (ReportBenchmarkResult) -> String): Int =
-            max(column.length, results.maxOf { selector(it).length })
+            max(column.length, results.maxOfOrNull { selector(it).length } ?: 0)
 
         val shortNames = denseBenchmarkNames(results.map { it.benchmark.name })
         val nameLength = columnLength("Benchmark") { shortNames[it.benchmark.name]!! }

diff --git a/runtime/nativeMain/src/kotlinx/benchmark/native/NativeExecutor.kt b/runtime/nativeMain/src/kotlinx/benchmark/native/NativeExecutor.kt
@@ -172,7 +172,8 @@ class NativeExecutor(
     }
 
     private fun storeResults(benchmarks: List<BenchmarkDescriptor<Any?>>, complete: () -> Unit) {
-        additionalArguments[0].readFile().lines().forEach {
+        val resultsContent = additionalArguments[0].readFile()
+        resultsContent.takeIf(String::isNotEmpty)?.lines()?.forEach {
             val (configFileName, samplesList) = it.split(": ")
             val samples = samplesList.split(", ").map { it.toDouble() }.toDoubleArray()
             val benchmarkRun = configFileName.parseBenchmarkConfig()