Merge pull request #589 from mixpanel/jared-multi-pr-pick

Various Community PRs

Author: jaredmixpanel

Sources/AutomaticEvents.swift

@@ -45,7 +45,7 @@ class AutomaticEvents: NSObject, SKPaymentTransactionObserver, SKProductsRequest
     var sessionStartTime: TimeInterval = Date().timeIntervalSince1970
     var hasAddedObserver = false
 
-    let awaitingTransactionsWriteLock = DispatchQueue(label: "com.mixpanel.awaiting_transactions_writeLock", qos: .userInitiated)
+    let awaitingTransactionsWriteLock = DispatchQueue(label: "com.mixpanel.awaiting_transactions_writeLock", qos: .userInitiated, autoreleaseFrequency: .workItem)
 
     func initializeEvents(instanceName: String) {
         let legacyFirstOpenKey = "MPFirstOpen"

Sources/Flush.swift

@@ -44,7 +44,7 @@ class Flush: AppLifecycle {
 
     required init(basePathIdentifier: String) {
         self.flushRequest = FlushRequest(basePathIdentifier: basePathIdentifier)
-        flushIntervalReadWriteLock = DispatchQueue(label: "com.mixpanel.flush_interval.lock", qos: .utility, attributes: .concurrent)
+        flushIntervalReadWriteLock = DispatchQueue(label: "com.mixpanel.flush_interval.lock", qos: .utility, attributes: .concurrent, autoreleaseFrequency: .workItem)
     }
 
     func flushQueue(_ queue: Queue, type: FlushType) {
@@ -56,17 +56,18 @@ class Flush: AppLifecycle {
 
     func startFlushTimer() {
         stopFlushTimer()
-        if flushInterval > 0 {
-            DispatchQueue.main.async { [weak self] in
-                guard let self = self else {
-                    return
-                }
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else {
+                return
+            }
 
+            if self.flushInterval > 0 {
+                self.timer?.invalidate()
                 self.timer = Timer.scheduledTimer(timeInterval: self.flushInterval,
-                                                     target: self,
-                                                     selector: #selector(self.flushSelector),
-                                                     userInfo: nil,
-                                                     repeats: true)
+                                                  target: self,
+                                                  selector: #selector(self.flushSelector),
+                                                  userInfo: nil,
+                                                  repeats: true)
             }
         }
     }

Sources/Mixpanel.swift

@@ -166,7 +166,7 @@ final class MixpanelManager {
         instances = [String: MixpanelInstance]()
         Logger.addLogging(PrintLogging())
         readWriteLock = ReadWriteLock(label: "com.mixpanel.instance.manager.lock")
-        instanceQueue = DispatchQueue(label: "com.mixpanel.instance.manager.instance", qos: .utility)
+        instanceQueue = DispatchQueue(label: "com.mixpanel.instance.manager.instance", qos: .utility, autoreleaseFrequency: .workItem)
     }
 
     func initialize(token apiToken: String,

Sources/MixpanelInstance.swift

@@ -231,8 +231,8 @@ open class MixpanelInstance: CustomDebugStringConvertible, FlushDelegate, AEDele
         )
 #endif
         let label = "com.mixpanel.\(self.apiToken)"
-        trackingQueue = DispatchQueue(label: "\(label).tracking)", qos: .utility)
-        networkQueue = DispatchQueue(label: "\(label).network)", qos: .utility)
+        trackingQueue = DispatchQueue(label: "\(label).tracking)", qos: .utility, autoreleaseFrequency: .workItem)
+        networkQueue = DispatchQueue(label: "\(label).network)", qos: .utility, autoreleaseFrequency: .workItem)
         self.name = name
 
         mixpanelPersistence = MixpanelPersistence.init(instanceName: name)
@@ -1164,7 +1164,12 @@ extension MixpanelInstance {
      - parameter event: the name of the event to be tracked that was passed to time(event:)
      */
     public func eventElapsedTime(event: String) -> Double {
-        if let startTime = self.timedEvents[event] as? TimeInterval {
+        var timedEvents = InternalProperties()
+        self.readWriteLock.read {
+            timedEvents = self.timedEvents
+        }
+        
+        if let startTime = timedEvents[event] as? TimeInterval {
             return Date().timeIntervalSince1970 - startTime
         }
         return 0

Sources/ReadWriteLock.swift

@@ -8,19 +8,19 @@
 import Foundation
 
 class ReadWriteLock {
-    let concurentQueue: DispatchQueue
+    private let concurrentQueue: DispatchQueue
 
     init(label: String) {
-        self.concurentQueue = DispatchQueue(label: label, qos: .utility, attributes: .concurrent)
+        concurrentQueue = DispatchQueue(label: label, qos: .utility, attributes: .concurrent, autoreleaseFrequency: .workItem)
     }
 
     func read(closure: () -> Void) {
-        self.concurentQueue.sync {
+        concurrentQueue.sync {
             closure()
         }
     }
     func write(closure: () -> Void) {
-        self.concurentQueue.sync(flags: .barrier, execute: {
+        concurrentQueue.sync(flags: .barrier, execute: {
             closure()
         })
     }