Fix NPE with unspecified TimeUnit and add more abbreviations for time units

Author: orangy

runtime/commonMain/src/org/jetbrains/gradle/benchmarks/RunnerConfiguration.kt

@@ -32,11 +32,11 @@ class RunnerConfiguration : CommandLineInterface("Client") {
     ).map { parseTimeUnit(it) }.store()
 
     private fun parseTimeUnit(text: String) = when (text) {
-        BenchmarkTimeUnit.SECONDS.name, "s" -> BenchmarkTimeUnit.SECONDS
-        BenchmarkTimeUnit.MICROSECONDS.name, "us" -> BenchmarkTimeUnit.MICROSECONDS
-        BenchmarkTimeUnit.MILLISECONDS.name, "ms" -> BenchmarkTimeUnit.MILLISECONDS
-        BenchmarkTimeUnit.NANOSECONDS.name, "ns" -> BenchmarkTimeUnit.NANOSECONDS
-        BenchmarkTimeUnit.MINUTES.name, "m" -> BenchmarkTimeUnit.MINUTES
+        BenchmarkTimeUnit.SECONDS.name, "s", "sec" -> BenchmarkTimeUnit.SECONDS
+        BenchmarkTimeUnit.MICROSECONDS.name, "us", "micros" -> BenchmarkTimeUnit.MICROSECONDS
+        BenchmarkTimeUnit.MILLISECONDS.name, "ms", "millis" -> BenchmarkTimeUnit.MILLISECONDS
+        BenchmarkTimeUnit.NANOSECONDS.name, "ns", "nanos" -> BenchmarkTimeUnit.NANOSECONDS
+        BenchmarkTimeUnit.MINUTES.name, "m", "min" -> BenchmarkTimeUnit.MINUTES
         else -> throw UnsupportedOperationException("Unknown time unit: $text")
     }
 

runtime/jvmMain/src/org/jetbrains/gradle/benchmarks/jvm/JvmBenchmarkRunner.kt

@@ -9,6 +9,7 @@ import org.openjdk.jmh.runner.*
 import org.openjdk.jmh.runner.format.*
 import org.openjdk.jmh.runner.options.*
 import java.io.*
+import java.util.concurrent.*
 
 fun main(args: Array<String>) {
     val params = RunnerConfiguration().also { it.parse(args) }
@@ -17,7 +18,7 @@ fun main(args: Array<String>) {
     params.iterations?.let { jmhOptions.measurementIterations(it) }
     params.warmups?.let { jmhOptions.warmupIterations(it) }
     params.iterationTime?.let {
-        val timeValue = TimeValue(it, params.iterationTimeUnit)
+        val timeValue = TimeValue(it, params.iterationTimeUnit ?: TimeUnit.SECONDS)
         jmhOptions.warmupTime(timeValue)
         jmhOptions.measurementTime(timeValue)
     }