don't leak callbacks if stuff cannot be registered; provide a means to dispose of...

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

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index f071bb0d6157b18d821caab0e064057caff3f346..c84088dcb8c155a8531d9462034e53eb92ba3105 100644 (file)
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.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.
  *
@@ -45,22 +45,34 @@ struct monitor_ops_t {
        { BER_BVNULL,                   BER_BVNULL }
 };
 
+static int
+monitor_subsys_ops_destroy(
+       BackendDB               *be,
+       monitor_subsys_t        *ms );
+
+static int
+monitor_subsys_ops_update(
+       Operation               *op,
+       SlapReply               *rs,
+       Entry                   *e );
+
 int
 monitor_subsys_ops_init(
        BackendDB               *be,
-       monitor_subsys_t        *ms
-)
+       monitor_subsys_t        *ms )
 {
        monitor_info_t  *mi;
        
        Entry           *e_op, **ep;
        monitor_entry_t *mp;
-       char            buf[ BACKMONITOR_BUFSIZE ];
        int             i;
        struct berval   bv_zero = BER_BVC( "0" );
 
        assert( be != NULL );
 
+       ms->mss_destroy = monitor_subsys_ops_destroy;
+       ms->mss_update = monitor_subsys_ops_update;
+
        mi = ( monitor_info_t * )be->be_private;
 
        if ( monitor_cache_get( mi,
@@ -84,34 +96,14 @@ monitor_subsys_ops_init(
        for ( i = 0; i < SLAP_OP_LAST; i++ ) {
                struct berval   rdn;
                Entry           *e;
+               struct berval bv;
 
                /*
                 * Initiated ops
                 */
-               snprintf( buf, sizeof( buf ),
-                               "dn: %s,%s\n"
-                               "objectClass: %s\n"
-                               "structuralObjectClass: %s\n"
-                               "cn: %s\n"
-                               "%s: 0\n"
-                               "%s: 0\n"
-                               "creatorsName: %s\n"
-                               "modifiersName: %s\n"
-                               "createTimestamp: %s\n"
-                               "modifyTimestamp: %s\n",
-                               monitor_op[ i ].rdn.bv_val,
-                               ms->mss_dn.bv_val,
-                               mi->mi_oc_monitorOperation->soc_cname.bv_val,
-                               mi->mi_oc_monitorOperation->soc_cname.bv_val,
-                               &monitor_op[ i ].rdn.bv_val[ STRLENOF( "cn=" ) ],
-                               mi->mi_ad_monitorOpInitiated->ad_cname.bv_val,
-                               mi->mi_ad_monitorOpCompleted->ad_cname.bv_val,
-                               mi->mi_creatorsName.bv_val,
-                               mi->mi_creatorsName.bv_val,
-                               mi->mi_startTime.bv_val,
-                               mi->mi_startTime.bv_val );
-
-               e = str2entry( buf );
+               e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &monitor_op[i].rdn,
+                       mi->mi_oc_monitorOperation, mi, NULL, NULL );
+
                if ( e == NULL ) {
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_ops_init: "
@@ -120,7 +112,11 @@ monitor_subsys_ops_init(
                                ms->mss_ndn.bv_val, 0 );
                        return( -1 );
                }
-       
+
+               BER_BVSTR( &bv, "0" );
+               attr_merge_one( e, mi->mi_ad_monitorOpInitiated, &bv, NULL );
+               attr_merge_one( e, mi->mi_ad_monitorOpCompleted, &bv, NULL );
+
                /* steal normalized RDN */
                dnRdn( &e->e_nname, &rdn );
                ber_dupbv( &monitor_op[ i ].nrdn, &rdn );
@@ -152,23 +148,39 @@ monitor_subsys_ops_init(
        return( 0 );
 }
 
-int
+static int
+monitor_subsys_ops_destroy(
+       BackendDB               *be,
+       monitor_subsys_t        *ms )
+{
+       int             i;
+
+       for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+               if ( !BER_BVISNULL( &monitor_op[ i ].nrdn ) ) {
+                       ch_free( monitor_op[ i ].nrdn.bv_val );
+               }
+       }
+
+       return 0;
+}
+
+static int
 monitor_subsys_ops_update(
        Operation               *op,
-       Entry                   *e
-)
+       SlapReply               *rs,
+       Entry                   *e )
 {
        monitor_info_t          *mi = ( monitor_info_t * )op->o_bd->be_private;
 
-       ldap_pvt_mp_t           nInitiated,
-                               nCompleted;
+       ldap_pvt_mp_t           nInitiated = LDAP_PVT_MP_INIT,
+                               nCompleted = LDAP_PVT_MP_INIT;
        struct berval           rdn;
        int                     i;
        Attribute               *a;
        static struct berval    bv_ops = BER_BVC( "cn=operations" );
 
-       assert( mi );
-       assert( e );
+       assert( mi != NULL );
+       assert( e != NULL );
 
        dnRdn( &e->e_nname, &rdn );
 
@@ -217,6 +229,6 @@ monitor_subsys_ops_update(
 
        /* FIXME: touch modifyTimestamp? */
 
-       return( 0 );
+       return SLAP_CB_CONTINUE;
 }