ITS#8039 plug syncprov memleak

Rewrote the psearch result handling to keep track of which
queues are using which results.

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 476733d7d85de3c0851d7da1067a0d6fddfa1de6..a1f67178ce2801da174dccd424bc77d8c86b1875 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -45,16 +45,26 @@ typedef struct modtarget {
        ldap_pvt_thread_mutex_t mt_mutex;
 } modtarget;
 
+/* All the info of a psearch result that's shared between
+ * multiple queues
+ */
+typedef struct resinfo {
+       struct syncres *ri_list;
+       Entry *ri_e;
+       struct berval ri_dn;
+       struct berval ri_ndn;
+       struct berval ri_uuid;
+       struct berval ri_csn;
+       char ri_isref;
+       ldap_pvt_thread_mutex_t ri_mutex;
+} resinfo;
+
 /* A queued result of a persistent search */
 typedef struct syncres {
-       struct syncres *s_next;
-       Entry *s_e;
-       struct berval s_dn;
-       struct berval s_ndn;
-       struct berval s_uuid;
-       struct berval s_csn;
+       struct syncres *s_next; /* list of results on this psearch queue */
+       struct syncres *s_rilist;       /* list of psearches using this result */
+       resinfo *s_info;
        char s_mode;
-       char s_isreference;
 } syncres;
 
 /* Record of a persistent search */
@@ -159,13 +169,9 @@ typedef struct opcookie {
        short osid;     /* sid of op csn */
        short rsid;     /* sid of relay */
        short sreference;       /* Is the entry a reference? */
+       syncres ssres;
 } opcookie;
 
-typedef struct mutexint {
-       ldap_pvt_thread_mutex_t mi_mutex;
-       int mi_int;
-} mutexint;
-
 typedef struct fbase_cookie {
        struct berval *fdn;     /* DN of a modified entry, for scope testing */
        syncops *fss;   /* persistent search we're testing against */
@@ -762,34 +768,23 @@ again:
        return rc;
 }
 
-/* Should find a place to cache these */
-static mutexint *get_mutexint()
-{
-       mutexint *mi = ch_malloc( sizeof( mutexint ));
-       ldap_pvt_thread_mutex_init( &mi->mi_mutex );
-       mi->mi_int = 1;
-       return mi;
-}
-
-static void inc_mutexint( mutexint *mi )
-{
-       ldap_pvt_thread_mutex_lock( &mi->mi_mutex );
-       mi->mi_int++;
-       ldap_pvt_thread_mutex_unlock( &mi->mi_mutex );
-}
-
-/* return resulting counter */
-static int dec_mutexint( mutexint *mi )
+static void free_resinfo( syncres *sr )
 {
-       int i;
-       ldap_pvt_thread_mutex_lock( &mi->mi_mutex );
-       i = --mi->mi_int;
-       ldap_pvt_thread_mutex_unlock( &mi->mi_mutex );
-       if ( !i ) {
-               ldap_pvt_thread_mutex_destroy( &mi->mi_mutex );
-               ch_free( mi );
-       }
-       return i;
+       syncres **st;
+       ldap_pvt_thread_mutex_lock( &sr->s_info->ri_mutex );
+       for (st = &sr->s_info->ri_list; *st; st = &(*st)->s_rilist) {
+               if (*st == sr) {
+                       *st = sr->s_rilist;
+                       break;
+               }
+       }
+       ldap_pvt_thread_mutex_unlock( &sr->s_info->ri_mutex );
+       if ( !sr->s_info->ri_list ) {
+               ldap_pvt_thread_mutex_destroy( &sr->s_info->ri_mutex );
+               if ( sr->s_info->ri_e )
+                       entry_free( sr->s_info->ri_e );
+               ch_free( sr->s_info );
+       }
 }
 
 static int
@@ -816,12 +811,7 @@ syncprov_free_syncop( syncops *so )
        ch_free( so->s_base.bv_val );
        for ( sr=so->s_res; sr; sr=srnext ) {
                srnext = sr->s_next;
-               if ( sr->s_e ) {
-                       if ( !dec_mutexint( sr->s_e->e_private )) {
-                               sr->s_e->e_private = NULL;
-                               entry_free( sr->s_e );
-                       }
-               }
+               free_resinfo( sr );
                ch_free( sr );
        }
        ldap_pvt_thread_mutex_destroy( &so->s_mutex );
@@ -831,7 +821,7 @@ syncprov_free_syncop( syncops *so )
 
 /* Send a persistent search response */
 static int
-syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode )
+syncprov_sendresp( Operation *op, resinfo *ri, syncops *so, int mode )
 {
        SlapReply rs = { REP_SEARCH };
        struct berval cookie, csns[2];
@@ -844,7 +834,7 @@ syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode )
        rs.sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2, op->o_tmpmemctx );
        rs.sr_ctrls[1] = NULL;
        rs.sr_flags = REP_CTRLS_MUSTBEFREED;
-       csns[0] = opc->sctxcsn;
+       csns[0] = ri->ri_csn;
        BER_BVZERO( &csns[1] );
        slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, slap_serverID ? slap_serverID : -1 );
 
@@ -860,20 +850,20 @@ syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode )
 
        e_uuid.e_attrs = &a_uuid;
        a_uuid.a_desc = slap_schema.si_ad_entryUUID;
-       a_uuid.a_nvals = &opc->suuid;
+       a_uuid.a_nvals = &ri->ri_uuid;
        rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid,
                mode, rs.sr_ctrls, 0, 1, &cookie );
        op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
 
        rs.sr_entry = &e_uuid;
        if ( mode == LDAP_SYNC_ADD || mode == LDAP_SYNC_MODIFY ) {
-               e_uuid = *opc->se;
+               e_uuid = *ri->ri_e;
                e_uuid.e_private = NULL;
        }
 
        switch( mode ) {
        case LDAP_SYNC_ADD:
-               if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
+               if ( ri->ri_isref && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
                        rs.sr_ref = get_entry_referrals( op, rs.sr_entry );
                        rs.sr_err = send_search_reference( op, &rs );
                        ber_bvarray_free( rs.sr_ref );
@@ -886,9 +876,9 @@ syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode )
                break;
        case LDAP_SYNC_DELETE:
                e_uuid.e_attrs = NULL;
-               e_uuid.e_name = opc->sdn;
-               e_uuid.e_nname = opc->sndn;
-               if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
+               e_uuid.e_name = ri->ri_dn;
+               e_uuid.e_nname = ri->ri_ndn;
+               if ( ri->ri_isref && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
                        struct berval bv = BER_BVNULL;
                        rs.sr_ref = &bv;
                        rs.sr_err = send_search_reference( op, &rs );
@@ -911,11 +901,8 @@ syncprov_qplay( Operation *op, syncops *so )
 {
        slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;
        syncres *sr;
-       opcookie opc;
        int rc = 0;
 
-       opc.son = on;
-
        do {
                ldap_pvt_thread_mutex_lock( &so->s_mutex );
                sr = so->s_res;
@@ -933,25 +920,13 @@ syncprov_qplay( Operation *op, syncops *so )
                                SlapReply rs = { REP_INTERMEDIATE };
 
                                rc = syncprov_sendinfo( op, &rs, LDAP_TAG_SYNC_NEW_COOKIE,
-                                       &sr->s_csn, 0, NULL, 0 );
+                                       &sr->s_info->ri_csn, 0, NULL, 0 );
                        } else {
-                               opc.sdn = sr->s_dn;
-                               opc.sndn = sr->s_ndn;
-                               opc.suuid = sr->s_uuid;
-                               opc.sctxcsn = sr->s_csn;
-                               opc.sreference = sr->s_isreference;
-                               opc.se = sr->s_e;
-
-                               rc = syncprov_sendresp( op, &opc, so, sr->s_mode );
+                               rc = syncprov_sendresp( op, sr->s_info, so, sr->s_mode );
                        }
                }
 
-               if ( sr->s_e ) {
-                       if ( !dec_mutexint( sr->s_e->e_private )) {
-                               sr->s_e->e_private = NULL;
-                               entry_free ( sr->s_e );
-                       }
-               }
+               free_resinfo( sr );
                ch_free( sr );
 
                if ( so->s_op->o_abandon )
@@ -1031,6 +1006,7 @@ static int
 syncprov_qresp( opcookie *opc, syncops *so, int mode )
 {
        syncres *sr;
+       resinfo *ri;
        int srsize;
        struct berval cookie = opc->sctxcsn;
 
@@ -1041,38 +1017,70 @@ syncprov_qresp( opcookie *opc, syncops *so, int mode )
                        so->s_rid, slap_serverID ? slap_serverID : -1);
        }
 
-       srsize = sizeof(syncres) + opc->suuid.bv_len + 1 +
-               opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1;
-       if ( cookie.bv_len )
-               srsize += cookie.bv_len + 1;
-       sr = ch_malloc( srsize );
+       sr = ch_malloc( sizeof( syncres ));
        sr->s_next = NULL;
-       sr->s_e = opc->se;
-       /* bump refcount on this entry */
-       if ( opc->se )
-               inc_mutexint( opc->se->e_private );
-       sr->s_dn.bv_val = (char *)(sr + 1);
-       sr->s_dn.bv_len = opc->sdn.bv_len;
        sr->s_mode = mode;
-       sr->s_isreference = opc->sreference;
-       sr->s_ndn.bv_val = lutil_strcopy( sr->s_dn.bv_val,
-                opc->sdn.bv_val ) + 1;
-       sr->s_ndn.bv_len = opc->sndn.bv_len;
-       sr->s_uuid.bv_val = lutil_strcopy( sr->s_ndn.bv_val,
-                opc->sndn.bv_val ) + 1;
-       sr->s_uuid.bv_len = opc->suuid.bv_len;
-       AC_MEMCPY( sr->s_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len );
-       if ( cookie.bv_len ) {
-               sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1;
-               strcpy( sr->s_csn.bv_val, cookie.bv_val );
-       } else {
-               sr->s_csn.bv_val = NULL;
-       }
-       sr->s_csn.bv_len = cookie.bv_len;
-
-       if ( mode == LDAP_SYNC_NEW_COOKIE && cookie.bv_val ) {
-               ch_free( cookie.bv_val );
-       }
+       if ( !opc->ssres.s_info ) {
+
+               srsize = sizeof( resinfo );
+               if ( cookie.bv_len )
+                       srsize += cookie.bv_len + 1;
+               if ( mode == LDAP_SYNC_NEW_COOKIE ) {
+                       ri = ch_malloc( srsize );
+                       ri->ri_csn.bv_val = (char *)(ri + 1);
+                       memcpy( ri->ri_csn.bv_val, cookie.bv_val, cookie.bv_len );
+                       ri->ri_csn.bv_val[cookie.bv_len] = '\0';
+                       ch_free( cookie.bv_val );
+
+               } else if ( opc->se ) {
+                       Attribute *a;
+                       ri = ch_malloc( srsize );
+                       ri->ri_dn = opc->se->e_name;
+                       ri->ri_ndn = opc->se->e_nname;
+                       a = attr_find( opc->se->e_attrs, slap_schema.si_ad_entryUUID );
+                       if ( a )
+                               ri->ri_uuid = a->a_nvals[0];
+                       if ( cookie.bv_len ) {
+                               ri->ri_csn.bv_val = (char *)(ri + 1);
+                               ri->ri_csn.bv_len = cookie.bv_len;
+                               memcpy( ri->ri_csn.bv_val, cookie.bv_val, cookie.bv_len );
+                               ri->ri_csn.bv_val[cookie.bv_len] = '\0';
+                       } else {
+                               ri->ri_csn.bv_val = NULL;
+                       }
+               } else {
+                       srsize += opc->suuid.bv_len +
+                               opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1;
+                       ri = ch_malloc( srsize );
+                       ri->ri_dn.bv_val = (char *)(ri + 1);
+                       ri->ri_dn.bv_len = opc->sdn.bv_len;
+                       ri->ri_ndn.bv_val = lutil_strcopy( ri->ri_dn.bv_val,
+                               opc->sdn.bv_val ) + 1;
+                       ri->ri_ndn.bv_len = opc->sndn.bv_len;
+                       ri->ri_uuid.bv_val = lutil_strcopy( ri->ri_ndn.bv_val,
+                               opc->sndn.bv_val ) + 1;
+                       ri->ri_uuid.bv_len = opc->suuid.bv_len;
+                       AC_MEMCPY( ri->ri_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len );
+                       if ( cookie.bv_len ) {
+                               ri->ri_csn.bv_val = ri->ri_uuid.bv_val + ri->ri_uuid.bv_len;
+                               memcpy( ri->ri_csn.bv_val, cookie.bv_val, cookie.bv_len );
+                               ri->ri_csn.bv_val[cookie.bv_len] = '\0';
+                       }
+               }
+               ri->ri_list = &opc->ssres;
+               ri->ri_e = opc->se;
+               ri->ri_csn.bv_len = cookie.bv_len;
+               ri->ri_isref = opc->sreference;
+               ldap_pvt_thread_mutex_init( &ri->ri_mutex );
+               opc->se = NULL;
+               opc->ssres.s_info = ri;
+       }
+       ri = opc->ssres.s_info;
+       sr->s_info = ri;
+       ldap_pvt_thread_mutex_lock( &ri->ri_mutex );
+       sr->s_rilist = ri->ri_list;
+       ri->ri_list = sr;
+       ldap_pvt_thread_mutex_unlock( &ri->ri_mutex );
 
        ldap_pvt_thread_mutex_lock( &so->s_mutex );
        if ( !so->s_res ) {
@@ -1193,10 +1201,8 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                rc = overlay_entry_get_ov( op, fc.fdn, NULL, NULL, 0, &e, on );
                /* If we're sending responses now, make a copy and unlock the DB */
                if ( e && !saveit ) {
-                       if ( !opc->se ) {
+                       if ( !opc->se )
                                opc->se = entry_dup( e );
-                               opc->se->e_private = get_mutexint();
-                       }
                        overlay_entry_release_ov( op, e, 0, on );
                        e = opc->se;
                }
@@ -1207,10 +1213,8 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
        } else {
                e = op->ora_e;
                if ( !saveit ) {
-                       if ( !opc->se ) {
+                       if ( !opc->se )
                                opc->se = entry_dup( e );
-                               opc->se->e_private = get_mutexint();
-                       }
                        e = opc->se;
                }
        }
@@ -1361,12 +1365,11 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                        overlay_entry_release_ov( op, e, 0, on );
                op->o_bd = b0;
        }
-       if ( opc->se && !saveit ) {
-               if ( !dec_mutexint( opc->se->e_private )) {
-                       opc->se->e_private = NULL;
+       if ( !saveit ) {
+               if ( opc->ssres.s_info )
+                       free_resinfo( &opc->ssres );
+               else if ( opc->se )
                        entry_free( opc->se );
-                       opc->se = NULL;
-               }
        }
        if ( freefdn ) {
                op->o_tmpfree( fc.fdn->bv_val, op->o_tmpmemctx );