Changeset 23109

Timestamp:

04/12/2008 01:18:59 PM (7 months ago)

Author:

evands

Message:

Added debug build monitoring of whether AIListObjectObservers are properly unregistering themselves. This should let us figure out which object is failing to do so and therefore causing the crash in #9425, which occurs very intermittently. Refs #9425.

Files:

• trunk/Source/AIContactController.h (modified) (2 diffs)
• trunk/Source/AIContactController.m (modified) (10 diffs)

trunk/Source/AIContactController.h

@@ -28 +28 @@
-#define PREF_GROUP_CONTACT_LIST_DISPLAY @"Contact List Display"
-
+#ifdef DEBUG_BUILD
+        #define CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG        TRUE
+#endif
+
-@class AISortController, AdiumAuthorization, AIContactHidingController;
-
@@ -48 +52 @@
-        
-        //Status and Attribute updates
-
+
+
+
+
+
-    NSTimer                                     *delayedUpdateTimer;
-    int                                         delayedStatusChanges;

trunk/Source/AIContactController.m

@@ -73 +73 @@
-#define UID_KEY                                                 @"UID"
-
+#ifdef CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG
+        static BOOL unregisterListObjectObserverCalled = NO;
+#endif
+
-@interface AIContactController (PRIVATE)
-- (AIListGroup *)processGetGroupNamed:(NSString *)serverGroup;
@@ -122 +126 @@
-        if ((self = [super init])) {
-                //
+#ifdef CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG
+                contactObservers = [[NSMutableArray alloc] init];
+#else
-                contactObservers = [[NSMutableSet alloc] init];
+#endif
-                sortControllerArray = [[NSMutableArray alloc] init];
-                activeSortController = nil;
@@ -1161 +1169 @@
-        //Create a new metaContact is we didn't find one.
-        if (!metaContact) {
+                AILogWithSignature(@"New metacontact to group %@ on %@", UIDsArray, servicesArray);
-                metaContact = [self metaContactWithObjectID:nil];
-        }
@@ -1209 +1218 @@
-        //Create a new metaContact is we didn't find one.
-        if (!metaContact) {
+                AILogWithSignature(@"New metacontact to group %@", contactsToGroupArray);
-                metaContact = [self metaContactWithObjectID:nil];
-        }
@@ -1424 +1434 @@
-- (void)registerListObjectObserver:(id <AIListObjectObserver>)inObserver
-{
+        //Add the observer
+#ifdef CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG
-        AILogWithSignature(@"%@", inObserver);
-
-
+
+
-    [contactObservers addObject:[NSValue valueWithNonretainedObject:inObserver]];
+#endif
-        
-    //Let the new observer process all existing objects
@@ -1435 +1448 @@
-- (void)unregisterListObjectObserver:(id)inObserver
-{
+#ifdef CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG
-        AILogWithSignature(@"%@", inObserver);
-
+
+
+
-    [contactObservers removeObject:[NSValue valueWithNonretainedObject:inObserver]];
+#endif
-}
-
@@ -1508 +1525 @@
-{
-        NSMutableSet    *attrChange = nil;
+
+#ifdef CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG
+        NSObject <AIListObjectObserver> *observer;
+        
+        //Let our observers know
+        int i;
+        for (i = 0; i < [contactObservers count]; i++) {
+                NSAutoreleasePool       *pool = [[NSAutoreleasePool alloc] init];
+                NSSet                           *newKeys;
+
+                observer = [contactObservers objectAtIndex:i];
+
+                if ([observer retainCount] == 1) {
+                        NSString *observerDescription = [observer description];
+
+                        /* This observer is fully released except for our retention (contactObservers plus its copy), which wouldn't happen without 
+                         * CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG defined.  That -might- be an error... except that it
+                         * might remove itself as an observer in its dealloc method, which is fine if it actually happens.
+                         */
+                        unregisterListObjectObserverCalled = NO;
+                        [contactObservers removeObjectIdenticalTo:observer];
+                        
+                        //observer will have deallocated.  It should have called removeContactObserver in the process. If it didn't, that's bad.
+                        if (!unregisterListObjectObserverCalled) {
+                                AILogWithSignature(@"%@ failed at removing itself as a contact observer! This would be fatal in a release build!", observerDescription);
+                                NSLog(@"%@ failed at removing itself as a contact observer! This would be fatal in a release build!", observerDescription);
+                                NSAssert1(FALSE, @"%@ failed at removing itself as a contact observer! This would be fatal in a release build!", observerDescription);
+                        } else {
+                                AILogWithSignature(@"All is well after the dealloc of %@", observerDescription);
+                        }
+                } else {
+                        if ((newKeys = [observer updateListObject:inObject keys:modifiedKeys silent:silent])) {
+                                if (!attrChange) attrChange = [[NSMutableSet alloc] init];
+                                [attrChange unionSet:newKeys];
+                        }
+                }
+                [pool release];
+        }       
+#else
-        NSEnumerator    *enumerator;
-        NSValue                 *observerValue;
@@ -1525 +1581 @@
-                [pool release];
-        }
-
+
-        //Send out the notification for other observers
-        [[adium notificationCenter] postNotificationName:ListObject_StatusChanged
@@ -1539 +1595 @@
-{
-        NSEnumerator    *enumerator = [contactObservers objectEnumerator];
+#ifdef CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG
+        id <AIListObjectObserver> observer;
+        
+        while ((observer = [enumerator nextObject])) {          
+                [observer updateListObject:inObject keys:nil silent:YES];
+        }
+#else
-        NSValue                 *observerValue;
-        
@@ -1546 +1609 @@
-                [observer updateListObject:inObject keys:nil silent:YES];
-        }
+#endif  
-}
-