Reclaim CALayer asyncTransactions set, use NSMutableSet instead of he…

…avy/slow NSHashTable (TextureGroup#1510)
ArchimboldiMao · May 10, 2019 · 27fe219 · 27fe219
1 parent 7fb427e
commit 27fe219
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/Source/Details/Transactions/_ASAsyncTransactionContainer+Private.h b/Source/Details/Transactions/_ASAsyncTransactionContainer+Private.h
@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class _ASAsyncTransaction;
 
 @interface CALayer (ASAsyncTransactionContainerTransactions)
-@property (nonatomic, nullable, setter=asyncdisplaykit_setAsyncLayerTransactions:) NSHashTable<_ASAsyncTransaction *> *asyncdisplaykit_asyncLayerTransactions;
+@property (nonatomic, nullable, setter=asyncdisplaykit_setAsyncLayerTransactions:) NSMutableSet<_ASAsyncTransaction *> *asyncdisplaykit_asyncLayerTransactions;
 
 - (void)asyncdisplaykit_asyncTransactionContainerWillBeginTransaction:(_ASAsyncTransaction *)transaction;
 - (void)asyncdisplaykit_asyncTransactionContainerDidCompleteTransaction:(_ASAsyncTransaction *)transaction;

diff --git a/Source/Details/Transactions/_ASAsyncTransactionContainer.mm b/Source/Details/Transactions/_ASAsyncTransactionContainer.mm
@@ -11,6 +11,7 @@
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
 
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
+#import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
 
@@ -49,9 +50,9 @@ - (_ASAsyncTransaction *)asyncdisplaykit_asyncTransaction
 {
   _ASAsyncTransaction *transaction = self.asyncdisplaykit_currentAsyncTransaction;
   if (transaction == nil) {
-    NSHashTable *transactions = self.asyncdisplaykit_asyncLayerTransactions;
+    NSMutableSet<_ASAsyncTransaction *> *transactions = self.asyncdisplaykit_asyncLayerTransactions;
     if (transactions == nil) {
-      transactions = [NSHashTable hashTableWithOptions:NSHashTableObjectPointerPersonality];
+      transactions = ASCreatePointerBasedMutableSet();
       self.asyncdisplaykit_asyncLayerTransactions = transactions;
     }
     __weak CALayer *weakSelf = self;
@@ -62,6 +63,10 @@ - (_ASAsyncTransaction *)asyncdisplaykit_asyncTransaction
           return;
         }
         [self.asyncdisplaykit_asyncLayerTransactions removeObject:completedTransaction];
+        if (self.asyncdisplaykit_asyncLayerTransactions.count == 0) {
+          // Reclaim object memory.
+          self.asyncdisplaykit_asyncLayerTransactions = nil;
+        }
         [self asyncdisplaykit_asyncTransactionContainerDidCompleteTransaction:completedTransaction];
       }];
     } else {
@@ -71,6 +76,10 @@ - (_ASAsyncTransaction *)asyncdisplaykit_asyncTransaction
           return;
         }
         [transactions removeObject:completedTransaction];
+        if (transactions.count == 0) {
+          // Reclaim object memory.
+          self.asyncdisplaykit_asyncLayerTransactions = nil;
+        }
         [self asyncdisplaykit_asyncTransactionContainerDidCompleteTransaction:completedTransaction];
       }];
     }

diff --git a/Source/Private/ASInternalHelpers.h b/Source/Private/ASInternalHelpers.h
@@ -117,6 +117,11 @@ ASDISPLAYNODE_INLINE AS_WARN_UNUSED_RESULT ASImageDownloaderPriority ASImageDown
 - (NSComparisonResult)asdk_inverseCompare:(NSIndexPath *)otherIndexPath;
 @end
 
+/**
+ * Create an NSMutableSet that uses pointers for hash & equality.
+ */
+AS_EXTERN NSMutableSet *ASCreatePointerBasedMutableSet(void);
+
 NS_ASSUME_NONNULL_END
 
 #ifndef AS_INITIALIZE_FRAMEWORK_MANUALLY

diff --git a/Source/Private/ASInternalHelpers.mm b/Source/Private/ASInternalHelpers.mm
@@ -257,3 +257,15 @@ - (NSComparisonResult)asdk_inverseCompare:(NSIndexPath *)otherIndexPath
 }
 
 @end
+
+NSMutableSet *ASCreatePointerBasedMutableSet()
+{
+  static CFSetCallBacks callbacks;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    callbacks = kCFTypeSetCallBacks;
+    callbacks.equal = nullptr;
+    callbacks.hash = nullptr;
+  });
+  return (__bridge_transfer NSMutableSet *)CFSetCreateMutable(NULL, 0, &callbacks);
+}