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

Merge branch 'charlesmchen/nse2021.10.23'

Browse Source
This commit is contained in:
Matthew Chen 2021-10-23 17:38:10 -03:00
commit ca407fd2ee
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
NotificationServiceExtension/NotificationService.swift
View File

@ -36,21 +36,43 @@ class NotificationService: UNNotificationServiceExtension {
private typealias ContentHandler = (UNNotificationContent) -> Void
private var contentHandler = AtomicOptional<ContentHandler>(nil)
private var logTimer: OffMainThreadTimer?
// MARK: -
private static let nseCounter = AtomicUInt(0)
private static let unfairLock = UnfairLock()
private static var _logTimer: OffMainThreadTimer?
private static var _nseCounter: Int = 0
deinit {
logTimer?.invalidate()
logTimer = nil
private static func nseDidStart() -> Int {
unfairLock.withLock {
if _logTimer == nil {
_logTimer = OffMainThreadTimer(timeInterval: 1.0, repeats: true) { _ in
Logger.info("... memoryUsage: \(LocalDevice.memoryUsage)")
}
}
_nseCounter = _nseCounter + 1
return _nseCounter
}
}
private static func nseDidComplete() -> Int {
unfairLock.withLock {
_nseCounter = _nseCounter > 0 ? _nseCounter - 1 : 0
if _nseCounter == 0, _logTimer != nil {
_logTimer?.invalidate()
_logTimer = nil
}
return _nseCounter
}
}
// MARK: -
// This method is thread-safe.
func completeSilenty(timeHasExpired: Bool = false) {
let nseCount = Self.nseCounter.decrementOrZero()
logTimer?.invalidate()
logTimer = nil
let nseCount = Self.nseDidComplete()
guard let contentHandler = contentHandler.swap(nil) else {
if DebugFlags.internalLogging {
@ -114,16 +136,10 @@ class NotificationService: UNNotificationServiceExtension {
owsAssertDebug(FeatureFlags.notificationServiceExtension)
let nseCount = Self.nseCounter.increment()
let nseCount = Self.nseDidStart()
Logger.info("Received notification in class: \(self), thread: \(Thread.current), pid: \(ProcessInfo.processInfo.processIdentifier), memoryUsage: \(LocalDevice.memoryUsage), nseCount: \(nseCount)")
owsAssertDebug(logTimer == nil)
logTimer?.invalidate()
logTimer = OffMainThreadTimer(timeInterval: 2.0, repeats: true) { _ in
Logger.info("... memoryUsage: \(LocalDevice.memoryUsage)")
}
AppReadiness.runNowOrWhenAppDidBecomeReadySync {
environment.askMainAppToHandleReceipt { [weak self] mainAppHandledReceipt in
guard !mainAppHandledReceipt else {

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

@ -266,12 +266,12 @@ public class MessageProcessor: NSObject {
guard !batchEnvelopes.isEmpty, messagePipelineSupervisor.isMessageProcessingPermitted else {
if DebugFlags.internalLogging {
Logger.info("Processing complete: \(self.queuedContentCount).")
Logger.info("Processing complete: \(self.queuedContentCount) (memoryUsage: \(LocalDevice.memoryUsage).")
}
return false
}
Logger.info("Processing batch of \(batchEnvelopes.count)/\(pendingEnvelopesCount) received envelope(s).")
Logger.info("Processing batch of \(batchEnvelopes.count)/\(pendingEnvelopesCount) received envelope(s). (memoryUsage: \(LocalDevice.memoryUsage)")
var processedEnvelopes: [PendingEnvelope] = []
SDSDatabaseStorage.shared.write { transaction in

2
SignalServiceKit/src/Util/PendingTasks.swift
View File

@ -30,7 +30,7 @@ public class PendingTasks: NSObject {
Promise.when(resolved: promises).asVoid()
}.map(on: .global()) {
if DebugFlags.internalLogging {
Logger.info("Complete \(label).")
Logger.info("Complete \(label) (memoryUsage: \(LocalDevice.memoryUsage).")
}
}
}