Merge branch 'develop' into job-exceptions

Author: elizarov

benchmarks/build.gradle

@@ -2,27 +2,26 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
-plugins {
-    id "me.champeau.gradle.jmh" version "0.4.4"
-}
+apply plugin: "net.ltgt.apt"
+apply plugin: "com.github.johnrengelman.shadow"
+apply plugin: "me.champeau.gradle.jmh"
 
 repositories {
     maven { url "http://repo.typesafe.com/typesafe/releases/" }
 }
 
-dependencies {
-    jmh 'com.typesafe.akka:akka-actor_2.12:2.5.0'
-    jmh project(':kotlinx-coroutines-core-common')
-    jmh project(':kotlinx-coroutines-core')
-    jmh project(':kotlinx-coroutines-core').sourceSets.test.output
-    jmh project(':kotlinx-coroutines-io')
-}
-
-jmh.jmhVersion = '1.19'
+jmh.jmhVersion = '1.21'
 
-jmhJar.archiveName = 'benchmarks.jar'
+jmhJar {
+    baseName 'benchmarks'
+    classifier = null
+    version = null
+}
 
-//jmh {
-//    include = ['.*Channel.*Benchmark']
-//    exclude = ['.*Guice.*', '.*PingPong.*']
-//}
+dependencies {
+    compile 'com.typesafe.akka:akka-actor_2.12:2.5.0'
+    compile project(':kotlinx-coroutines-core-common')
+    compile project(':kotlinx-coroutines-core')
+    compile project(':kotlinx-coroutines-core').sourceSets.test.output
+    compile "org.openjdk.jmh:jmh-core:1.21"
+}

benchmarks/src/jmh/kotlin/benchmarks/ChannelCopyBenchmark.kt

@@ -154,13 +154,4 @@ private fun compute(coefficients: LongArray, start: Int, end: Int): Double {
     }
 
     return result
-}
-
-
-fun main(args: Array<String>) {
-    // Hand-rollled test
-    val arr = LongArray(BATCH_SIZE * 8) { ThreadLocalRandom.current().nextLong(0, 100) }
-
-    println(ForkJoinPool.commonPool().submit(ForkJoinBenchmark.Task(arr, 0, arr.size)).join())
-    println(ForkJoinBenchmark.RecursiveAction(arr, 0, arr.size).invoke())
-}
+}