fix NOOP return code (ITS#4563; I'll check and confirm it later; NOOP support might...

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

diff --git a/servers/slapd/back-monitor/rww.c b/servers/slapd/back-monitor/rww.c
index d4cffb8b5b0c468b5a732a8c554e7661725f7f78..76cb031603ce4e773d16bb6611d848e40374b0f2 100644 (file)
--- a/servers/slapd/back-monitor/rww.c
+++ b/servers/slapd/back-monitor/rww.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -28,6 +28,17 @@
 #include "lutil.h"
 #include "back-monitor.h"
 
+static int
+monitor_subsys_rww_destroy(
+       BackendDB               *be,
+       monitor_subsys_t        *ms );
+
+static int
+monitor_subsys_rww_update(
+       Operation               *op,
+       SlapReply               *rs,
+       Entry                   *e );
+
 enum {
        MONITOR_RWW_READ = 0,
        MONITOR_RWW_WRITE,
@@ -35,7 +46,7 @@ enum {
        MONITOR_RWW_LAST
 };
 
-struct monitor_rww_t {
+static struct monitor_rww_t {
        struct berval   rdn;
        struct berval   nrdn;
 } monitor_rww[] = {
@@ -47,21 +58,22 @@ struct monitor_rww_t {
 int
 monitor_subsys_rww_init(
        BackendDB               *be,
-       monitorsubsys           *ms
-)
+       monitor_subsys_t        *ms )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t  *mi;
        
-       Entry                   **ep, *e_conn;
-       struct monitorentrypriv *mp;
+       Entry           **ep, *e_conn;
+       monitor_entry_t *mp;
        int                     i;
 
        assert( be != NULL );
 
-       mi = ( struct monitorinfo * )be->be_private;
+       ms->mss_destroy = monitor_subsys_rww_destroy;
+       ms->mss_update = monitor_subsys_rww_update;
 
-       if ( monitor_cache_get( mi,
-                       &ms->mss_ndn, &e_conn ) ) {
+       mi = ( monitor_info_t * )be->be_private;
+
+       if ( monitor_cache_get( mi, &ms->mss_ndn, &e_conn ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_rww_init: "
                        "unable to get entry \"%s\"\n",
@@ -69,35 +81,16 @@ monitor_subsys_rww_init(
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_conn->e_private;
+       mp = ( monitor_entry_t * )e_conn->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
        for ( i = 0; i < MONITOR_RWW_LAST; i++ ) {
-               char                    buf[ BACKMONITOR_BUFSIZE ];
                struct berval           nrdn, bv;
                Entry                   *e;
                
-               snprintf( buf, sizeof( buf ),
-                       "dn: %s,%s\n"
-                       "objectClass: %s\n"
-                       "structuralObjectClass: %s\n"
-                       "cn: %s\n"
-                       "creatorsName: %s\n"
-                       "modifiersName: %s\n"
-                       "createTimestamp: %s\n"
-                       "modifyTimestamp: %s\n",
-                       monitor_rww[ i ].rdn.bv_val,
-                       ms->mss_dn.bv_val,
-                       mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
-                       mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
-                       &monitor_rww[ i ].rdn.bv_val[ STRLENOF( "cn=" ) ],
-                       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_rww[i].rdn,
+                       mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
                if ( e == NULL ) {
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_rww_init: "
@@ -111,7 +104,7 @@ monitor_subsys_rww_init(
                ber_dupbv( &monitor_rww[ i ].nrdn, &nrdn );
        
                BER_BVSTR( &bv, "0" );
-               attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
+               attr_merge_normalize_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
        
                mp = monitor_entrypriv_create();
                if ( mp == NULL ) {
@@ -140,24 +133,38 @@ monitor_subsys_rww_init(
        return( 0 );
 }
 
-int
+static int
+monitor_subsys_rww_destroy(
+       BackendDB               *be,
+       monitor_subsys_t        *ms )
+{
+       int             i;
+
+       for ( i = 0; i < MONITOR_RWW_LAST; i++ ) {
+               ber_memfree_x( monitor_rww[ i ].nrdn.bv_val, NULL );
+       }
+
+       return 0;
+}
+
+static int
 monitor_subsys_rww_update(
        Operation               *op,
-       Entry                   *e
-)
+       SlapReply               *rs,
+       Entry                   *e )
 {
-       struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
-       Connection              *c;
-       int                     connindex;
-       long                    nconns, nwritewaiters, nreadwaiters;
+       monitor_info_t *mi = (monitor_info_t *)op->o_bd->be_private;
+       Connection      *c;
+       int             connindex;
+       long            nconns, nwritewaiters, nreadwaiters;
 
-       int                     i;
-       struct berval           nrdn;
+       int             i;
+       struct berval   nrdn;
 
-       Attribute               *a;
-       char                    buf[] = "+9223372036854775807L";
-       long                    num = 0;
-       ber_len_t               len;
+       Attribute       *a;
+       char            buf[] = "+9223372036854775807L";
+       long            num = 0;
+       ber_len_t       len;
 
        assert( mi != NULL );
        assert( e != NULL );
@@ -171,7 +178,7 @@ monitor_subsys_rww_update(
        }
 
        if ( i == MONITOR_RWW_LAST ) {
-               return 0;
+               return SLAP_CB_CONTINUE;
        }
 
        nconns = nwritewaiters = nreadwaiters = 0;
@@ -206,18 +213,20 @@ monitor_subsys_rww_update(
        snprintf( buf, sizeof( buf ), "%ld", num );
 
        a = attr_find( e->e_attrs, mi->mi_ad_monitorCounter );
-       assert( a );
+       assert( a != NULL );
        len = strlen( buf );
        if ( len > a->a_vals[ 0 ].bv_len ) {
                a->a_vals[ 0 ].bv_val = ber_memrealloc( a->a_vals[ 0 ].bv_val, len + 1 );
                if ( BER_BVISNULL( &a->a_vals[ 0 ] ) ) {
                        BER_BVZERO( &a->a_vals[ 0 ] );
-                       return( 0 );
+                       return SLAP_CB_CONTINUE;
                }
        }
        AC_MEMCPY( a->a_vals[ 0 ].bv_val, buf, len + 1 );
        a->a_vals[ 0 ].bv_len = len;
 
-       return( 0 );
+       /* FIXME: touch modifyTimestamp? */
+
+       return SLAP_CB_CONTINUE;
 }