Skip to content

Stop keeping every generation of a module alive in the daemon #1024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hxreborn wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −6
Open

Stop keeping every generation of a module alive in the daemon #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions daemon/src/main/kotlin/org/matrix/vector/daemon/data/ConfigCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ object ConfigCache {
(oldState.modules.keys - newModules.keys).forEach {
FrameworkService.forgetHotReloadTargets(it)
}
ModuleAppService.forgetReplacedModules(newModules)
FrameworkService.backfillLoadedVersions()

// Ask stale opt-in targets to load the generation that was just installed.
Expand Down
20 changes: 14 additions & 6 deletions daemon/src/main/kotlin/org/matrix/vector/daemon/ipc/ModuleAppService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import io.github.libxposed.service.IHotReloadCallback
import io.github.libxposed.service.IXposedScopeCallback
import io.github.libxposed.service.IXposedService
import java.io.Serializable
import java.util.Collections
import java.util.WeakHashMap
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.CountDownLatch
import java.util.concurrent.Executors
Expand Down Expand Up @@ -109,8 +107,18 @@ class ModuleAppService(private val loadedModule: LoadedModule) : IXposedService.
*/
private val deliveryLock = Any()

private val serviceMap =
Collections.synchronizedMap(WeakHashMap<LoadedModule, ModuleAppService>())
private val serviceMap = ConcurrentHashMap<String, ModuleAppService>()

private fun serviceFor(module: LoadedModule): ModuleAppService =
serviceMap.compute(module.packageName) { _, current ->
current?.takeIf { it.loadedModule === module } ?: ModuleAppService(module)
}!!

fun forgetReplacedModules(modules: Map<String, LoadedModule>) {
serviceMap.entries.removeIf { (packageName, service) ->
modules[packageName] !== service.loadedModule
}
}

/**
* Consecutive failed sends per uid, and when the last one was.
Expand Down Expand Up @@ -171,7 +179,7 @@ class ModuleAppService(private val loadedModule: LoadedModule) : IXposedService.
sending.remove(uid, attempt)
return
}
val service = serviceMap.getOrPut(module) { ModuleAppService(module) }
val service = serviceFor(module)
// Off the observer thread, and never inline: see [binderExecutor]. Caught, because a uid
// left in [sending] by a rejected submission is one this never looks at again.
runCatching {
Expand Down Expand Up @@ -300,7 +308,7 @@ class ModuleAppService(private val loadedModule: LoadedModule) : IXposedService.
// Drives the same cycle as a service request, so onHotReloading can still refuse it.
fun autoHotReload(module: LoadedModule) {
if (!module.code.autoHotReload) return
val service = serviceMap.getOrPut(module) { ModuleAppService(module) }
val service = serviceFor(module)
FrameworkService.staleHotReloadTargets(module.packageName).forEach { target ->
if (target.hotReloadable && FrameworkService.beginHotReload(target)) {
Log.d(TAG, "Auto hot reloading ${module.packageName} in ${target.processName}")
Expand Down