X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Foperation.c;h=022623d04a72bade5e1104c735bc04c762037192;hb=d9edc7d5afd2860fac2fa0121044db28d94c9f7f;hp=f071bb0d6157b18d821caab0e064057caff3f346;hpb=5fe42e8853873682383ca2fd4a33c2644b8e6597;p=openldap diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c index f071bb0d61..022623d04a 100644 --- a/servers/slapd/back-monitor/operation.c +++ b/servers/slapd/back-monitor/operation.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2001-2005 The OpenLDAP Foundation. + * Copyright 2001-2011 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * All rights reserved. * @@ -34,33 +34,45 @@ struct monitor_ops_t { } monitor_op[] = { { BER_BVC( "cn=Bind" ), BER_BVNULL }, { BER_BVC( "cn=Unbind" ), BER_BVNULL }, + { BER_BVC( "cn=Search" ), BER_BVNULL }, + { BER_BVC( "cn=Compare" ), BER_BVNULL }, + { BER_BVC( "cn=Modify" ), BER_BVNULL }, + { BER_BVC( "cn=Modrdn" ), BER_BVNULL }, { BER_BVC( "cn=Add" ), BER_BVNULL }, { BER_BVC( "cn=Delete" ), BER_BVNULL }, - { BER_BVC( "cn=Modrdn" ), BER_BVNULL }, - { BER_BVC( "cn=Modify" ), BER_BVNULL }, - { BER_BVC( "cn=Compare" ), BER_BVNULL }, - { BER_BVC( "cn=Search" ), BER_BVNULL }, { BER_BVC( "cn=Abandon" ), BER_BVNULL }, { BER_BVC( "cn=Extended" ), BER_BVNULL }, { BER_BVNULL, BER_BVNULL } }; +static int +monitor_subsys_ops_destroy( + BackendDB *be, + monitor_subsys_t *ms ); + +static int +monitor_subsys_ops_update( + Operation *op, + SlapReply *rs, + Entry *e ); + int monitor_subsys_ops_init( BackendDB *be, - monitor_subsys_t *ms -) + monitor_subsys_t *ms ) { monitor_info_t *mi; Entry *e_op, **ep; monitor_entry_t *mp; - char buf[ BACKMONITOR_BUFSIZE ]; int i; struct berval bv_zero = BER_BVC( "0" ); assert( be != NULL ); + ms->mss_destroy = monitor_subsys_ops_destroy; + ms->mss_update = monitor_subsys_ops_update; + mi = ( monitor_info_t * )be->be_private; if ( monitor_cache_get( mi, @@ -74,8 +86,8 @@ monitor_subsys_ops_init( return( -1 ); } - attr_merge_one( e_op, mi->mi_ad_monitorOpInitiated, &bv_zero, &bv_zero ); - attr_merge_one( e_op, mi->mi_ad_monitorOpCompleted, &bv_zero, &bv_zero ); + attr_merge_one( e_op, mi->mi_ad_monitorOpInitiated, &bv_zero, NULL ); + attr_merge_one( e_op, mi->mi_ad_monitorOpCompleted, &bv_zero, NULL ); mp = ( monitor_entry_t * )e_op->e_private; mp->mp_children = NULL; @@ -84,34 +96,14 @@ monitor_subsys_ops_init( for ( i = 0; i < SLAP_OP_LAST; i++ ) { struct berval rdn; Entry *e; + struct berval bv; /* * Initiated ops */ - snprintf( buf, sizeof( buf ), - "dn: %s,%s\n" - "objectClass: %s\n" - "structuralObjectClass: %s\n" - "cn: %s\n" - "%s: 0\n" - "%s: 0\n" - "creatorsName: %s\n" - "modifiersName: %s\n" - "createTimestamp: %s\n" - "modifyTimestamp: %s\n", - monitor_op[ i ].rdn.bv_val, - ms->mss_dn.bv_val, - mi->mi_oc_monitorOperation->soc_cname.bv_val, - mi->mi_oc_monitorOperation->soc_cname.bv_val, - &monitor_op[ i ].rdn.bv_val[ STRLENOF( "cn=" ) ], - mi->mi_ad_monitorOpInitiated->ad_cname.bv_val, - mi->mi_ad_monitorOpCompleted->ad_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 ); + e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &monitor_op[i].rdn, + mi->mi_oc_monitorOperation, mi, NULL, NULL ); + if ( e == NULL ) { Debug( LDAP_DEBUG_ANY, "monitor_subsys_ops_init: " @@ -120,7 +112,11 @@ monitor_subsys_ops_init( ms->mss_ndn.bv_val, 0 ); return( -1 ); } - + + BER_BVSTR( &bv, "0" ); + attr_merge_one( e, mi->mi_ad_monitorOpInitiated, &bv, NULL ); + attr_merge_one( e, mi->mi_ad_monitorOpCompleted, &bv, NULL ); + /* steal normalized RDN */ dnRdn( &e->e_nname, &rdn ); ber_dupbv( &monitor_op[ i ].nrdn, &rdn ); @@ -152,23 +148,40 @@ monitor_subsys_ops_init( return( 0 ); } -int +static int +monitor_subsys_ops_destroy( + BackendDB *be, + monitor_subsys_t *ms ) +{ + int i; + + for ( i = 0; i < SLAP_OP_LAST; i++ ) { + if ( !BER_BVISNULL( &monitor_op[ i ].nrdn ) ) { + ch_free( monitor_op[ i ].nrdn.bv_val ); + } + } + + return 0; +} + +static int monitor_subsys_ops_update( Operation *op, - Entry *e -) + SlapReply *rs, + Entry *e ) { monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private; - ldap_pvt_mp_t nInitiated, - nCompleted; + ldap_pvt_mp_t nInitiated = LDAP_PVT_MP_INIT, + nCompleted = LDAP_PVT_MP_INIT; struct berval rdn; int i; Attribute *a; + slap_counters_t *sc; static struct berval bv_ops = BER_BVC( "cn=operations" ); - assert( mi ); - assert( e ); + assert( mi != NULL ); + assert( e != NULL ); dnRdn( &e->e_nname, &rdn ); @@ -176,21 +189,35 @@ monitor_subsys_ops_update( ldap_pvt_mp_init( nInitiated ); ldap_pvt_mp_init( nCompleted ); - ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); + ldap_pvt_thread_mutex_lock( &slap_counters.sc_mutex ); for ( i = 0; i < SLAP_OP_LAST; i++ ) { ldap_pvt_mp_add( nInitiated, slap_counters.sc_ops_initiated_[ i ] ); ldap_pvt_mp_add( nCompleted, slap_counters.sc_ops_completed_[ i ] ); } - ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); + for ( sc = slap_counters.sc_next; sc; sc = sc->sc_next ) { + ldap_pvt_thread_mutex_lock( &sc->sc_mutex ); + for ( i = 0; i < SLAP_OP_LAST; i++ ) { + ldap_pvt_mp_add( nInitiated, sc->sc_ops_initiated_[ i ] ); + ldap_pvt_mp_add( nCompleted, sc->sc_ops_completed_[ i ] ); + } + ldap_pvt_thread_mutex_unlock( &sc->sc_mutex ); + } + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_mutex ); } else { for ( i = 0; i < SLAP_OP_LAST; i++ ) { if ( dn_match( &rdn, &monitor_op[ i ].nrdn ) ) { - ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); + ldap_pvt_thread_mutex_lock( &slap_counters.sc_mutex ); ldap_pvt_mp_init_set( nInitiated, slap_counters.sc_ops_initiated_[ i ] ); ldap_pvt_mp_init_set( nCompleted, slap_counters.sc_ops_completed_[ i ] ); - ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); + for ( sc = slap_counters.sc_next; sc; sc = sc->sc_next ) { + ldap_pvt_thread_mutex_lock( &sc->sc_mutex ); + ldap_pvt_mp_add( nInitiated, sc->sc_ops_initiated_[ i ] ); + ldap_pvt_mp_add( nCompleted, sc->sc_ops_completed_[ i ] ); + ldap_pvt_thread_mutex_unlock( &sc->sc_mutex ); + } + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_mutex ); break; } } @@ -217,6 +244,6 @@ monitor_subsys_ops_update( /* FIXME: touch modifyTimestamp? */ - return( 0 ); + return SLAP_CB_CONTINUE; }