From 060dea15b000fde456072016cc555b91e4c23ec8 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Mon, 17 May 2021 17:41:41 +0000 Subject: Revert^2 "Fix usage of minBy to unblock Kotlin 1.5 upgrade" 375f839d08f42cde0da7d623a44d0d082610662d Change-Id: I53feb190c7ffde6233af88f325b858d866eb0734 --- core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt | 2 +- trebuchet/startup-common/src/StartupCommon.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt b/core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt index 79a9183..00f9953 100644 --- a/core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt +++ b/core/common/src/main/kotlin/trebuchet/queries/SliceQueries.kt @@ -113,7 +113,7 @@ fun ThreadModel.selectAll(predicate: (Slice) -> Boolean): List { * @param predicate The predicate used to test slices */ fun Model.selectFirst(predicate: (Slice) -> Boolean) : Slice? { - return this.processes.values.mapNotNull { it.selectFirst(predicate) }.minBy { it.startTime } + return this.processes.values.mapNotNull { it.selectFirst(predicate) }.minByOrNull { it.startTime } } diff --git a/trebuchet/startup-common/src/StartupCommon.kt b/trebuchet/startup-common/src/StartupCommon.kt index 75ed400..2cf4793 100644 --- a/trebuchet/startup-common/src/StartupCommon.kt +++ b/trebuchet/startup-common/src/StartupCommon.kt @@ -115,7 +115,7 @@ fun Model.findProcess(queryName: String, map { it.slices }. filter { it.isNotEmpty() }. map { it.first().startTime }. - min() ?: throw MissingProcessInfoException(process.id) + minOrNull() ?: throw MissingProcessInfoException(process.id) if (firstSliceStart in lowerBound..upperBound) { return process @@ -142,7 +142,7 @@ fun Model.getStartupEvents() : List { val newProc = this.findProcess(newProcName, systemServerSlice.startTime, systemServerSlice.endTime) val startProcSlice = systemServerProc.findFirstSlice(SLICE_NAME_PROC_START, newProcName, systemServerSlice.startTime, systemServerSlice.endTime) val rfdSlice = systemServerProc.findFirstSliceOrNull(SLICE_NAME_REPORT_FULLY_DRAWN, newProcName, systemServerSlice.startTime) - val firstSliceTime = newProc.threads.map { it.slices.firstOrNull()?.startTime ?: Double.POSITIVE_INFINITY }.min()!! + val firstSliceTime = newProc.threads.map { it.slices.firstOrNull()?.startTime ?: Double.POSITIVE_INFINITY }.minOrNull()!! val schedSliceInfo : MutableMap = mutableMapOf() newProc.threads.first().schedSlices.forEach schedLoop@ { schedSlice -> -- cgit v1.2.3