/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2005 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
int
monitor_subsys_sent_init(
- BackendDB *be
+ BackendDB *be,
+ 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;
+ mi = ( monitor_info_t * )be->be_private;
- if ( monitor_cache_get( mi,
- &monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn, &e_sent ) ) {
+ if ( monitor_cache_get( mi, &ms->mss_ndn, &e_sent ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_sent_init: "
"unable to get entry \"%s\"\n",
- monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 0, 0 );
+ ms->mss_ndn.bv_val, 0, 0 );
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 rdn, bv;
+ struct berval nrdn, bv;
Entry *e;
snprintf( buf, sizeof( buf ),
"modifiersName: %s\n"
"createTimestamp: %s\n"
"modifyTimestamp: %s\n",
- monitor_sent[i].rdn.bv_val,
- monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val,
+ 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=" )],
+ &monitor_sent[ i ].rdn.bv_val[ STRLENOF( "cn=" ) ],
mi->mi_creatorsName.bv_val,
mi->mi_creatorsName.bv_val,
mi->mi_startTime.bv_val,
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 = NULL;
- 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",
- 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 );
}
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;
int i;
assert( mi );
assert( e );
- 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;
}
}
ldap_pvt_thread_mutex_lock(&slap_counters.sc_sent_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 );
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 );
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 );
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 );
break;
default:
/* NOTE: no minus sign is allowed in the counters... */
UI2BV( &a->a_vals[ 0 ], n );
-#ifdef HAVE_GMP
- mpz_clear( n );
-#endif /* HAVE_GMP */
+ ldap_pvt_mp_clear( n );
+
+ /* FIXME: touch modifyTimestamp? */
return 0;
}