cleanup

[openldap] / servers / slapd / back-monitor / search.c

diff --git a/servers/slapd/back-monitor/search.c b/servers/slapd/back-monitor/search.c
index a785e662c1ff3ebb82b4a3c5483587df5b651195..e71afa20b0567be706392d2deeaebeea3cfe0484 100644 (file)
--- a/servers/slapd/back-monitor/search.c
+++ b/servers/slapd/back-monitor/search.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -39,16 +39,19 @@ monitor_send_children(
 )
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
-       Entry                   *e, *e_tmp, *e_ch;
+       Entry                   *e,
+                               *e_tmp,
+                               *e_ch = NULL,
+                               *e_nonvolatile = NULL;
        monitor_entry_t *mp;
-       int                     rc;
+       int                     rc,
+                               nonvolatile = 0;
 
        mp = ( monitor_entry_t * )e_parent->e_private;
-       e = mp->mp_children;
+       e_nonvolatile = e = mp->mp_children;
 
-       e_ch = NULL;
        if ( MONITOR_HAS_VOLATILE_CH( mp ) ) {
-               monitor_entry_create( op, NULL, e_parent, &e_ch );
+               monitor_entry_create( op, rs, NULL, e_parent, &e_ch );
        }
        monitor_cache_release( mi, e_parent );
 
@@ -64,7 +67,6 @@ monitor_send_children(
                /* if no persistent, return only volatile */
                if ( e == NULL ) {
                        e = e_ch;
-                       monitor_cache_lock( e_ch );
 
                /* else append persistent to volatile */
                } else {
@@ -83,13 +85,27 @@ monitor_send_children(
        }
 
        /* return entries */
-       for ( ; e != NULL; ) {
-               mp = ( monitor_entry_t * )e->e_private;
-
-               monitor_entry_update( op, e );
+       for ( monitor_cache_lock( e ); e != NULL; ) {
+               monitor_entry_update( op, rs, e );
 
                if ( op->o_abandon ) {
-                       monitor_cache_release( mi, e );
+                       /* FIXME: may leak generated children */
+                       if ( nonvolatile == 0 ) {
+                               for ( e_tmp = e; e_tmp != NULL; ) {
+                                       mp = ( monitor_entry_t * )e_tmp->e_private;
+                                       e = e_tmp;
+                                       e_tmp = mp->mp_next;
+                                       monitor_cache_release( mi, e );
+
+                                       if ( e_tmp == e_nonvolatile ) {
+                                               break;
+                                       }
+                               }
+
+                       } else {
+                               monitor_cache_release( mi, e );
+                       }
+
                        return SLAPD_ABANDON;
                }
                
@@ -97,26 +113,47 @@ monitor_send_children(
                if ( rc == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;
                        rs->sr_flags = 0;
-                       send_search_entry( op, rs );
+                       rc = send_search_entry( op, rs );
                        rs->sr_entry = NULL;
                }
 
-               if ( ( mp->mp_children || MONITOR_HAS_VOLATILE_CH( mp ) )
-                               && sub )
-               {
+               mp = ( monitor_entry_t * )e->e_private;
+               e_tmp = mp->mp_next;
+
+               if ( sub ) {
                        rc = monitor_send_children( op, rs, e, sub );
                        if ( rc ) {
-                               monitor_cache_release( mi, e );
+                               /* FIXME: may leak generated children */
+                               if ( nonvolatile == 0 ) {
+                                       for ( ; e_tmp != NULL; ) {
+                                               mp = ( monitor_entry_t * )e_tmp->e_private;
+                                               e = e_tmp;
+                                               e_tmp = mp->mp_next;
+                                               monitor_cache_release( mi, e );
+       
+                                               if ( e_tmp == e_nonvolatile ) {
+                                                       break;
+                                               }
+                                       }
+                               }
+
                                return( rc );
                        }
                }
 
-               e_tmp = mp->mp_next;
                if ( e_tmp != NULL ) {
                        monitor_cache_lock( e_tmp );
                }
-               monitor_cache_release( mi, e );
+
+               if ( !sub ) {
+                       /* otherwise the recursive call already released */
+                       monitor_cache_release( mi, e );
+               }
+
                e = e_tmp;
+               if ( e == e_nonvolatile ) {
+                       nonvolatile = 1;
+               }
        }
        
        return LDAP_SUCCESS;
@@ -134,7 +171,7 @@ monitor_back_search( Operation *op, SlapReply *rs )
 
 
        /* get entry with reader lock */
-       monitor_cache_dn2entry( op, &op->o_req_ndn, &e, &matched );
+       monitor_cache_dn2entry( op, rs, &op->o_req_ndn, &e, &matched );
        if ( e == NULL ) {
                rs->sr_err = LDAP_NO_SUCH_OBJECT;
                if ( matched ) {
@@ -184,7 +221,7 @@ monitor_back_search( Operation *op, SlapReply *rs )
        rs->sr_attrs = op->oq_search.rs_attrs;
        switch ( op->oq_search.rs_scope ) {
        case LDAP_SCOPE_BASE:
-               monitor_entry_update( op, e );
+               monitor_entry_update( op, rs, e );
                rc = test_filter( op, e, op->oq_search.rs_filter );
                if ( rc == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;
@@ -201,7 +238,7 @@ monitor_back_search( Operation *op, SlapReply *rs )
                break;
 
        case LDAP_SCOPE_SUBTREE:
-               monitor_entry_update( op, e );
+               monitor_entry_update( op, rs, e );
                rc = test_filter( op, e, op->oq_search.rs_filter );
                if ( rc == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;