X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fsent.c;h=374349b6f1ff478c09b2452ae8dcc14bf112f5d0;hb=d9edc7d5afd2860fac2fa0121044db28d94c9f7f;hp=6c8615c2419385ed8e50be713e829c81270fb6b3;hpb=b3ec75d032bfe4df0fed061376e2dae294278c21;p=openldap diff --git a/servers/slapd/back-monitor/sent.c b/servers/slapd/back-monitor/sent.c index 6c8615c241..374349b6f1 100644 --- a/servers/slapd/back-monitor/sent.c +++ b/servers/slapd/back-monitor/sent.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2001-2004 The OpenLDAP Foundation. + * Copyright 2001-2011 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * All rights reserved. * @@ -27,6 +27,17 @@ #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, @@ -50,18 +61,20 @@ struct monitor_sent_t { int monitor_subsys_sent_init( BackendDB *be, - monitorsubsys *ms -) + monitor_subsys_t *ms ) { - struct monitorinfo *mi; + monitor_info_t *mi; - Entry **ep, *e_sent; - struct monitorentrypriv *mp; + 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; + + mi = ( monitor_info_t * )be->be_private; if ( monitor_cache_get( mi, &ms->mss_ndn, &e_sent ) ) { Debug( LDAP_DEBUG_ANY, @@ -71,55 +84,39 @@ monitor_subsys_sent_init( return( -1 ); } - mp = ( struct monitorentrypriv * )e_sent->e_private; + mp = ( monitor_entry_t * )e_sent->e_private; mp->mp_children = NULL; ep = &mp->mp_children; for ( i = 0; i < MONITOR_SENT_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_sent[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_sent[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_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, + monitor_sent[ i ].rdn.bv_val, ms->mss_ndn.bv_val, 0 ); return( -1 ); } /* steal normalized RDN */ dnRdn( &e->e_nname, &nrdn ); - ber_dupbv( &monitor_sent[i].nrdn, &nrdn ); + ber_dupbv( &monitor_sent[ i ].nrdn, &nrdn ); BER_BVSTR( &bv, "0" ); attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL ); - mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 ); + mp = monitor_entrypriv_create(); + if ( mp == NULL ) { + return -1; + } e->e_private = ( void * )mp; - mp->mp_next = NULL; - mp->mp_children = NULL; mp->mp_info = ms; mp->mp_flags = ms->mss_flags \ | MONITOR_F_SUB | MONITOR_F_PERSISTENT; @@ -128,7 +125,7 @@ monitor_subsys_sent_init( Debug( LDAP_DEBUG_ANY, "monitor_subsys_sent_init: " "unable to add entry \"%s,%s\"\n", - monitor_sent[i].rdn.bv_val, + monitor_sent[ i ].rdn.bv_val, ms->mss_ndn.bv_val, 0 ); return( -1 ); } @@ -142,65 +139,103 @@ monitor_subsys_sent_init( return( 0 ); } -int +static int +monitor_subsys_sent_destroy( + BackendDB *be, + monitor_subsys_t *ms ) +{ + int i; + + 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; +} + +static int monitor_subsys_sent_update( Operation *op, - Entry *e -) + SlapReply *rs, + Entry *e ) { - struct monitorinfo *mi = - (struct monitorinfo *)op->o_bd->be_private; + monitor_info_t *mi = ( monitor_info_t *)op->o_bd->be_private; struct berval nrdn; ldap_pvt_mp_t n; Attribute *a; + slap_counters_t *sc; int i; - assert( mi ); - assert( e ); + assert( mi != NULL ); + assert( e != NULL ); dnRdn( &e->e_nname, &nrdn ); for ( i = 0; i < MONITOR_SENT_LAST; i++ ) { - if ( dn_match( &nrdn, &monitor_sent[i].nrdn ) ) { + if ( dn_match( &nrdn, &monitor_sent[ i ].nrdn ) ) { break; } } if ( i == MONITOR_SENT_LAST ) { - return 0; + return SLAP_CB_CONTINUE; } - ldap_pvt_thread_mutex_lock(&slap_counters.sc_sent_mutex); + ldap_pvt_thread_mutex_lock(&slap_counters.sc_mutex); switch ( i ) { case MONITOR_SENT_ENTRIES: ldap_pvt_mp_init_set( n, slap_counters.sc_entries ); + for ( sc = slap_counters.sc_next; sc; sc = sc->sc_next ) { + ldap_pvt_thread_mutex_lock( &sc->sc_mutex ); + ldap_pvt_mp_add( n, sc->sc_entries ); + ldap_pvt_thread_mutex_unlock( &sc->sc_mutex ); + } break; case MONITOR_SENT_REFERRALS: ldap_pvt_mp_init_set( n, slap_counters.sc_refs ); + for ( sc = slap_counters.sc_next; sc; sc = sc->sc_next ) { + ldap_pvt_thread_mutex_lock( &sc->sc_mutex ); + ldap_pvt_mp_add( n, sc->sc_refs ); + ldap_pvt_thread_mutex_unlock( &sc->sc_mutex ); + } break; case MONITOR_SENT_PDU: ldap_pvt_mp_init_set( n, slap_counters.sc_pdu ); + for ( sc = slap_counters.sc_next; sc; sc = sc->sc_next ) { + ldap_pvt_thread_mutex_lock( &sc->sc_mutex ); + ldap_pvt_mp_add( n, sc->sc_pdu ); + ldap_pvt_thread_mutex_unlock( &sc->sc_mutex ); + } break; case MONITOR_SENT_BYTES: ldap_pvt_mp_init_set( n, slap_counters.sc_bytes ); + for ( sc = slap_counters.sc_next; sc; sc = sc->sc_next ) { + ldap_pvt_thread_mutex_lock( &sc->sc_mutex ); + ldap_pvt_mp_add( n, sc->sc_bytes ); + ldap_pvt_thread_mutex_unlock( &sc->sc_mutex ); + } break; default: assert(0); } - ldap_pvt_thread_mutex_unlock(&slap_counters.sc_sent_mutex); + ldap_pvt_thread_mutex_unlock(&slap_counters.sc_mutex); a = attr_find( e->e_attrs, mi->mi_ad_monitorCounter ); - assert( a ); + assert( a != NULL ); /* NOTE: no minus sign is allowed in the counters... */ UI2BV( &a->a_vals[ 0 ], n ); ldap_pvt_mp_clear( n ); - return 0; + /* FIXME: touch modifyTimestamp? */ + + return SLAP_CB_CONTINUE; }