X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fsent.c;h=374349b6f1ff478c09b2452ae8dcc14bf112f5d0;hb=d9edc7d5afd2860fac2fa0121044db28d94c9f7f;hp=e4cc18d559a64983a9416300c2eac7f7bd3cad64;hpb=9eca1bd75e58b72dfe0c29fad996efbef911b45e;p=openldap diff --git a/servers/slapd/back-monitor/sent.c b/servers/slapd/back-monitor/sent.c index e4cc18d559..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, @@ -49,199 +60,182 @@ struct monitor_sent_t { int monitor_subsys_sent_init( - BackendDB *be -) + BackendDB *be, + monitor_subsys_t *ms ) { - struct monitorinfo *mi; + monitor_info_t *mi; - Entry *e_tmp, *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; - if ( monitor_cache_get( mi, - &monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn, &e_sent ) ) { + mi = ( monitor_info_t * )be->be_private; + + if ( monitor_cache_get( mi, &ms->mss_ndn, &e_sent ) ) { 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, - "", "" ); + "unable to get entry \"%s\"\n", + ms->mss_ndn.bv_val, 0, 0 ); return( -1 ); } - e_tmp = NULL; + mp = ( monitor_entry_t * )e_sent->e_private; + mp->mp_children = NULL; + ep = &mp->mp_children; - for ( i = MONITOR_SENT_LAST; --i >= 0; ) { - char buf[ BACKMONITOR_BUFSIZE ]; - struct berval rdn, bv; + for ( i = 0; i < MONITOR_SENT_LAST; i++ ) { + 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, - monitor_subsys[SLAPD_MONITOR_SENT].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_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0 ); + monitor_sent[ i ].rdn.bv_val, + ms->mss_ndn.bv_val, 0 ); return( -1 ); } /* steal normalized RDN */ - dnRdn( &e->e_nname, &rdn ); - ber_dupbv( &monitor_sent[i].nrdn, &rdn ); + dnRdn( &e->e_nname, &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 = e_tmp; - mp->mp_children = NULL; - mp->mp_info = &monitor_subsys[SLAPD_MONITOR_SENT]; - mp->mp_flags = monitor_subsys[SLAPD_MONITOR_SENT].mss_flags \ + 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%s%s", - monitor_sent[i].rdn.bv_val, - monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0 ); + "unable to add entry \"%s,%s\"\n", + monitor_sent[ i ].rdn.bv_val, + ms->mss_ndn.bv_val, 0 ); return( -1 ); } - e_tmp = e; + *ep = e; + ep = &mp->mp_next; } - mp = ( struct monitorentrypriv * )e_sent->e_private; - mp->mp_children = e_tmp; - monitor_cache_release( mi, e_sent ); 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 rdn; -#ifdef HAVE_GMP - mpz_t n; -#else /* ! HAVE_GMP */ - unsigned long n; -#endif /* ! HAVE_GMP */ + struct berval nrdn; + ldap_pvt_mp_t n; Attribute *a; -#ifndef HAVE_GMP - char buf[] = "+9223372036854775807L"; -#endif /* ! HAVE_GMP */ + slap_counters_t *sc; int i; - assert( mi ); - assert( e ); + assert( mi != NULL ); + assert( e != NULL ); - dnRdn( &e->e_nname, &rdn ); + dnRdn( &e->e_nname, &nrdn ); for ( i = 0; i < MONITOR_SENT_LAST; i++ ) { - if ( dn_match( &rdn, &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: -#ifdef HAVE_GMP - mpz_init_set( n, slap_counters.sc_entries ); -#else /* ! HAVE_GMP */ - n = slap_counters.sc_entries; -#endif /* ! HAVE_GMP */ + 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: -#ifdef HAVE_GMP - mpz_init_set( n, slap_counters.sc_refs ); -#else /* ! HAVE_GMP */ - n = slap_counters.sc_refs; -#endif /* ! HAVE_GMP */ + 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: -#ifdef HAVE_GMP - mpz_init_set( n, slap_counters.sc_pdu ); -#else /* ! HAVE_GMP */ - n = slap_counters.sc_pdu; -#endif /* ! HAVE_GMP */ + 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: -#ifdef HAVE_GMP - mpz_init_set( n, slap_counters.sc_bytes ); -#else /* ! HAVE_GMP */ - n = slap_counters.sc_bytes; -#endif /* ! HAVE_GMP */ + 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 ); - if ( a == NULL ) { - return -1; - } + assert( a != NULL ); - free( a->a_vals[ 0 ].bv_val ); -#ifdef HAVE_GMP - /* NOTE: there should be no minus sign allowed in the counters... */ - a->a_vals[ 0 ].bv_len = mpz_sizeinbase( n, 10 ); - a->a_vals[ 0 ].bv_val = ber_memalloc( a->a_vals[ 0 ].bv_len + 1 ); - (void)mpz_get_str( a->a_vals[ 0 ].bv_val, 10, n ); - mpz_clear( n ); - /* NOTE: according to the documentation, the result - * of mpz_sizeinbase() can exceed the length of the - * string representation of the number by 1 - */ - if ( a->a_vals[ 0 ].bv_val[ a->a_vals[ 0 ].bv_len - 1 ] == '\0' ) { - a->a_vals[ 0 ].bv_len--; - } -#else /* ! HAVE_GMP */ - snprintf( buf, sizeof( buf ), "%lu", n ); - ber_str2bv( buf, 0, 1, &a->a_vals[ 0 ] ); -#endif /* ! HAVE_GMP */ + /* 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; }