Avoid some unnecessary work.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26122 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,8 @@
+2008-02-23  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/NSKeyValueObserving.m:
+        Don't calculate KVO info in cases where there is no observer.
+
 2008-02-22  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/mframe/mframe.head: Change function arguments

Source/NSKeyValueObserving.m

@@ -517,14 +517,16 @@ replacementForClass(Class c)
               NSString *mainKey;
               NSHashTable dependents;
 
-              while (NSNextMapEnumeratorPair(&enumerator, (void **)(&mainKey), &dependents))
+              while (NSNextMapEnumeratorPair(&enumerator, (void **)(&mainKey),
+                &dependents))
                 {
                   NSHashEnumerator dependentKeyEnum;
                   NSString *dependentKey;
 
                   if (!dependents) continue;
                   dependentKeyEnum = NSEnumerateHashTable(dependents);
-                  while ((dependentKey = NSNextHashEnumeratorItem(&dependentKeyEnum)))
+                  while ((dependentKey
+                    = NSNextHashEnumeratorItem(&dependentKeyEnum)))
                     {
                       if ([dependentKey isEqual: aKey])
                         {
@@ -1265,39 +1267,47 @@ replacementForClass(Class c)
 - (void) willChangeValueForDependentsOfKey: (NSString *)aKey
 {
   NSMapTable keys = NSMapGet(dependentKeyTable, [self class]);
+
   if (keys)
     {
       NSHashTable       dependents = NSMapGet(keys, aKey);
+
+      if (dependents != 0)
+        {
           NSString              *dependentKey;
           NSHashEnumerator      dependentKeyEnum;
 
-      if (!dependents) return;
           dependentKeyEnum = NSEnumerateHashTable(dependents);
           while ((dependentKey = NSNextHashEnumeratorItem(&dependentKeyEnum)))
             {
-          [self willChangeValueForKey:dependentKey];
+              [self willChangeValueForKey: dependentKey];
             }
           NSEndHashTableEnumeration(&dependentKeyEnum);
         }
+    }
 }
 
 - (void) didChangeValueForDependentsOfKey: (NSString *)aKey
 {
   NSMapTable keys = NSMapGet(dependentKeyTable, [self class]);
+
   if (keys)
     {
       NSHashTable dependents = NSMapGet(keys, aKey);
+
+      if (dependents != nil)
+        {
           NSString              *dependentKey;
           NSHashEnumerator      dependentKeyEnum;
 
-      if (!dependents) return;
           dependentKeyEnum = NSEnumerateHashTable(dependents);
           while ((dependentKey = NSNextHashEnumeratorItem(&dependentKeyEnum)))
             {
-          [self didChangeValueForKey:dependentKey];
+              [self didChangeValueForKey: dependentKey];
             }
           NSEndHashTableEnumeration(&dependentKeyEnum);
         }
+    }
 }
 
 /* FIXME
@@ -1307,24 +1317,34 @@ replacementForClass(Class c)
  */
 - (void) willChangeValueForKey: (NSString*)aKey
 {
-  id old = [self valueForKey: aKey];
+  GSKVOInfo     *info;
-  NSDictionary * change;
+
-  if (old != nil)
+  info = (GSKVOInfo *)[self observationInfo];
-    change = [NSMutableDictionary
+  if (info != nil)
-    dictionaryWithObject: [self valueForKey: aKey]
+    {
-                  forKey: NSKeyValueChangeOldKey];
+      id            old;
-  else
+      NSDictionary  *change;
+
       change = [NSMutableDictionary dictionary];
-  [(GSKVOInfo *)[self observationInfo] setChange: change forKey: aKey];
+      old = [self valueForKey: aKey];
+      if (old != nil)
+        {
+          [change setObject: old forKey: NSKeyValueChangeOldKey];
+        }
+      [info setChange: change forKey: aKey];
+    }
   [self willChangeValueForDependentsOfKey: aKey];
 }
 
 - (void) didChangeValueForKey: (NSString*)aKey
 {
   GSKVOInfo	        *info;
-  NSMutableDictionary   *change;
 
   info = (GSKVOInfo *)[self observationInfo];
+  if (info != nil)
+    {
+      NSMutableDictionary   *change;
+
       change = (NSMutableDictionary *)[info changeForKey: aKey];
       [change setValue: [self valueForKey: aKey]
                 forKey: NSKeyValueChangeNewKey];
@@ -1332,7 +1352,8 @@ replacementForClass(Class c)
                 forKey: NSKeyValueChangeKindKey];
 
       [info notifyForKey: aKey ofChange: change];
-  [info setChange:nil forKey: aKey];
+      [info setChange: nil forKey: aKey];
+    }
   [self didChangeValueForDependentsOfKey: aKey];
 }
 
@@ -1341,10 +1362,13 @@ replacementForClass(Class c)
 	    forKey: (NSString*)aKey
 {
   GSKVOInfo	        *info;
+
+  info = [self observationInfo];
+  if (info != nil)
+    {
       NSMutableDictionary   *change;
       NSMutableArray        *array;
 
-  info = [self observationInfo];
       change = (NSMutableDictionary *)[info changeForKey: aKey];
       array = [self valueForKey: aKey];
 
@@ -1361,6 +1385,7 @@ replacementForClass(Class c)
 
       [info notifyForKey: aKey ofChange: change];
       [info setChange:nil forKey: aKey];
+    }
   [self didChangeValueForDependentsOfKey: aKey];
 }
 
@@ -1369,10 +1394,12 @@ replacementForClass(Class c)
 	     forKey: (NSString*)aKey
 {
   GSKVOInfo	        *info;
+
+  info = [self observationInfo];
+    {
       NSDictionary          *change;
       NSMutableArray        *array;
 
-  info = [self observationInfo];
       change = [NSMutableDictionary dictionary];
       array = [self valueForKey: aKey];
 
@@ -1384,6 +1411,7 @@ replacementForClass(Class c)
         }
 
       [info setChange: change forKey: aKey];
+    }
   [self willChangeValueForDependentsOfKey: aKey];
 }
 
@@ -1392,15 +1420,19 @@ replacementForClass(Class c)
 		  usingObjects: (NSSet*)objects
 {
   GSKVOInfo	*info;
+
+  info = [self observationInfo];
+  if (info != nil)
+    {
       NSDictionary  *change;
       NSMutableSet  *set;
 
-  info = [self observationInfo];
       change = [NSMutableDictionary dictionary];
       set = [self valueForKey: aKey];
 
       [change setValue: [set mutableCopy] forKey: @"oldSet"];
       [info setChange: change forKey: aKey];
+    }
   [self willChangeValueForDependentsOfKey: aKey];
 }
 
@@ -1409,17 +1441,18 @@ replacementForClass(Class c)
 		 usingObjects: (NSSet*)objects
 {
   GSKVOInfo	        *info;
+
+  info = (GSKVOInfo *)[self observationInfo];
+  if (info != nil)
+    {
       NSMutableDictionary   *change;
       NSMutableSet          *oldSet;
       NSMutableSet          *set;
 
-  info = (GSKVOInfo *)[self observationInfo];
       change = (NSMutableDictionary *)[info changeForKey: aKey];
       oldSet = [change valueForKey: @"oldSet"];
       set = [self valueForKey: aKey];
-
       [change setValue: nil forKey: @"oldSet"];
-
       if (mutationKind == NSKeyValueUnionSetMutation)
         {
           set = [set mutableCopy];
@@ -1445,13 +1478,15 @@ replacementForClass(Class c)
           [old minusSet: set];
           new = [set mutableCopy];
           [new minusSet: oldSet];
-      [change setValue: [NSNumber numberWithInt: NSKeyValueChangeReplacement]
+          [change setValue:
+            [NSNumber numberWithInt: NSKeyValueChangeReplacement]
                     forKey: NSKeyValueChangeKindKey];
           [change setValue: old forKey: NSKeyValueChangeOldKey];
           [change setValue: new forKey: NSKeyValueChangeNewKey];
         }
       [info notifyForKey: aKey ofChange: change];
       [info setChange:nil forKey: aKey];
+    }
   [self didChangeValueForDependentsOfKey: aKey];
 }