More retain cycles

BarryDuggan · BarryDuggan · commit 4e86d81b73a0 · 2022-04-01T19:01:23.000+01:00
diff --git a/MemoryTest/Base.lproj/Main.storyboard b/MemoryTest/Base.lproj/Main.storyboard
@@ -17,10 +17,10 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UmE-Cc-1KD">
-                                <rect key="frame" x="162" y="270" width="148" height="31"/>
+                                <rect key="frame" x="20" y="270" width="374" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="plain" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Reset Connection"/>
                                 <connections>
                                     <action selector="clearConnection" destination="BYZ-38-t0r" eventType="touchUpInside" id="Nbh-hI-wwa"/>
                                 </connections>
diff --git a/MemoryTest/ViewController.swift b/MemoryTest/ViewController.swift
@@ -25,6 +25,10 @@ class ViewController: UIViewController {
         connection?.close()
         connection = nil
         print("CLOSED")
+        connection = RMQConnection()
+         connection?.start({
+             print("Connected")
+         })
     }
 
 
diff --git a/RMQClient.xcodeproj/xcshareddata/xcschemes/MemoryTest.xcscheme b/RMQClient.xcodeproj/xcshareddata/xcschemes/MemoryTest.xcscheme
@@ -50,23 +50,6 @@
             ReferencedContainer = "container:RMQClient.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-         <AdditionalOption
-            key = "MallocStackLogging"
-            value = ""
-            isEnabled = "YES">
-         </AdditionalOption>
-         <AdditionalOption
-            key = "PrefersMallocStackLoggingLite"
-            value = ""
-            isEnabled = "YES">
-         </AdditionalOption>
-         <AdditionalOption
-            key = "MallocScribble"
-            value = ""
-            isEnabled = "YES">
-         </AdditionalOption>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/RMQClient/RMQChannelAllocator.h b/RMQClient/RMQChannelAllocator.h
@@ -45,7 +45,7 @@
 #import "RMQSender.h"
 
 @protocol RMQChannelAllocator <NSObject>
-@property (nonatomic, readwrite) id<RMQSender> sender;
+@property (nonatomic,weak, readwrite) id<RMQSender> sender;
 - (id<RMQChannel>)allocate;
 - (void)releaseChannelNumber:(NSNumber *)channelNumber;
 - (NSArray<id<RMQChannel>> *)allocatedUserChannels;
diff --git a/RMQClient/RMQConnection.m b/RMQClient/RMQConnection.m
@@ -706,6 +706,7 @@ - (NSArray *)closeOperationsWithoutBlock {
               ^{[self.heartbeatSender stop];},
               ^{
                   self.transport.delegate = nil;
+                  [self.transport cleanup];
                   [self.transport close];
               },
               ^{
@@ -725,6 +726,7 @@ - (NSArray *)closeOperations {
               ^{[self.heartbeatSender stop];},
               ^{
                   self.transport.delegate = nil;
+                  [self.transport cleanup];
                   [self.transport close];
               },
               ^{
diff --git a/RMQClient/RMQReader.m b/RMQClient/RMQReader.m
@@ -104,17 +104,18 @@ - (void)handleMethodFrame:(RMQFrame *)frame {
 }
 
 - (void)readBodiesForIncompleteFrameset:(RMQFrameset *)contentFrameset {
+    __weak id this = self;
     [self.transport readFrame:^(NSData * _Nonnull data) {
         RMQFrame *frame = [self frameWithData:data];
-
+        __strong typeof(self) strongThis = this;
         if ([frame.payload isKindOfClass:[RMQContentBody class]]) {
-            [self frameset:contentFrameset
+            [this frameset:contentFrameset
               addBodyFrame:frame];
         } else {
-            [self.frameHandler handleFrameset:contentFrameset];
+            [strongThis.frameHandler handleFrameset:contentFrameset];
             RMQFrameset *nonContentFrameset = [[RMQFrameset alloc] initWithChannelNumber:contentFrameset.channelNumber
                                                                                   method:(id <RMQMethod>)frame.payload];
-            [self.frameHandler handleFrameset:nonContentFrameset];
+            [strongThis.frameHandler handleFrameset:nonContentFrameset];
         }
     }];
 }
diff --git a/RMQClient/RMQSuspendResumeDispatcher.m b/RMQClient/RMQSuspendResumeDispatcher.m
@@ -46,7 +46,7 @@
 
 @interface RMQSuspendResumeDispatcher ()
 @property (nonatomic, readwrite) id<RMQChannel> channel;
-@property (nonatomic, readwrite) id<RMQSender> sender;
+@property (nonatomic,weak, readwrite) id<RMQSender> sender;
 @property (nonatomic, readwrite) RMQFramesetValidator *validator;
 @property (nonatomic, readwrite) id<RMQLocalSerialQueue> commandQueue;
 @property (nonatomic, readwrite) id<RMQLocalSerialQueue> enablementQueue;
diff --git a/RMQClient/RMQSynchronizedMutableDictionary.h b/RMQClient/RMQSynchronizedMutableDictionary.h
@@ -47,4 +47,5 @@
 - (nullable id)objectForKeyedSubscript:(nonnull id)key;
 - (void)setObject:(nonnull id)obj forKeyedSubscript:(nonnull id)key;
 - (void)removeObjectForKey:(nonnull id)key;
+- (void)removeAllObjects;
 @end
diff --git a/RMQClient/RMQSynchronizedMutableDictionary.m b/RMQClient/RMQSynchronizedMutableDictionary.m
@@ -79,5 +79,11 @@ - (void)removeObjectForKey:(id)key {
         self.count--;
     }
 }
+- (void)removeAllObjects {
+    @synchronized (self.lock) {
+        [self.backingDictionary removeAllObjects];
+        self.count = 0;
+    }
+}
 
 @end
diff --git a/RMQClient/RMQTCPSocketTransport.m b/RMQClient/RMQTCPSocketTransport.m
@@ -229,6 +229,9 @@ - (void)invokeZeroArityCallback:(long)tag {
         foundCallback();
     }
 }
+- (void)cleanup {
+    [self.callbacks removeAllObjects];
+}
 
 - (BOOL)tlsUpgradeWithError:(NSError **)error {
     NSArray *certificates = [self.tlsOptions certificatesWithError:error];
diff --git a/RMQClient/RMQTransport.h b/RMQClient/RMQTransport.h
@@ -54,4 +54,5 @@
 - (BOOL)isConnected;
 /// @brief Returns true if the transport is not connected
 - (BOOL)isDisconnected;
+- (void)cleanup;
 @end
diff --git a/RMQClientTests/ControlledInteractionTransport.swift b/RMQClientTests/ControlledInteractionTransport.swift
@@ -68,6 +68,9 @@ enum TestDoubleTransportError: Error {
         connected = false
         delegate?.transport(self, disconnectedWithError: nil)
     }
+    func cleanup() {
+    
+    }
 
     func write(_ data: Data) {
         outboundData.append(data)

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@ class ViewController: UIViewController {`
`25`	`25`	`connection?.close()`
`26`	`26`	`connection = nil`
`27`	`27`	`print("CLOSED")`
	`28`	`+ connection = RMQConnection()`
	`29`	`+ connection?.start({`
	`30`	`+ print("Connected")`
	`31`	`+ })`
`28`	`32`	`}`
`29`	`33`
`30`	`34`
Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,11 @@ - (void)removeObjectForKey:(id)key {`
`79`	`79`	`self.count--;`
`80`	`80`	`}`
`81`	`81`	`}`
	`82`	`+- (void)removeAllObjects {`
	`83`	`+ @synchronized (self.lock) {`
	`84`	`+ [self.backingDictionary removeAllObjects];`
	`85`	`+ self.count = 0;`
	`86`	`+ }`
	`87`	`+}`
`82`	`88`
`83`	`89`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,9 @@ - (void)invokeZeroArityCallback:(long)tag {`
`229`	`229`	`foundCallback();`
`230`	`230`	`}`
`231`	`231`	`}`
	`232`	`+- (void)cleanup {`
	`233`	`+ [self.callbacks removeAllObjects];`
	`234`	`+}`
`232`	`235`
`233`	`236`	`- (BOOL)tlsUpgradeWithError:(NSError **)error {`
`234`	`237`	`NSArray *certificates = [self.tlsOptions certificatesWithError:error];`