X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Foperation.c;h=c84088dcb8c155a8531d9462034e53eb92ba3105;hb=6193ee4003a1aeb8d70b59b90e1ee242100b190e;hp=4f27f339849800f3a7e3a7257b25e769e199c9be;hpb=fda3d6260e25f1d0b9c035b0d520b2c9d0f22e49;p=openldap diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c index 4f27f33984..c84088dcb8 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-2004 The OpenLDAP Foundation. + * Copyright 2001-2006 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * All rights reserved. * @@ -45,91 +45,89 @@ struct monitor_ops_t { { 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 -) + BackendDB *be, + monitor_subsys_t *ms ) { - struct monitorinfo *mi; + monitor_info_t *mi; - Entry *e_op, **ep; - struct monitorentrypriv *mp; - char buf[ BACKMONITOR_BUFSIZE ]; - int i; - struct berval bv_zero = BER_BVC("0"); + Entry *e_op, **ep; + monitor_entry_t *mp; + int i; + struct berval bv_zero = BER_BVC( "0" ); assert( be != NULL ); - mi = ( struct monitorinfo * )be->be_private; + 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, - &monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn, &e_op ) ) + &ms->mss_ndn, &e_op ) ) { Debug( LDAP_DEBUG_ANY, "monitor_subsys_ops_init: " "unable to get entry \"%s\"\n", - monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, + ms->mss_ndn.bv_val, 0, 0 ); return( -1 ); } - attr_merge_one( e_op, mi->mi_ad_monitorOpInitiated, &bv_zero, NULL ); - attr_merge_one( e_op, mi->mi_ad_monitorOpCompleted, &bv_zero, NULL ); + 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 ); - mp = ( struct monitorentrypriv * )e_op->e_private; + mp = ( monitor_entry_t * )e_op->e_private; mp->mp_children = NULL; ep = &mp->mp_children; 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, - monitor_subsys[SLAPD_MONITOR_OPS].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: " "unable to create entry \"%s,%s\"\n", monitor_op[ i ].rdn.bv_val, - monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 ); + 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 ); + ber_dupbv( &monitor_op[ i ].nrdn, &rdn ); - 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 = &monitor_subsys[SLAPD_MONITOR_OPS]; - mp->mp_flags = monitor_subsys[SLAPD_MONITOR_OPS].mss_flags \ + mp->mp_info = ms; + mp->mp_flags = ms->mss_flags \ | MONITOR_F_SUB | MONITOR_F_PERSISTENT; if ( monitor_cache_add( mi, e ) ) { @@ -137,7 +135,7 @@ monitor_subsys_ops_init( "monitor_subsys_ops_init: " "unable to add entry \"%s,%s\"\n", monitor_op[ i ].rdn.bv_val, - monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 ); + ms->mss_ndn.bv_val, 0 ); return( -1 ); } @@ -150,24 +148,39 @@ 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 ) { - struct monitorinfo *mi = - (struct monitorinfo *)op->o_bd->be_private; + 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; static struct berval bv_ops = BER_BVC( "cn=operations" ); - assert( mi ); - assert( e ); + assert( mi != NULL ); + assert( e != NULL ); dnRdn( &e->e_nname, &rdn ); @@ -175,21 +188,21 @@ monitor_subsys_ops_update( ldap_pvt_mp_init( nInitiated ); ldap_pvt_mp_init( nCompleted ); - ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(counters).sc_ops_mutex ); + ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); for ( i = 0; i < SLAP_OP_LAST; i++ ) { - ldap_pvt_mp_add( nInitiated, SLAPD_GLOBAL(counters).sc_ops_initiated_[ i ] ); - ldap_pvt_mp_add( nCompleted, SLAPD_GLOBAL(counters).sc_ops_completed_[ 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( &SLAPD_GLOBAL(counters).sc_ops_mutex ); + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); } else { for ( i = 0; i < SLAP_OP_LAST; i++ ) { if ( dn_match( &rdn, &monitor_op[ i ].nrdn ) ) { - ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(counters).sc_ops_mutex ); - ldap_pvt_mp_init_set( nInitiated, SLAPD_GLOBAL(counters).sc_ops_initiated_[ i ] ); - ldap_pvt_mp_init_set( nCompleted, SLAPD_GLOBAL(counters).sc_ops_completed_[ i ] ); - ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(counters).sc_ops_mutex ); + ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_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 ); break; } } @@ -214,6 +227,8 @@ monitor_subsys_ops_update( UI2BV( &a->a_vals[ 0 ], nCompleted ); ldap_pvt_mp_clear( nCompleted ); - return( 0 ); + /* FIXME: touch modifyTimestamp? */ + + return SLAP_CB_CONTINUE; }