brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race conditions for cancellables

Browse Source
This commit is contained in:
Mygod
2021-08-22 02:20:02 -04:00
parent c9fd19985c
commit fb8538ecbe
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
View File

@@ -400,6 +400,7 @@ class RootServer {
CoroutineScope(Dispatchers.Main.immediate + job) CoroutineScope(Dispatchers.Main.immediate + job)
} }
val callbackWorker = newSingleThreadContext("callbackWorker") val callbackWorker = newSingleThreadContext("callbackWorker")
// access to cancellables shall be wrapped in defaultWorker
val cancellables = LongSparseArray<() -> Unit>() val cancellables = LongSparseArray<() -> Unit>()
// thread safety: usage of output should be guarded by callbackWorker // thread safety: usage of output should be guarded by callbackWorker
@@ -424,7 +425,7 @@ class RootServer {
val callback = counter val callback = counter
Logger.me.d("Received #$callback: $command") Logger.me.d("Received #$callback: $command")
when (command) { when (command) {
is CancelCommand -> cancellables[command.index]?.invoke() is CancelCommand -> defaultWorker.launch { cancellables[command.index]?.invoke() }
is RootCommandOneWay -> defaultWorker.launch { is RootCommandOneWay -> defaultWorker.launch {
try { try {
command.execute() command.execute()
@@ -434,8 +435,8 @@ class RootServer {
} }
is RootCommand<*> -> { is RootCommand<*> -> {
val commandJob = Job() val commandJob = Job()
cancellables.append(callback) { commandJob.cancel() }
defaultWorker.launch(commandJob) { defaultWorker.launch(commandJob) {
cancellables.append(callback) { commandJob.cancel() }
val result = try { val result = try {
val result = command.execute(); val result = command.execute();
{ output.pushResult(callback, result) } { output.pushResult(callback, result) }