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

Try to cancel jar processing if some thread do it already

Browse Source
This commit is contained in:
Nikolay Krasko
2015-10-23 20:56:34 +03:00
parent d0e01153ec
commit 5d1bcbf2be
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JarUserDataManager.kt
+12 -4
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.io.URLUtil import com.intellij.util.io.URLUtil
import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runReadAction
import java.util.concurrent.atomic.AtomicBoolean
public object JarUserDataManager { public object JarUserDataManager {
enum class State { enum class State {
@@ -34,7 +35,7 @@ public object JarUserDataManager {
val version = 2 val version = 2
val fileAttributeService: FileAttributeService? = ServiceManager.getService(javaClass<FileAttributeService>()) val fileAttributeService: FileAttributeService? = ServiceManager.getService(FileAttributeService::class.java)
public fun register(counter: JarBooleanPropertyCounter) { public fun register(counter: JarBooleanPropertyCounter) {
fileAttributeService?.register(counter.key.toString(), version) fileAttributeService?.register(counter.key.toString(), version)
@@ -51,7 +52,7 @@ public object JarUserDataManager {
} }
if (stored == null && fileAttributeService != null) { if (stored == null && fileAttributeService != null) {
val savedData = fileAttributeService.readAttribute(counter.key.toString(), localJarFile, javaClass<State>()) val savedData = fileAttributeService.readAttribute(counter.key.toString(), localJarFile, State::class.java)
if (savedData != null && savedData.value != null) { if (savedData != null && savedData.value != null) {
val hasFileWithProperty = savedData.value == State.HAS_FILE val hasFileWithProperty = savedData.value == State.HAS_FILE
@@ -77,6 +78,13 @@ public object JarUserDataManager {
ApplicationManager.getApplication().executeOnPooledThread { ApplicationManager.getApplication().executeOnPooledThread {
runReadAction { runReadAction {
val data = localJarFile.getUserData(counter.key)
if (data != null &&
((data.hasFileWithProperty != null && localJarFile.timeStamp == data.timestamp) || !data.isProcessStarted.compareAndSet(false, true))) {
// Processing has started in some other thread or is already finished
return@runReadAction
}
val hasFileWithProperty = !VfsUtilCore.processFilesRecursively(jarFile) { file -> val hasFileWithProperty = !VfsUtilCore.processFilesRecursively(jarFile) { file ->
!counter.hasProperty(file) !counter.hasProperty(file)
} }
@@ -96,7 +104,7 @@ public object JarUserDataManager {
assert((timestamp == null) == (hasFileWithProperty == null)) { "Using empty timestamp is only allowed for storing not counted value" } assert((timestamp == null) == (hasFileWithProperty == null)) { "Using empty timestamp is only allowed for storing not counted value" }
localJarFile.putUserData(counter.key, localJarFile.putUserData(counter.key,
PropertyData(hasFileWithProperty, timestamp ?: localJarFile.timeStamp)) PropertyData(hasFileWithProperty, timestamp ?: localJarFile.timeStamp, isProcessStarted = AtomicBoolean(false)))
} }
object JarFileSystemUtil { object JarFileSystemUtil {
@@ -122,7 +130,7 @@ public object JarUserDataManager {
} }
} }
data class PropertyData(val hasFileWithProperty: Boolean?, val timestamp: Long) data class PropertyData(val hasFileWithProperty: Boolean?, val timestamp: Long, val isProcessStarted: AtomicBoolean)
abstract class JarBooleanPropertyCounter(keyName: String) { abstract class JarBooleanPropertyCounter(keyName: String) {
val key: Key<PropertyData> = Key.create<PropertyData>(keyName) val key: Key<PropertyData> = Key.create<PropertyData>(keyName)