Renamed withMutex to withLock

Author: elizarov

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/sync/Mutex.kt

@@ -92,10 +92,23 @@ public interface Mutex {
 }
 
 /**
- * Executes the given [action] under this mutex.
+ * Executes the given [action] under this mutex's lock.
  * @return the return value of the action.
  */
 // :todo: this function needs to be make inline as soon as this bug is fixed: https://youtrack.jetbrains.com/issue/KT-16448
+public suspend fun <T> Mutex.withLock(action: suspend () -> T): T {
+    lock()
+    try {
+        return action()
+    } finally {
+        unlock()
+    }
+}
+
+/**
+ * @suppress: **Deprecated**: Use [withLock]
+ */
+@Deprecated("Use `withLock`", replaceWith = ReplaceWith("withLock(action)"))
 public suspend fun <T> Mutex.withMutex(action: suspend () -> T): T {
     lock()
     try {

kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/sync/MutexTest.kt

@@ -16,6 +16,7 @@
 
 package kotlinx.coroutines.experimental.sync
 
+import guide.sync.example06.mutex
 import kotlinx.coroutines.experimental.*
 import org.junit.Assert.*
 import org.junit.Test
@@ -61,6 +62,16 @@ class MutexTest : TestBase() {
         assertFalse(mutex.isLocked)
     }
 
+    @Test
+    fun withLockTest() = runBlocking {
+        val mutex = Mutex()
+        assertFalse(mutex.isLocked)
+        mutex.withLock {
+            assertTrue(mutex.isLocked)
+        }
+        assertFalse(mutex.isLocked)
+    }
+
     @Test
     fun testStress() = runBlocking<Unit> {
         val n = 1000 * stressTestMultiplier