MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[es] consume source folder change events in a thread-safe way IDEA-350259

Browse Source 
Consumer invocations may result in new operations arriving in `operationStates`, so it has to be a queue, not a simple list. Also fix usage of coroutine scope.

GitOrigin-RevId: b170d1f6cf7dc2f5f2c0617aba0f88a4a6dbed6d
This commit is contained in:
Nikita.Skvortsov
2024-07-15 18:41:18 +00:00
committed by intellij-monorepo-bot
parent 838f0c4808
commit 25b01bf1db
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/SourceFolderManagerImpl.kt
+9 -6
View File
@@ -42,6 +42,8 @@ import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.jps.model.module.JpsModuleSourceRootType
import java.util.concurrent.ArrayBlockingQueue
import java.util.concurrent.BlockingQueue
import java.util.concurrent.Future
@ApiStatus.Internal
@@ -57,7 +59,7 @@ class SourceFolderManagerImpl(private val project: Project,
private var sourceFolders = CanonicalPathPrefixTreeFactory.createMap<SourceFolderModel>()
private var sourceFoldersByModule = HashMap<String, ModuleModel>()
private val operationsStates = mutableListOf<Future<*>>()
private val operationsStates: BlockingQueue<Future<*>> = ArrayBlockingQueue(16)
@OptIn(ExperimentalCoroutinesApi::class)
private val refreshFilesDispatcher = Dispatchers.IO.limitedParallelism(3)
@@ -173,7 +175,7 @@ class SourceFolderManagerImpl(private val project: Project,
}
val application = ApplicationManager.getApplication()
val future = (project as ComponentManagerEx).getCoroutineScope().async {
val future = cs.async {
blockingContext {
updateSourceFolders(sourceFoldersToChange)
}
@@ -181,8 +183,8 @@ class SourceFolderManagerImpl(private val project: Project,
if (application.isUnitTestMode) {
ThreadingAssertions.assertEventDispatchThread()
operationsStates.removeIf { it.isDone }
operationsStates.add(future)
future.whenComplete { _, _ -> operationsStates.remove(future) }
}
}
@@ -326,9 +328,10 @@ class SourceFolderManagerImpl(private val project: Project,
fun consumeBulkOperationsState(stateConsumer: (Future<*>) -> Unit) {
ThreadingAssertions.assertEventDispatchThread()
assert(ApplicationManager.getApplication().isUnitTestMode)
for (operationsState in operationsStates) {
stateConsumer.invoke(operationsState)
}
do {
val operation = operationsStates.poll() ?: break
stateConsumer.invoke(operation)
} while (true)
}
companion object {