mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 12:28:40 +00:00
perf(agent): run diagnostic cleanup off startup thread (#2147)
* perf(agent): run stage cleanup off startup thread * fix(agent): preserve active diagnostic stages * test(agent): verify active stage locks cross-process
This commit is contained in:
1 parent
6a681bcbc2
commit
c8a76e7cce
4 files changed
+61
-7
No files matched your search
@@ -17,7 +17,7 @@ class App : Application() {
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
runCatching { EnhancedSessionLogShare.cleanupAbandonedStages(this) }
|
||||
Thread({ runCatching { EnhancedSessionLogShare.cleanupAbandonedStages(this) } }, "diagnostic-stage-cleanup").start()
|
||||
com.droiddeck.launcher.ui.Themes.loadGradient(this)
|
||||
com.droiddeck.launcher.ui.BuildWatermark.install(this)
|
||||
HomeApp.trackRecents(this)
|
||||
|
||||
@@ -51,17 +51,21 @@ internal object EnhancedSessionLogShare {
|
||||
|
||||
internal class DiagnosticStageLease internal constructor(
|
||||
val directory: File,
|
||||
private val canonicalPath: String,
|
||||
private val channel: FileChannel,
|
||||
private val lock: FileLock,
|
||||
) : Closeable {
|
||||
override fun close() {
|
||||
try {
|
||||
lock.release()
|
||||
} finally {
|
||||
synchronized(stageLifecycleMonitor) {
|
||||
activeStagePaths.remove(canonicalPath)
|
||||
try {
|
||||
channel.close()
|
||||
lock.release()
|
||||
} finally {
|
||||
directory.deleteRecursively()
|
||||
try {
|
||||
channel.close()
|
||||
} finally {
|
||||
directory.deleteRecursively()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -117,6 +121,7 @@ internal object EnhancedSessionLogShare {
|
||||
override fun initialValue(): SecureSourceOpener? = null
|
||||
}
|
||||
private val stageLifecycleMonitor = Any()
|
||||
private val activeStagePaths = mutableSetOf<String>()
|
||||
|
||||
internal fun acquireDiagnosticStage(context: Context, outputName: String): DiagnosticStageLease {
|
||||
val cache = context.cacheDir
|
||||
@@ -133,7 +138,9 @@ internal object EnhancedSessionLogShare {
|
||||
try {
|
||||
val lock = channel.tryLock()
|
||||
?: throw IOException("Could not lock the diagnostic staging directory")
|
||||
DiagnosticStageLease(stage, channel, lock)
|
||||
val canonicalPath = stage.canonicalPath
|
||||
activeStagePaths += canonicalPath
|
||||
DiagnosticStageLease(stage, canonicalPath, channel, lock)
|
||||
} catch (error: Exception) {
|
||||
channel.close()
|
||||
stage.deleteRecursively()
|
||||
@@ -149,6 +156,7 @@ internal object EnhancedSessionLogShare {
|
||||
cache.listFiles()?.forEach { stage ->
|
||||
if (!stage.isDirectory || Files.isSymbolicLink(stage.toPath()) ||
|
||||
stage.canonicalFile.parentFile != canonicalCache || !isDiagnosticStage(stage.name)) return@forEach
|
||||
if (stage.canonicalPath in activeStagePaths) return@forEach
|
||||
val active = File(stage, ".active")
|
||||
if (Files.isSymbolicLink(active.toPath())) return@forEach
|
||||
val channel = runCatching {
|
||||
|
||||
Reference in new issue
Block a user