signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Move autoreleasepool "up" a level for clarity

Browse Source 
**I recommend reviewing this with whitespace changes disabled.**

We have some code that looks like this:

    func processAll() {
      while processNext() {}
    }

    func processNext() {
      autoreleasepool {
        process()
      }
    }

I think it's clearer to move the `autoreleasepool` "up" a level, like
this:

    func processAll() {
      while autoreleasepool(invoking: { processNext() }) {}
    }

    func processNext() {
      process()
    }

This change should have no user impact.
This commit is contained in:
Evan Hahn 2023-02-17 15:01:27 -06:00 committed by Evan Hahn
parent 036cc17ddc
commit d3ce4fa45f
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
SignalServiceKit/src/Messages/MessageProcessor.swift
View File

@ -238,7 +238,7 @@ public class MessageProcessor: NSObject {
serialQueue.async {
guard !self.isDrainingPendingEnvelopes else { return }
self.isDrainingPendingEnvelopes = true
while self.drainNextBatch() {}
while autoreleasepool(invoking: { self.drainNextBatch() }) {}
self.isDrainingPendingEnvelopes = false
if self.pendingEnvelopes.isEmpty {
NotificationCenter.default.postNotificationNameAsync(Self.messageProcessorDidFlushQueue, object: nil)
@ -251,49 +251,47 @@ public class MessageProcessor: NSObject {
assertOnQueue(serialQueue)
owsAssertDebug(isDrainingPendingEnvelopes)
return autoreleasepool {
// We want a value that is just high enough to yield perf benefits.
let kIncomingMessageBatchSize = 16
// If the app is in the background, use batch size of 1.
// This reduces the risk of us never being able to drain any
// messages from the queue. We should fine tune this number
// to yield the best perf we can get.
let batchSize = CurrentAppContext().isInBackground() ? 1 : kIncomingMessageBatchSize
let batch = pendingEnvelopes.nextBatch(batchSize: batchSize)
let batchEnvelopes = batch.batchEnvelopes
let pendingEnvelopesCount = batch.pendingEnvelopesCount
// We want a value that is just high enough to yield perf benefits.
let kIncomingMessageBatchSize = 16
// If the app is in the background, use batch size of 1.
// This reduces the risk of us never being able to drain any
// messages from the queue. We should fine tune this number
// to yield the best perf we can get.
let batchSize = CurrentAppContext().isInBackground() ? 1 : kIncomingMessageBatchSize
let batch = pendingEnvelopes.nextBatch(batchSize: batchSize)
let batchEnvelopes = batch.batchEnvelopes
let pendingEnvelopesCount = batch.pendingEnvelopesCount
guard !batchEnvelopes.isEmpty, messagePipelineSupervisor.isMessageProcessingPermitted else {
if DebugFlags.internalLogging {
Logger.info("Processing complete: \(self.queuedContentCount) (memoryUsage: \(LocalDevice.memoryUsageString).")
}
return false
guard !batchEnvelopes.isEmpty, messagePipelineSupervisor.isMessageProcessingPermitted else {
if DebugFlags.internalLogging {
Logger.info("Processing complete: \(self.queuedContentCount) (memoryUsage: \(LocalDevice.memoryUsageString).")
}
return false
}
let startTime = CACurrentMediaTime()
Logger.info("Processing batch of \(batchEnvelopes.count)/\(pendingEnvelopesCount) received envelope(s). (memoryUsage: \(LocalDevice.memoryUsageString)")
let startTime = CACurrentMediaTime()
Logger.info("Processing batch of \(batchEnvelopes.count)/\(pendingEnvelopesCount) received envelope(s). (memoryUsage: \(LocalDevice.memoryUsageString)")
var processedEnvelopes: [PendingEnvelope] = []
SDSDatabaseStorage.shared.write { transaction in
var remainingEnvelopes = batchEnvelopes
while messagePipelineSupervisor.isMessageProcessingPermitted && !remainingEnvelopes.isEmpty {
autoreleasepool {
let combinedRequest = buildNextCombinedRequest(envelopes: &remainingEnvelopes,
transaction: transaction)
let processed = handle(combinedRequest: combinedRequest,
transaction: transaction)
if processed {
let envelopes = combinedRequest.processingRequests.lazy.map { $0.pendingEnvelope }
processedEnvelopes.append(contentsOf: envelopes)
}
var processedEnvelopes: [PendingEnvelope] = []
SDSDatabaseStorage.shared.write { transaction in
var remainingEnvelopes = batchEnvelopes
while messagePipelineSupervisor.isMessageProcessingPermitted && !remainingEnvelopes.isEmpty {
autoreleasepool {
let combinedRequest = buildNextCombinedRequest(envelopes: &remainingEnvelopes,
transaction: transaction)
let processed = handle(combinedRequest: combinedRequest,
transaction: transaction)
if processed {
let envelopes = combinedRequest.processingRequests.lazy.map { $0.pendingEnvelope }
processedEnvelopes.append(contentsOf: envelopes)
}
}
}
pendingEnvelopes.removeProcessedEnvelopes(processedEnvelopes)
let duration = CACurrentMediaTime() - startTime
Logger.info(String.init(format: "Processed %.0d envelopes in %0.2fms -> %.2f envelopes per second", batchEnvelopes.count, duration * 1000, duration > 0 ? Double(batchEnvelopes.count) / duration : 0))
return true
}
pendingEnvelopes.removeProcessedEnvelopes(processedEnvelopes)
let duration = CACurrentMediaTime() - startTime
Logger.info(String.init(format: "Processed %.0d envelopes in %0.2fms -> %.2f envelopes per second", batchEnvelopes.count, duration * 1000, duration > 0 ? Double(batchEnvelopes.count) / duration : 0))
return true
}
// If envelopes is not empty, this will emit a single request for a non-delivery receipt or one or more requests