/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2007 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
#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,
+
+ MONITOR_RWW_LAST
+};
+
+static struct monitor_rww_t {
+ struct berval rdn;
+ struct berval nrdn;
+} monitor_rww[] = {
+ { BER_BVC("cn=Read"), BER_BVNULL },
+ { BER_BVC("cn=Write"), BER_BVNULL },
+ { BER_BVNULL, BER_BVNULL }
+};
+
int
monitor_subsys_rww_init(
- BackendDB *be
-)
+ BackendDB *be,
+ monitor_subsys_t *ms )
{
- struct monitorinfo *mi;
+ monitor_info_t *mi;
- Entry *e, *e_tmp, *e_conn;
- struct monitorentrypriv *mp;
- char buf[ BACKMONITOR_BUFSIZE ];
- struct berval bv;
+ 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,
- &monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn, &e_conn ) ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_rww_init: "
- "unable to get entry '%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val,
- "", "" );
- return( -1 );
- }
+ mi = ( monitor_info_t * )be->be_private;
- e_tmp = NULL;
-
- /*
- * Total conns
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=Read,%s\n"
- "objectClass: %s\n"
- "structuralObjectClass: %s\n"
- "cn: Read\n"
- "creatorsName: %s\n"
- "modifiersName: %s\n"
- "createTimestamp: %s\n"
- "modifyTimestamp: %s\n",
- monitor_subsys[SLAPD_MONITOR_RWW].mss_dn.bv_val,
- mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
- mi->mi_oc_monitorCounterObject->soc_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 );
- if ( e == NULL ) {
+ if ( monitor_cache_get( mi, &ms->mss_ndn, &e_conn ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_rww_init: "
- "unable to create entry 'cn=Read,%s'\n",
- monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
+ "unable to get entry \"%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
return( -1 );
}
-
- bv.bv_val = "0";
- bv.bv_len = 1;
- attr_merge_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 = ( monitor_entry_t * )e_conn->e_private;
mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_RWW];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_RWW].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
+ ep = &mp->mp_children;
+
+ for ( i = 0; i < MONITOR_RWW_LAST; i++ ) {
+ struct berval nrdn, bv;
+ Entry *e;
+
+ 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: "
+ "unable to create entry \"cn=Read,%s\"\n",
+ ms->mss_ndn.bv_val, 0, 0 );
+ return( -1 );
+ }
- if ( monitor_cache_add( mi, e ) ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_rww_init: "
- "unable to add entry 'cn=Read,%s'\n",
- monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
- return( -1 );
- }
+ /* steal normalized RDN */
+ dnRdn( &e->e_nname, &nrdn );
+ ber_dupbv( &monitor_rww[ i ].nrdn, &nrdn );
- e_tmp = e;
-
- /*
- * Current conns
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=Write,%s\n"
- "objectClass: %s\n"
- "structuralObjectClass: %s\n"
- "cn: Write\n"
- "creatorsName: %s\n"
- "modifiersName: %s\n"
- "createTimestamp: %s\n"
- "modifyTimestamp: %s\n",
- monitor_subsys[SLAPD_MONITOR_RWW].mss_dn.bv_val,
- mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
- mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_startTime.bv_val,
- mi->mi_startTime.bv_val );
+ BER_BVSTR( &bv, "0" );
+ attr_merge_normalize_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
- e = str2entry( buf );
- if ( e == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_rww_init: "
- "unable to create entry 'cn=Write,%s'\n",
- monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
- return( -1 );
- }
-
- bv.bv_val = "0";
- bv.bv_len = 1;
- attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
+ 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_rww_init: "
+ "unable to add entry \"%s,%s\"\n",
+ monitor_rww[ i ].rdn.bv_val,
+ ms->mss_ndn.bv_val, 0 );
+ return( -1 );
+ }
- 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_RWW];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_RWW].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
-
- if ( monitor_cache_add( mi, e ) ) {
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_rww_init: "
- "unable to add entry 'cn=Write,%s'\n",
- monitor_subsys[SLAPD_MONITOR_RWW].mss_ndn.bv_val, 0, 0 );
- return( -1 );
+ *ep = e;
+ ep = &mp->mp_next;
}
-
- e_tmp = e;
-
- mp = ( struct monitorentrypriv * )e_conn->e_private;
- mp->mp_children = e_tmp;
monitor_cache_release( mi, e_conn );
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;
-
-#define RWW_NONE 0
-#define RWW_READ 1
-#define RWW_WRITE 2
- int type = RWW_NONE;
-
- Attribute *a;
- char buf[] = "+9223372036854775807L";
- long num = 0;
+ 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;
+
+ Attribute *a;
+ char buf[] = "+9223372036854775807L";
+ long num = 0;
+ ber_len_t len;
assert( mi != NULL );
assert( e != NULL );
-
- if ( strncasecmp( e->e_ndn, "cn=read",
- sizeof("cn=read")-1 ) == 0 ) {
- type = RWW_READ;
- } else if ( strncasecmp( e->e_ndn, "cn=write",
- sizeof("cn=write")-1 ) == 0 ) {
- type = RWW_WRITE;
+ dnRdn( &e->e_nname, &nrdn );
- } else {
- return( 0 );
+ for ( i = 0; !BER_BVISNULL( &monitor_rww[ i ].nrdn ); i++ ) {
+ if ( dn_match( &nrdn, &monitor_rww[ i ].nrdn ) ) {
+ break;
+ }
+ }
+
+ if ( i == MONITOR_RWW_LAST ) {
+ return SLAP_CB_CONTINUE;
}
nconns = nwritewaiters = nreadwaiters = 0;
for ( c = connection_first( &connindex );
c != NULL;
- c = connection_next( c, &connindex ), nconns++ ) {
+ c = connection_next( c, &connindex ), nconns++ )
+ {
if ( c->c_writewaiter ) {
nwritewaiters++;
}
+
+ /* FIXME: ?!? */
if ( c->c_currentber != NULL ) {
nreadwaiters++;
}
}
connection_done(c);
- switch ( type ) {
- case RWW_READ:
+ switch ( i ) {
+ case MONITOR_RWW_READ:
num = nreadwaiters;
break;
- case RWW_WRITE:
+ case MONITOR_RWW_WRITE:
num = nwritewaiters;
break;
snprintf( buf, sizeof( buf ), "%ld", num );
a = attr_find( e->e_attrs, mi->mi_ad_monitorCounter );
- assert( a );
- free( a->a_vals[0].bv_val );
- ber_str2bv( buf, 0, 1, &a->a_vals[ 0 ] );
+ 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 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;
}
projects / openldap / blobdiff