Revert "Provide BlockingChecker mechanism which checks current context"

This reverts commit bac6bde.

Author: qwwdfsad

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-android.txt

@@ -23,8 +23,3 @@ public final class kotlinx/coroutines/experimental/android/HandlerContextKt {
 	public static final fun getUI ()Lkotlinx/coroutines/experimental/android/HandlerContext;
 }
 
-public final class kotlinx/coroutines/experimental/android/MainLooperChecker : kotlinx/coroutines/experimental/BlockingChecker {
-	public fun <init> ()V
-	public fun checkRunBlocking ()V
-}
-

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-core.txt

@@ -20,10 +20,6 @@ public final class kotlinx/coroutines/experimental/AwaitKt {
 	public static final fun joinAll ([Lkotlinx/coroutines/experimental/Job;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
 }
 
-public abstract interface class kotlinx/coroutines/experimental/BlockingChecker {
-	public abstract fun checkRunBlocking ()V
-}
-
 public final class kotlinx/coroutines/experimental/BuildersKt {
 	public static final synthetic fun launch (Lkotlin/coroutines/experimental/CoroutineContext;Lkotlinx/coroutines/experimental/CoroutineStart;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/experimental/Job;
 	public static final fun launch (Lkotlin/coroutines/experimental/CoroutineContext;Lkotlinx/coroutines/experimental/CoroutineStart;Lkotlinx/coroutines/experimental/Job;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/experimental/Job;

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-javafx.txt

@@ -1,8 +1,3 @@
-public final class kotlinx/coroutines/experimental/javafx/ApplicationThreadChecker : kotlinx/coroutines/experimental/BlockingChecker {
-	public fun <init> ()V
-	public fun checkRunBlocking ()V
-}
-
 public final class kotlinx/coroutines/experimental/javafx/JavaFx : kotlinx/coroutines/experimental/CoroutineDispatcher, kotlinx/coroutines/experimental/Delay {
 	public static final field INSTANCE Lkotlinx/coroutines/experimental/javafx/JavaFx;
 	public final fun awaitPulse (Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-swing.txt

@@ -1,8 +1,3 @@
-public final class kotlinx/coroutines/experimental/swing/EventDispatchThreadChecker : kotlinx/coroutines/experimental/BlockingChecker {
-	public fun <init> ()V
-	public fun checkRunBlocking ()V
-}
-
 public final class kotlinx/coroutines/experimental/swing/Swing : kotlinx/coroutines/experimental/CoroutineDispatcher, kotlinx/coroutines/experimental/Delay {
 	public static final field INSTANCE Lkotlinx/coroutines/experimental/swing/Swing;
 	public fun delay (JLjava/util/concurrent/TimeUnit;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;

core/kotlinx-coroutines-core/src/Builders.kt

@@ -7,8 +7,6 @@
 
 package kotlinx.coroutines.experimental
 
-import kotlinx.coroutines.experimental.internal.*
-import java.util.*
 import java.util.concurrent.locks.*
 import kotlin.coroutines.experimental.*
 
@@ -31,14 +29,11 @@ import kotlin.coroutines.experimental.*
  *
  * See [newCoroutineContext] for a description of debugging facilities that are available for newly created coroutine.
  *
- * @throws IllegalStateException if blocking is not allowed in current thread.
- *         Blocking is checked by [BlockingChecker] registered in [ServiceLoader]
  * @param context context of the coroutine. The default value is an implementation of [EventLoop].
  * @param block the coroutine code.
  */
 @Throws(InterruptedException::class)
 public fun <T> runBlocking(context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> T): T {
-    blockingChecker?.checkRunBlocking()
     val currentThread = Thread.currentThread()
     val contextInterceptor = context[ContinuationInterceptor]
     val privateEventLoop = contextInterceptor == null // create private event loop if no dispatcher is specified
@@ -51,35 +46,6 @@ public fun <T> runBlocking(context: CoroutineContext = EmptyCoroutineContext, bl
     return coroutine.joinBlocking()
 }
 
-/**
- * Extension point which determines whether invoking [runBlocking] in the current thread is allowed.
- * [runBlocking] discovers all checkers via [ServiceLoader] and invokes [checkRunBlocking] on
- * each attempt to invoke [runBlocking].
- *
- * Common example is checking whether we're not in UI thread:
- *
- * ```
- * class UiChecker : BlockingChecker {
- *    fun checkRunBlocking() =
- *        check(!UiFramework.isInUiThread()) { "runBlocking is not allowed in UI thread" }
- * }
- * ```
- */
-public interface BlockingChecker {
-    /**
-     * Throws [IllegalStateException] if [runBlocking] calls are not allowed in the current thread.
-     */
-    fun checkRunBlocking()
-}
-
-// Nullable to enable DCE when no filters are present in classpath
-private val blockingChecker: BlockingChecker? = run {
-    val filters = ServiceLoader.load(BlockingChecker::class.java).toList().toTypedArray()
-    if (filters.isEmpty()) null else object : BlockingChecker {
-        override fun checkRunBlocking() = filters.forEach { it.checkRunBlocking() }
-    }
-}
-
 private class BlockingCoroutine<T>(
     parentContext: CoroutineContext,
     private val blockedThread: Thread,

ui/kotlinx-coroutines-android/resources/META-INF/services/kotlinx.coroutines.experimental.BlockingChecker

@@ -5,11 +5,10 @@
 package kotlinx.coroutines.experimental.android
 
 import android.os.*
-import android.support.annotation.*
 import android.view.*
 import kotlinx.coroutines.experimental.*
-import java.util.concurrent.*
-import kotlin.coroutines.experimental.*
+import java.util.concurrent.TimeUnit
+import kotlin.coroutines.experimental.CoroutineContext
 
 /**
  * Dispatches execution onto Android main UI thread and provides native [delay][Delay.delay] support.
@@ -114,12 +113,3 @@ public class HandlerContext private constructor(
     override fun equals(other: Any?): Boolean = other is HandlerContext && other.handler === handler
     override fun hashCode(): Int = System.identityHashCode(handler)
 }
-
-/**
- * @suppress This is an internal impl class.
- */
-@Keep
-class MainLooperChecker : BlockingChecker {
-    override fun checkRunBlocking() =
-        check(Looper.myLooper() != Looper.getMainLooper()) { "runBlocking is not allowed in Android main looper thread" }
-}

ui/kotlinx-coroutines-android/src/HandlerContext.kt

@@ -10,8 +10,9 @@ import javafx.event.*
 import javafx.util.*
 import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.javafx.JavaFx.delay
-import java.util.concurrent.*
-import kotlin.coroutines.experimental.*
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.TimeUnit
+import kotlin.coroutines.experimental.CoroutineContext
 
 /**
  * Dispatches execution onto JavaFx application thread and provides native [delay] support.
@@ -76,14 +77,6 @@ object JavaFx : CoroutineDispatcher(), Delay {
     override fun toString() = "JavaFx"
 }
 
-/**
- * @suppress This is an internal impl class.
- */
-class ApplicationThreadChecker : BlockingChecker {
-    override fun checkRunBlocking() =
-        check(!Platform.isFxApplicationThread()) { "runBlocking is not allowed in JavaFx application thread" }
-}
-
 internal fun initPlatform() {
     // Ad-hoc workaround for #443. Will be fixed with multi-release jar.
     // If this code throws an exception (Java 9 + prohibited reflective access), initialize JavaFX directly

ui/kotlinx-coroutines-javafx/resources/META-INF/services/kotlinx.coroutines.experimental.BlockingChecker

@@ -4,35 +4,25 @@
 
 package kotlinx.coroutines.experimental.javafx
 
-import javafx.application.*
+import javafx.application.Platform
 import kotlinx.coroutines.experimental.*
-import org.junit.*
+import org.junit.Before
 import org.junit.Test
-import kotlin.test.*
 
 class JavaFxTest : TestBase() {
-
-    companion object {
-        val fxEnabled: Boolean = try {
-            initPlatform()
-            true
-        } catch (e: Throwable) {
-            println("Skipping JavaFxTest in headless environment")
-            false
-        }
-
-    }
-
     @Before
     fun setup() {
         ignoreLostThreads("JavaFX Application Thread", "Thread-", "QuantumRenderer-")
     }
 
     @Test
     fun testDelay() {
-       if (!fxEnabled) {
-           return // ignore test in headless environments
-       }
+        try {
+            initPlatform()
+        } catch (e: UnsupportedOperationException) {
+            println("Skipping JavaFxTest in headless environment")
+            return // ignore test in headless environments
+        }
 
         runBlocking {
             expect(1)
@@ -47,23 +37,4 @@ class JavaFxTest : TestBase() {
             finish(4)
         }
     }
-
-    @Test
-    fun testRunBlockingForbidden() {
-        if (!fxEnabled) {
-            return // ignore test in headless environments
-        }
-
-        runBlocking(JavaFx) {
-            expect(1)
-            try {
-                runBlocking(JavaFx) {
-                    expectUnreached()
-                }
-            } catch (e: Exception) {
-                assertTrue(e.message!!.contains("runBlocking"))
-                finish(2)
-            }
-        }
-    }
-}
+}