azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

annotations for j.u.c.locks + related fixes of tests

Browse Source
This commit is contained in:
Alex Tkachman
2012-09-26 18:52:46 +02:00
parent 7ed2126ebb
commit e2d514907a
3 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.kt
+2 -2
View File
@@ -3,7 +3,7 @@ package kt1189
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T { inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
val rl = readLock()!! val rl = readLock()
var readCount = 0 var readCount = 0
val writeCount = getWriteHoldCount() val writeCount = getWriteHoldCount()
if(writeCount == 0) { if(writeCount == 0) {
@@ -13,7 +13,7 @@ inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
rl.unlock() rl.unlock()
} }
val wl = writeLock()!! val wl = writeLock()
wl.lock() wl.lock()
try { try {
return action() return action()
jdk-annotations/java/util/concurrent/locks/annotations.xml
+29
View File
@@ -0,0 +1,29 @@
<root>
<item name='java.util.concurrent.locks.ReentrantReadWriteLock java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock writeLock()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.locks.ReadWriteLock java.util.concurrent.locks.Lock readLock()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.locks.ReadWriteLock java.util.concurrent.locks.Lock writeLock()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.locks.ReentrantReadWriteLock java.lang.Thread getOwner()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.locks.Lock java.util.concurrent.locks.Condition newCondition()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.locks.Condition boolean await(long, java.util.concurrent.TimeUnit) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.locks.ReentrantLock java.util.concurrent.locks.Condition newCondition()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.locks.ReentrantLock java.lang.Thread getOwner()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.concurrent.locks.ReentrantReadWriteLock java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock readLock()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
</root>
libraries/stdlib/src/kotlin/concurrent/Locks.kt
+15 -3
View File
@@ -4,6 +4,7 @@ import java.util.concurrent.locks.Lock
import java.util.concurrent.locks.ReadWriteLock import java.util.concurrent.locks.ReadWriteLock
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock
import java.util.concurrent.CountDownLatch
/** /**
Executes given calculation under lock Executes given calculation under lock
@@ -24,7 +25,7 @@ Executes given calculation under read lock
Returns result of the calculation Returns result of the calculation
*/ */
public inline fun <T> ReentrantReadWriteLock.read(action: ()->T) : T { public inline fun <T> ReentrantReadWriteLock.read(action: ()->T) : T {
val rl = readLock()!! val rl = readLock()
rl.lock() rl.lock()
try { try {
return action() return action()
@@ -41,12 +42,12 @@ If such write has been initiated by checking some condition, the condition must
Returns result of the calculation Returns result of the calculation
*/ */
public inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T { public inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
val rl = readLock()!! val rl = readLock()
val readCount = if (getWriteHoldCount() == 0) getReadHoldCount() else 0 val readCount = if (getWriteHoldCount() == 0) getReadHoldCount() else 0
readCount times { rl.unlock() } readCount times { rl.unlock() }
val wl = writeLock()!! val wl = writeLock()
wl.lock() wl.lock()
try { try {
return action() return action()
@@ -56,3 +57,14 @@ public inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
wl.unlock() wl.unlock()
} }
} }
/**
Execute given calculation and await for CountDownLatch
Returns result of the calculation
*/
fun <T> Int.latch(op: CountDownLatch.() -> T) : T {
val cdl = CountDownLatch(this)
val res = cdl.op()
cdl.await()
return res
}