X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-monitor%2Fsent.c;h=caa6beab52381704c8db52519ad42e9e6ff86140;hb=0e385af9759eced1c187a75aafe7ce48559dcf74;hp=137e8efb8ce60b64756e721b44143d1f403a69e1;hpb=2a8dec95ba9a91e2c4f3e5b48f789eb803363650;p=openldap
diff --git a/servers/slapd/back-monitor/sent.c b/servers/slapd/back-monitor/sent.c
index 137e8efb8c..caa6beab52 100644
--- a/servers/slapd/back-monitor/sent.c
+++ b/servers/slapd/back-monitor/sent.c
@@ -1,361 +1,220 @@
/* sent.c - deal with data sent subsystem */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2001-2006 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved.
- *
- * This work has beed deveolped for the OpenLDAP Foundation
- * in the hope that it may be useful to the Open Source community,
- * but WITHOUT ANY WARRANTY.
- *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- *
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- * of use of this software, no matter how awful, even if they arise from
- * flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users
- * ever read sources, credits should appear in the documentation.
- * SysNet s.n.c. cannot be responsible for the consequences of the
- * alterations.
- *
- * 4. This notice may not be removed or altered.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Pierangelo Masarati for inclusion
+ * in OpenLDAP Software.
*/
#include "portable.h"
#include
+#include
#include "slap.h"
#include "back-monitor.h"
+static int
+monitor_subsys_sent_destroy(
+ BackendDB *be,
+ monitor_subsys_t *ms );
+
+static int
+monitor_subsys_sent_update(
+ Operation *op,
+ SlapReply *rs,
+ Entry *e );
+
+enum {
+ MONITOR_SENT_BYTES = 0,
+ MONITOR_SENT_PDU,
+ MONITOR_SENT_ENTRIES,
+ MONITOR_SENT_REFERRALS,
+
+ MONITOR_SENT_LAST
+};
+
+struct monitor_sent_t {
+ struct berval rdn;
+ struct berval nrdn;
+} monitor_sent[] = {
+ { BER_BVC("cn=Bytes"), BER_BVNULL },
+ { BER_BVC("cn=PDU"), BER_BVNULL },
+ { BER_BVC("cn=Entries"), BER_BVNULL },
+ { BER_BVC("cn=Referrals"), BER_BVNULL },
+ { BER_BVNULL, BER_BVNULL }
+};
+
int
monitor_subsys_sent_init(
- BackendDB *be
-)
+ BackendDB *be,
+ monitor_subsys_t *ms )
{
- struct monitorinfo *mi;
+ monitor_info_t *mi;
- Entry *e, *e_tmp, *e_sent;
- struct monitorentrypriv *mp;
- char buf[1024];
- struct berval bv[2];
+ Entry **ep, *e_sent;
+ monitor_entry_t *mp;
+ int i;
assert( be != NULL );
- mi = ( struct monitorinfo * )be->be_private;
+ ms->mss_destroy = monitor_subsys_sent_destroy;
+ ms->mss_update = monitor_subsys_sent_update;
- if ( monitor_cache_get( mi,
- &monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn, &e_sent ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_sent_init: "
- "unable to get entry '%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
- return( -1 );
- }
+ mi = ( monitor_info_t * )be->be_private;
- e_tmp = NULL;
-
- /*
- * Entries
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=Entries,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: Entries\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
-
- e = str2entry( buf );
- if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to create entry 'cn=Entries,%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_sent_init: "
- "unable to create entry 'cn=Entries,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
- return( -1 );
- }
-
- bv[1].bv_val = NULL;
- bv[0].bv_val = "0";
- bv[0].bv_len = 1;
- attr_mergeit( e, monitor_ad_desc, bv );
-
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
- e->e_private = ( void * )mp;
- mp->mp_next = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_SENT];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_SENT].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
-
- if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to add entry 'cn=Entries,%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_sent_init: "
- "unable to add entry 'cn=Entries,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
- return( -1 );
- }
-
- e_tmp = e;
-
- /*
- * Referrals
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=Referrals,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: Referrals\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
-
- e = str2entry( buf );
- if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to create entry 'cn=Referrals,%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
+ if ( monitor_cache_get( mi, &ms->mss_ndn, &e_sent ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_sent_init: "
- "unable to create entry 'cn=Referrals,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
+ "unable to get entry \"%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
- bv[0].bv_val = "0";
- bv[0].bv_len = 1;
- attr_mergeit( e, monitor_ad_desc, bv );
-
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
- e->e_private = ( void * )mp;
- mp->mp_next = e_tmp;
+ mp = ( monitor_entry_t * )e_sent->e_private;
mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_SENT];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_SENT].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
+ ep = &mp->mp_children;
+
+ for ( i = 0; i < MONITOR_SENT_LAST; i++ ) {
+ struct berval nrdn, bv;
+ Entry *e;
+
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn,
+ &monitor_sent[i].rdn, mi->mi_oc_monitorCounterObject,
+ mi, NULL, NULL );
+
+ if ( e == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_sent_init: "
+ "unable to create entry \"%s,%s\"\n",
+ monitor_sent[ i ].rdn.bv_val,
+ ms->mss_ndn.bv_val, 0 );
+ return( -1 );
+ }
- if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to add entry 'cn=Referrals,%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_sent_init: "
- "unable to add entry 'cn=Referrals,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
- return( -1 );
- }
+ /* steal normalized RDN */
+ dnRdn( &e->e_nname, &nrdn );
+ ber_dupbv( &monitor_sent[ i ].nrdn, &nrdn );
- e_tmp = e;
-
- /*
- * PDU
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=PDU,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: PDU\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
-
- e = str2entry( buf );
- if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to create entry 'cn=PDU,%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_sent_init: "
- "unable to create entry 'cn=PDU,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
- return( -1 );
- }
-
- bv[0].bv_val = "0";
- bv[0].bv_len = 1;
- attr_mergeit( e, monitor_ad_desc, bv );
+ BER_BVSTR( &bv, "0" );
+ attr_merge_normalize_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
- e->e_private = ( void * )mp;
- mp->mp_next = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_SENT];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_SENT].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
-
- if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to add entry 'cn=PDU,%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_sent_init: "
- "unable to add entry 'cn=PDU,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
- return( -1 );
- }
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
+ e->e_private = ( void * )mp;
+ mp->mp_info = ms;
+ mp->mp_flags = ms->mss_flags \
+ | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
+
+ if ( monitor_cache_add( mi, e ) ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_sent_init: "
+ "unable to add entry \"%s,%s\"\n",
+ monitor_sent[ i ].rdn.bv_val,
+ ms->mss_ndn.bv_val, 0 );
+ return( -1 );
+ }
- e_tmp = e;
-
- /*
- * Bytes
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=Bytes,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: Bytes\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
-
- e = str2entry( buf );
- if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to create entry 'cn=Bytes,%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_sent_init: "
- "unable to create entry 'cn=Bytes,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
- return( -1 );
+ *ep = e;
+ ep = &mp->mp_next;
}
- bv[0].bv_val = "0";
- bv[0].bv_len = 1;
- attr_mergeit( e, monitor_ad_desc, bv );
-
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
- e->e_private = ( void * )mp;
- mp->mp_next = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_SENT];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_SENT].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
+ monitor_cache_release( mi, e_sent );
- if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, CRIT,
- "monitor_subsys_sent_init: "
- "unable to add entry 'cn=Bytes,%s'\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_sent_init: "
- "unable to add entry 'cn=Bytes,%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
- "", "" );
-#endif
- return( -1 );
- }
-
- e_tmp = e;
+ return( 0 );
+}
- mp = ( struct monitorentrypriv * )e_sent->e_private;
- mp->mp_children = e_tmp;
+static int
+monitor_subsys_sent_destroy(
+ BackendDB *be,
+ monitor_subsys_t *ms )
+{
+ int i;
- monitor_cache_release( mi, e_sent );
+ for ( i = 0; i < MONITOR_SENT_LAST; i++ ) {
+ if ( !BER_BVISNULL( &monitor_sent[ i ].nrdn ) ) {
+ ch_free( monitor_sent[ i ].nrdn.bv_val );
+ }
+ }
- return( 0 );
+ return 0;
}
-int
+static int
monitor_subsys_sent_update(
- struct monitorinfo *mi,
- Entry *e
-)
+ Operation *op,
+ SlapReply *rs,
+ Entry *e )
{
- long n = -1;
-
- assert( mi );
- assert( e );
+ monitor_info_t *mi = ( monitor_info_t *)op->o_bd->be_private;
- if ( strncasecmp( e->e_ndn, "cn=entries",
- sizeof("cn=entries")-1 ) == 0 ) {
- ldap_pvt_thread_mutex_lock(&num_sent_mutex);
- n = num_entries_sent;
- ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
-
- } else if ( strncasecmp( e->e_ndn, "cn=referrals",
- sizeof("cn=referrals")-1 ) == 0 ) {
- ldap_pvt_thread_mutex_lock(&num_sent_mutex);
- n = num_refs_sent;
- ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
-
- } else if ( strncasecmp( e->e_ndn, "cn=pdu",
- sizeof("cn=pdu")-1 ) == 0 ) {
- ldap_pvt_thread_mutex_lock(&num_sent_mutex);
- n = num_pdu_sent;
- ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
-
- } else if ( strncasecmp( e->e_ndn, "cn=bytes",
- sizeof("cn=bytes")-1 ) == 0 ) {
- ldap_pvt_thread_mutex_lock(&num_sent_mutex);
- n = num_bytes_sent;
- ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
- }
+ struct berval nrdn;
+ ldap_pvt_mp_t n;
+ Attribute *a;
+ int i;
- if ( n != -1 ) {
- Attribute *a;
- char buf[16];
+ assert( mi != NULL );
+ assert( e != NULL );
- a = attr_find( e->e_attrs, monitor_ad_desc );
- if ( a == NULL ) {
- return( -1 );
+ dnRdn( &e->e_nname, &nrdn );
+
+ for ( i = 0; i < MONITOR_SENT_LAST; i++ ) {
+ if ( dn_match( &nrdn, &monitor_sent[ i ].nrdn ) ) {
+ break;
}
+ }
- snprintf( buf, sizeof( buf ), "%ld", n );
- free( a->a_vals[ 0 ].bv_val );
- ber_str2bv( buf, 0, 1, a->a_vals );
+ if ( i == MONITOR_SENT_LAST ) {
+ return SLAP_CB_CONTINUE;
}
- return( 0 );
+ ldap_pvt_thread_mutex_lock(&slap_counters.sc_sent_mutex);
+ switch ( i ) {
+ case MONITOR_SENT_ENTRIES:
+ ldap_pvt_mp_init_set( n, slap_counters.sc_entries );
+ break;
+
+ case MONITOR_SENT_REFERRALS:
+ ldap_pvt_mp_init_set( n, slap_counters.sc_refs );
+ break;
+
+ case MONITOR_SENT_PDU:
+ ldap_pvt_mp_init_set( n, slap_counters.sc_pdu );
+ break;
+
+ case MONITOR_SENT_BYTES:
+ ldap_pvt_mp_init_set( n, slap_counters.sc_bytes );
+ break;
+
+ default:
+ assert(0);
+ }
+ ldap_pvt_thread_mutex_unlock(&slap_counters.sc_sent_mutex);
+
+ a = attr_find( e->e_attrs, mi->mi_ad_monitorCounter );
+ assert( a != NULL );
+
+ /* NOTE: no minus sign is allowed in the counters... */
+ UI2BV( &a->a_vals[ 0 ], n );
+ ldap_pvt_mp_clear( n );
+
+ /* FIXME: touch modifyTimestamp? */
+
+ return SLAP_CB_CONTINUE;
}