fix(addressbook): use pool to lower memory usage

Alinto · Oct 1, 2021 · a073241 · a073241
1 parent 4e6a7f5
commit a073241
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -691,7 +691,7 @@ - (void) _appendComponentProperties: (NSArray *) properties
       else
         [self appendMissingObjectRef: url
                             toBuffer: buffer];
-      if (count % 10 == 0)
+      if (count > 0 && count % 10 == 0)
 	{
 	  RELEASE(pool);
 	  pool = [[NSAutoreleasePool alloc] init];

diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
@@ -1288,11 +1288,13 @@ - (NSArray *) fetchContactsMatching: (NSString *) match
                        withCriteria: (NSArray *) criteria
                            inDomain: (NSString *) theDomain
 {
+  NSAutoreleasePool *pool;
   NGLdapConnection *ldapConnection;
   NGLdapEntry *currentEntry;
   NSEnumerator *entries;
   NSMutableArray *contacts;
   EOQualifier *qualifier;
+  unsigned int i;
 
   contacts = [NSMutableArray array];
 
@@ -1313,9 +1315,21 @@ - (NSArray *) fetchContactsMatching: (NSString *) match
         entries = [ldapConnection deepSearchAtBaseDN: _baseDN
                                            qualifier: qualifier
                                           attributes: _lookupFields];
+
+      i = 0;
+      pool = [NSAutoreleasePool new];
       while ((currentEntry = [entries nextObject]))
-        [contacts addObject:
-                    [self _convertLDAPEntryToContact: currentEntry]];
+        {
+          [contacts addObject:
+                      [self _convertLDAPEntryToContact: currentEntry]];
+          i++;
+          if (i % 10 == 0)
+            {
+              [pool release];
+              pool = [NSAutoreleasePool new];
+            }
+        }
+      [pool release];
     }
 
   return contacts;

diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m
@@ -17,6 +17,9 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+#import <Foundation/NSAutoreleasePool.h>
+
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
@@ -1202,6 +1205,7 @@ - (NSArray *) _fetchEntriesInSources: (NSArray *) sourcesList
                             matching: (NSString *) filter
                             inDomain: (NSString *) domain
 {
+  NSAutoreleasePool *pool;
   NSMutableArray *contacts;
   NSEnumerator *sources;
   NSString *sourceID;
@@ -1211,11 +1215,13 @@ - (NSArray *) _fetchEntriesInSources: (NSArray *) sourcesList
   sources = [sourcesList objectEnumerator];
   while ((sourceID = [sources nextObject]))
     {
+      pool = [[NSAutoreleasePool alloc] init];
       currentSource = [_sources objectForKey: sourceID];
       [contacts addObjectsFromArray:
                   [currentSource fetchContactsMatching: filter
                                           withCriteria: nil
                                               inDomain: domain]];
+      RELEASE(pool);
     }
 
   return [self _compactAndCompleteContacts: [contacts objectEnumerator]];