neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-17 02:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes (de-)activating apps deadlock

Browse Source 
729b2a1f made all serial operations execute in FIFO order. This caused circular dependencies between BackupAppOperation and InstallAppOperation, resulting in (de-)activating apps never finishing.

Now, we ensure InstallAppOperations that are reinstalling AltStore always execute last in a context, but other serial operations may run in any order they become ready.
This commit is contained in:
Riley Testut
2021-03-09 13:13:23 -06:00
parent 07f8c38820
commit 3f09a79645
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
AltStore/Managing Apps/AppManager.swift
View File

@@ -1403,9 +1403,9 @@ private extension AppManager
func run(_ operations: [Foundation.Operation], context: OperationContext?, requiresSerialQueue: Bool = false) func run(_ operations: [Foundation.Operation], context: OperationContext?, requiresSerialQueue: Bool = false)
{ {
// Reference to previous serial operation in context used to enforce FIFO, // Find "Install AltStore" operation if it already exists in `context`
// even if the operations become ready in a different order than submitted. // so we can ensure it runs after any additional serial operations in `operations`.
var previousSerialOperation: Foundation.Operation? = context?.operations.allObjects.filter { self.serialOperationQueue.operations.contains($0) }.last let installAltStoreOperation = context?.operations.allObjects.lazy.compactMap { $0 as? InstallAppOperation }.first { $0.context.bundleIdentifier == StoreApp.altstoreAppID }
for operation in operations for operation in operations
{ {
@@ -1413,16 +1413,20 @@ private extension AppManager
{ {
case _ where requiresSerialQueue: fallthrough case _ where requiresSerialQueue: fallthrough
case is InstallAppOperation, is RefreshAppOperation, is BackupAppOperation: case is InstallAppOperation, is RefreshAppOperation, is BackupAppOperation:
if let previousOperation = previousSerialOperation if let installAltStoreOperation = operation as? InstallAppOperation, installAltStoreOperation.context.bundleIdentifier == StoreApp.altstoreAppID
{ {
// Add dependency on previous serial operation to enforce FIFO. // Add dependencies on previous serial operations in `context` to ensure re-installing AltStore goes last.
operation.addDependency(previousOperation) let previousSerialOperations = context?.operations.allObjects.filter { self.serialOperationQueue.operations.contains($0) }
previousSerialOperations?.forEach { installAltStoreOperation.addDependency($0) }
}
else if let installAltStoreOperation = installAltStoreOperation
{
// Re-installing AltStore should _always_ be the last serial operation in `context`.
installAltStoreOperation.addDependency(operation)
} }
self.serialOperationQueue.addOperation(operation) self.serialOperationQueue.addOperation(operation)
previousSerialOperation = operation
default: self.operationQueue.addOperation(operation) default: self.operationQueue.addOperation(operation)
} }