• Removed the property from SSYOperation and SSYOperationQueue. Even though this was an 'assign' property, and therefore not causing memory retain cycles, it created a lot of noise in Xcode's new memory graph debugger and, in general, it was never a very good programming practice since there is almost always a better way to reference an 'owner'.

• Removed -[SSYOperationQueue tearDown] because its only purpose was to release the now-gone 'owner'.
• In -[SSYOperationQueue queueGroup:::::::::], removed a local variable 'operations' which appears to have been not used for a long time.

Author: jerrykrinock

SSYOperation.h

@@ -1,5 +1,4 @@
 #import <Cocoa/Cocoa.h>
-#import "SSYOwnee.h"
 
 @class SSYOperationQueue ;
 
@@ -26,11 +25,10 @@
  if these two values are equal as judged by +[SSYOperationQueue 
  operationGroupsDifferInfo:otherInfo:],
  */
-@interface SSYOperation : NSOperation <SSYOwnee> {
+@interface SSYOperation : NSOperation {
 	NSMutableDictionary* m_info ;
 	SEL m_selector ;
 	id m_target ;
-	id m_owner ; // weak
 	SSYOperationQueue* m_operationQueue ;  // weak
 	NSInvocation* m_cancellor ;
 	BOOL m_skipIfError ;
@@ -76,7 +74,6 @@
 - (id)initWithInfo:(NSMutableDictionary*)info
 			target:(id)target
 		  selector:(SEL)selector
-			 owner:(id)owner
 	operationQueue:(SSYOperationQueue*)operationQueue
 	   skipIfError:(BOOL)abortIfError ;
 

SSYOperation.m

@@ -60,14 +60,6 @@ @implementation SSYOperation
 @synthesize skipIfError = m_skipIfError ;
 @synthesize lock = m_lock ;
 
-- (id)owner {
-	return m_owner ;
-}
-
-- (void)setOwner:(id)owner {
-	m_owner = owner ;
-}
-
 - (void)cancel {
 	[[self cancellor] invoke] ;
     [self setInfo:nil];
@@ -87,7 +79,6 @@ - (void)dealloc {
 - (id)initWithInfo:(NSMutableDictionary*)info
 			target:(id)target
 		  selector:(SEL)selector
-			 owner:(id)owner
 	operationQueue:(SSYOperationQueue*)operationQueue
 	   skipIfError:(BOOL)skipIfError {
 	self = [super init] ;
@@ -96,7 +87,6 @@ - (id)initWithInfo:(NSMutableDictionary*)info
 		[self setInfo:info] ;
 		[self setSelector:selector] ;
 		[self setTarget:target] ;
-		[self setOwner:owner] ;
 		[self setOperationQueue:operationQueue] ;
 		[self setSkipIfError:skipIfError] ;
 	}
@@ -238,14 +228,13 @@ - (void)main {
 	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init] ;
 #if LOGGING_SSYOPERATIONLINKER_OPERATIONS
     NSString* msg = [NSString stringWithFormat:
-                     @"RunOp: %p grp=%@ prevErr=%ld nQ=%ld sel=%@ isCnc=%hhd owr=%p",
+                     @"RunOp: %p grp=%@ prevErr=%ld nQ=%ld sel=%@ isCnc=%hhd",
                      self,
                      [[self info] objectForKey:constKeySSYOperationGroup],
                      (long)[[self error] code],
                      (long)[[[self operationQueue] operations] count], // nQ = number in queue
                      NSStringFromSelector([self selector]),
-                     [self isCancelled],
-                     [self owner]];
+                     [self isCancelled]];
     [[BkmxBasis sharedBasis] logMessage:msg];
 #endif
 
@@ -277,19 +266,19 @@ - (void)main {
 				// Chain operations have been aborted.
 				// This method becomes a no-op.
 #if LOGGING_SSYOPERATIONLINKER_OPERATIONS
-                [[BkmxBasis sharedBasis] logMessage:@"RunOp: Skipping %@ cuz error owr=%p", NSStringFromSelector([self selector]), [self owner]];
+                [[BkmxBasis sharedBasis] logMessage:@"RunOp: Skipping %@ cuz error op=%p", NSStringFromSelector([self selector]), self];
 #endif
 			}
 		}
 		else {
 #if LOGGING_SSYOPERATIONLINKER_OPERATIONS
-            [[BkmxBasis sharedBasis] logMessage:@"RunOp: Skipping %@ cuz skip group %@ owr=%p", NSStringFromSelector([self selector]), [[self info] objectForKey:constKeySSYOperationGroup], [self owner]];
+            [[BkmxBasis sharedBasis] logMessage:@"RunOp: Skipping %@ cuz skip group %@ op=%p", NSStringFromSelector([self selector]), [[self info] objectForKey:constKeySSYOperationGroup], self];
 #endif
 		}
 	}
 	else {
 #if LOGGING_SSYOPERATIONLINKER_OPERATIONS
-        [[BkmxBasis sharedBasis] logMessage:@"RunOp: Skipping %@ cuz cancelled owr=%p", NSStringFromSelector([self selector]), [self owner]];
+        [[BkmxBasis sharedBasis] logMessage:@"RunOp: Skipping %@ cuz cancelled op=%p", NSStringFromSelector([self selector]), self];
 #endif
 	}
 

SSYOperationQueue.h

@@ -12,12 +12,7 @@ extern NSString* const constKeySSYOperationQueueDoneSelectorName ;
  @brief    Name of a notification, enqueued on the main thread, when the
  number of tasks in the receiver's queue increases from 0.
 
- @details  The notification object is the -owner of the first
- operation in the queue, which may be nil if it was
- so set, or if this operation does not respond to selector
- -owner (as could happen if superclass methods were used to
- add the operation), then the notification object is the
- receiver.
+ @details  The notification object is the receiver.
  
  There is no userInfo dictionary.
  
@@ -40,12 +35,7 @@ extern NSString* const SSYOperationQueueDidBeginWorkNotification ;
  @brief    Name of a notification, enqueued on the main thread, when the
  number of tasks in the receiver's queue decreases to 0.
  
- @details  The notification object is the -owner of the last
- operation which was in the queue, which may be nil if it was
- so set.  But if this operation does not respond to selector
- -owner (as could happen if superclass methods were used to
- add the operation), then the notification object is the
- sending SSYOperationQueue object.
+ @details  The notification object is the receiver.
  
  There is no userInfo dictionary.
 
@@ -56,7 +46,7 @@ extern NSString* const SSYOperationQueueDidEndWorkNotification ;
 @interface SSYOperationQueue : NSOperationQueue {
 	// Note that we do not enter the doneTarget, doneSelector and
 	// doneThread as instance variables, because they may be different
-	// for each group of operations entered with queueGroup:::::::::.
+	// for each group of operations entered with queueGroup::::::::.
 	// But the following instance variables are common to all groups...
 	NSError* m_error ;	
 	NSScriptCommand* m_scriptCommand ;
@@ -218,10 +208,6 @@ extern NSString* const SSYOperationQueueDidEndWorkNotification ;
  immediately, after queueing the operations.  This method simply sends 
  -waitUntilAllOperationsAreFinished to your <i>queue</i>.  Again, if you
  pass NO, remember to retain the arguments <i>queue</i> and <i>info</i>.
- @param    owner  An object which will be passed as the 'owner' to each of
- the SSYOperations which are manufactured by the receiver during execution
- of this method, including the `done` operation which encasulates the
- doneThread, doneTarget and doneSelector.
  @param    doneThread  The thread in which a message will be sent after
  the last operation in selectorNames is completed.  If doneThread is nil,
  the default thread assumed will be the currentThread (the thread on which
@@ -252,7 +238,6 @@ extern NSString* const SSYOperationQueueDidEndWorkNotification ;
      selectorNames:(NSArray*)selectorNames
               info:(NSMutableDictionary*)info
              block:(BOOL)block
-             owner:(id)owner
         doneThread:(NSThread*)doneThread
         doneTarget:(id)doneTarget
       doneSelector:(SEL)doneSelector
@@ -285,13 +270,10 @@ extern NSString* const SSYOperationQueueDidEndWorkNotification ;
 - (void)doDone:(NSDictionary*)doneInfo ;
 
 /*!
- @brief    Removes an internal observer which observes the owner of the first
- operation in the receiver's queue.
+ @brief    Removes an internal observer which observes the receiver itself.
 
  @details  To prevent crashes, you should send this prior to the owner of the
  receiver's operations being deallocced.
  */
 
-- (void)tearDown;
-
 @end

SSYOperationQueue.m

@@ -20,7 +20,6 @@
 @interface SSYOperationQueue ()
 
 @property (retain) id noAppNapActivity ;
-@property (assign) BOOL didTearDown;
 
 @end
 
@@ -129,17 +128,9 @@ - (id)init {
 	return self ;
 }
 
-- (void)tearDown {
-    if (!self.didTearDown) {
-        [self removeObserver:self
-                  forKeyPath:@"operations"];
-        self.didTearDown = YES;
-    }
-}
-
 - (void)dealloc {
-    /* This should have already been done, but in case not… */
-    [self tearDown];
+    [self removeObserver:self
+              forKeyPath:@"operations"];
 
 	[m_error release] ;
 	[m_scriptCommand release] ;
@@ -177,19 +168,19 @@ + (BOOL)operationGroupsSameInfo:(NSDictionary*)info
 	return NO ;
 }
 
-- (void)postQueueDidBeginWorkForObject:(id)object {
+- (void)postQueueDidBeginWork {
 	NSNotification* notification = [NSNotification notificationWithName:SSYOperationQueueDidBeginWorkNotification
-																 object:object] ;
+																 object:self] ;
 	[[NSNotificationQueue defaultQueue] enqueueNotification:notification
 											   postingStyle:NSPostNow
 											   coalesceMask:(NSNotificationCoalescingOnName|NSNotificationCoalescingOnSender)
 												   forModes:nil] ;
 	// See header doc regarding notifications for posting style explanation
 }
 
-- (void)postQueueDidEndWorkForObject:(id)object {
+- (void)postQueueDidEndWork {
 	NSNotification* notification = [NSNotification notificationWithName:SSYOperationQueueDidEndWorkNotification
-																 object:object] ;
+																 object:self] ;
 	[[NSNotificationQueue defaultQueue] enqueueNotification:notification
 											   postingStyle:NSPostWhenIdle
 											   coalesceMask:(NSNotificationCoalescingOnName|NSNotificationCoalescingOnSender)
@@ -238,15 +229,6 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
 			[scriptCommand resumeExecutionWithResult:[self scriptResult]] ;
 			[self setScriptCommand:nil] ;
 
-			NSOperation <SSYOwnee> * operation = [oldOperations objectAtIndex:0] ;
-			id owner ;
-			if ([operation respondsToSelector:@selector(owner)]) {
-				owner = [operation owner] ;
-			}
-			else {
-				owner = self ;
-			}
-            
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
             // Being built with macOS 10.9 or later SDK
             id activity = [self noAppNapActivity] ;
@@ -267,8 +249,8 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
 			// introduction, not in -operations) that KVO notifications
 			// for -operations can occur on any thread.  However, our
 			// notifications are expected to be sent on the main thread…
-			[self performSelectorOnMainThread:@selector(postQueueDidEndWorkForObject:)
-								   withObject:owner
+			[self performSelectorOnMainThread:@selector(postQueueDidEndWork)
+								   withObject:nil
 								waitUntilDone:NO] ; // as in NO deadlocks :)
 
 			[self setSkipOperationsExceptGroups:nil] ;
@@ -279,7 +261,7 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
 			// array, the above condition *must* mean that the *count* 
 			// has just changed from 0 to some positive number.
 			// Actually, even though I add operations one at a time in
-			// queueGroup:::::::::, I see that I get one notification
+			// queueGroup:::::::, I see that I get one notification
 			// when the count jumps from 0 to, say, 5.  Apparently,
 			// KVO notifications are coalesced.
 
@@ -310,21 +292,12 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
             }
 #endif
 
-			NSOperation <SSYOwnee> * operation = [[self operations] objectAtIndex:0] ;
-			id owner ;
-			if ([operation respondsToSelector:@selector(owner)]) {
-				owner = [operation owner] ;
-			}
-			else {
-				owner = self ;
-			}
-			
 			// It is stated in the documentation of NSOperationQueue (in the
 			// introduction, not in -operations) that KVO notifications
 			// for -operations can occur on any thread.  However, our
 			// notifications are expected to be sent on the main thread…
-			[self performSelectorOnMainThread:@selector(postQueueDidBeginWorkForObject:)
-								   withObject:owner
+			[self performSelectorOnMainThread:@selector(postQueueDidBeginWork)
+								   withObject:nil
 								waitUntilDone:NO] ; // as in NO deadlocks :)
 		}
 	}
@@ -333,7 +306,7 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
 - (void)doDone:(NSDictionary*)doneInfo {
 	NSError* error = [self error] ;
 
-	// Note that if the doneTarget provided to queueGroup:::::::::
+	// Note that if the doneTarget provided to queueGroup::::::::
 	// was nil or the doneSelector was NULL, doneThread will be nil
 	// and the following statements will return nil.
 	NSThread* doneThread = [doneInfo objectForKey:constKeySSYOperationQueueDoneThread] ;
@@ -359,7 +332,6 @@ - (void)queueGroup:(NSString*)group
 	 selectorNames:(NSArray*)selectorNames
 			  info:(NSMutableDictionary*)info
 			 block:(BOOL)block
-			 owner:(id)owner
 		doneThread:(NSThread*)doneThread
 		doneTarget:(id)doneTarget
 	  doneSelector:(SEL)doneSelector
@@ -403,7 +375,6 @@ - (void)queueGroup:(NSString*)group
 										  &selectorNames,
 										  &originalInfo,
 										  &block,
-										  &owner,
 										  &doneThread,
 										  &doneTarget,
 										  &doneSelector,
@@ -413,24 +384,17 @@ - (void)queueGroup:(NSString*)group
 	[info setObject:group
 			 forKey:constKeySSYOperationGroup] ;
 
-	// Create an array of operations from the array of selector names
-	NSMutableArray* operations = [[NSMutableArray alloc] init] ;
 	for (NSString* selectorName in selectorNames) {
 		SEL selector = NSSelectorFromString(selectorName) ;
 		SSYOperation* op = [[SSYOperation alloc] initWithInfo:info
 													   target:nil
 													 selector:selector
-														owner:owner
 											   operationQueue:self
 												  skipIfError:YES] ;
-		// Note that operation is double-retained.  We'll release it in the next loop.
-		[operations addObject:op] ;
 		[self addAtEndOperation:op] ;
 		[op release] ;
 	}
-	
-	[operations release] ;
-	
+
 	// Create a final operation which will be the 'done' invocation
 	// and add it to the queue.
 	NSMutableDictionary* doneInfo = [NSMutableDictionary dictionaryWithObjectsAndKeys:
@@ -447,8 +411,7 @@ - (void)queueGroup:(NSString*)group
 					 forKey:constKeySSYOperationQueueDoneTarget] ;
 		[doneInfo setObject:NSStringFromSelector(doneSelector)
 					 forKey:constKeySSYOperationQueueDoneSelectorName] ;
-		// Added in BookMacster 1.11, for no purpose other than 
-		// filling out -[SSYOperation description] …
+		// This is to fill out -[SSYOperation description] …
 		[doneInfo setObject:group
 					 forKey:constKeySSYOperationGroup] ;
 	}	
@@ -457,7 +420,6 @@ - (void)queueGroup:(NSString*)group
 	SSYOperation* op = [[SSYOperation alloc] initWithInfo:doneInfo
                                                    target:self
                                                  selector:@selector(doDone:)
-                                                    owner:owner
                                            operationQueue:self
                                               skipIfError:NO] ;
 	[self addAtEndOperation:op] ;