/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2006 The OpenLDAP Foundation.
+ * Copyright 2000-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <sys/stat.h>
#include "lutil.h"
#include "back-bdb.h"
+
#include "../back-monitor/back-monitor.h"
+#include "config.h"
+
static ObjectClass *oc_olmBDBDatabase;
static AttributeDescription *ad_olmBDBEntryCache,
- *ad_olmBDBEntryInfo, *ad_olmBDBIDLCache,
+ *ad_olmBDBDNCache, *ad_olmBDBIDLCache,
*ad_olmDbDirectory;
+#ifdef BDB_MONITOR_IDX
+static int
+bdb_monitor_idx_entry_add(
+ struct bdb_info *bdb,
+ Entry *e );
+
+static AttributeDescription *ad_olmBDBNotIndexed;
+#endif /* BDB_MONITOR_IDX */
+
/*
* NOTE: there's some confusion in monitor OID arc;
* by now, let's consider:
};
static struct {
- char *name;
char *desc;
AttributeDescription **ad;
} s_at[] = {
- { "olmBDBEntryCache", "( olmBDBAttributes:1 "
+ { "( olmBDBAttributes:1 "
"NAME ( 'olmBDBEntryCache' ) "
"DESC 'Number of items in Entry Cache' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )",
+ "USAGE dSAOperation )",
&ad_olmBDBEntryCache },
- { "olmBDBEntryInfo", "( olmBDBAttributes:2 "
- "NAME ( 'olmBDBEntryInfo' ) "
- "DESC 'Number of items in EntryInfo Cache' "
+ { "( olmBDBAttributes:2 "
+ "NAME ( 'olmBDBDNCache' ) "
+ "DESC 'Number of items in DN Cache' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )",
- &ad_olmBDBEntryInfo },
+ "USAGE dSAOperation )",
+ &ad_olmBDBDNCache },
- { "olmBDBIDLCache", "( olmBDBAttributes:3 "
+ { "( olmBDBAttributes:3 "
"NAME ( 'olmBDBIDLCache' ) "
"DESC 'Number of items in IDL Cache' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )",
+ "USAGE dSAOperation )",
&ad_olmBDBIDLCache },
- { "olmDbDirectory", "( olmBDBAttributes:4 "
+ { "( olmBDBAttributes:4 "
"NAME ( 'olmDbDirectory' ) "
"DESC 'Path name of the directory "
"where the database environment resides' "
"SUP monitoredInfo "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )",
+ "USAGE dSAOperation )",
&ad_olmDbDirectory },
+#ifdef BDB_MONITOR_IDX
+ { "( olmBDBAttributes:5 "
+ "NAME ( 'olmBDBNotIndexed' ) "
+ "DESC 'Missing indexes resulting from candidate selection' "
+ "SUP monitoredInfo "
+ "NO-USER-MODIFICATION "
+ "USAGE dSAOperation )",
+ &ad_olmBDBNotIndexed },
+#endif /* BDB_MONITOR_IDX */
+
{ NULL }
};
static struct {
- char *name;
char *desc;
ObjectClass **oc;
} s_oc[] = {
/* augments an existing object, so it must be AUXILIARY
* FIXME: derive from some ABSTRACT "monitoredEntity"? */
- { "olmBDBDatabase", "( olmBDBObjectClasses:1 "
+ { "( olmBDBObjectClasses:1 "
"NAME ( 'olmBDBDatabase' ) "
"SUP top AUXILIARY "
"MAY ( "
"olmBDBEntryCache "
- "$ olmBDBEntryInfo "
+ "$ olmBDBDNCache "
"$ olmBDBIDLCache "
"$ olmDbDirectory "
+#ifdef BDB_MONITOR_IDX
+ "$ olmBDBNotIndexed "
+#endif /* BDB_MONITOR_IDX */
") )",
&oc_olmBDBDatabase },
a = attr_find( e->e_attrs, ad_olmBDBEntryCache );
assert( a != NULL );
bv.bv_val = buf;
- bv.bv_len = snprintf( buf, sizeof( buf ), "%d", bdb->bi_cache.c_cursize );
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%lu", bdb->bi_cache.c_cursize );
ber_bvreplace( &a->a_vals[ 0 ], &bv );
- a = attr_find( e->e_attrs, ad_olmBDBEntryInfo );
+ a = attr_find( e->e_attrs, ad_olmBDBDNCache );
assert( a != NULL );
- bv.bv_len = snprintf( buf, sizeof( buf ), "%d", bdb->bi_cache.c_eiused );
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%lu", bdb->bi_cache.c_eiused );
ber_bvreplace( &a->a_vals[ 0 ], &bv );
a = attr_find( e->e_attrs, ad_olmBDBIDLCache );
assert( a != NULL );
- bv.bv_len = snprintf( buf, sizeof( buf ), "%d", bdb->bi_idl_cache_size );
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%lu", bdb->bi_idl_cache_size );
ber_bvreplace( &a->a_vals[ 0 ], &bv );
+#ifdef BDB_MONITOR_IDX
+ bdb_monitor_idx_entry_add( bdb, e );
+#endif /* BDB_MONITOR_IDX */
+
return SLAP_CB_CONTINUE;
}
+#if 0 /* uncomment if required */
static int
bdb_monitor_modify(
Operation *op,
Entry *e,
void *priv )
{
- struct bdb_info *bdb = (struct bdb_info *) priv;
-
return SLAP_CB_CONTINUE;
}
+#endif
static int
bdb_monitor_free(
Entry *e,
- void *priv )
+ void **priv )
{
- struct bdb_info *bdb = (struct bdb_info *) priv;
-
struct berval values[ 2 ];
Modification mod = { 0 };
int i, rc;
+ /* NOTE: if slap_shutdown != 0, priv might have already been freed */
+ *priv = NULL;
+
/* Remove objectClass */
mod.sm_op = LDAP_MOD_DELETE;
mod.sm_desc = slap_schema.si_ad_objectClass;
mod.sm_values = values;
+ mod.sm_numvals = 1;
values[ 0 ] = oc_olmBDBDatabase->soc_cname;
BER_BVZERO( &values[ 1 ] );
/* don't care too much about return code... */
/* remove attrs */
- for ( i = 0; s_at[ i ].name != NULL; i++ ) {
+ mod.sm_values = NULL;
+ mod.sm_numvals = 0;
+ for ( i = 0; s_at[ i ].desc != NULL; i++ ) {
mod.sm_desc = *s_at[ i ].ad;
- mod.sm_values = NULL;
rc = modify_delete_values( e, &mod, 1, &text,
textbuf, sizeof( textbuf ) );
/* don't care too much about return code... */
return SLAP_CB_CONTINUE;
}
+#define bdb_monitor_initialize BDB_SYMBOL(monitor_initialize)
+
/*
* call from within bdb_initialize()
*/
-int
+static int
bdb_monitor_initialize( void )
{
int i, code;
- const char *err;
+ ConfigArgs c;
+ char *argv[ 3 ];
static int bdb_monitor_initialized = 0;
- /* register schema here; if compiled as dynamic object,
- * must be loaded __after__ back_monitor.la */
+ if ( backend_info( "monitor" ) == NULL ) {
+ return -1;
+ }
if ( bdb_monitor_initialized++ ) {
return 0;
}
+ /* register schema here */
+
+ argv[ 0 ] = "back-bdb/back-hdb monitor";
+ c.argv = argv;
+ c.argc = 3;
+ c.fname = argv[0];
+
for ( i = 0; s_oid[ i ].name; i++ ) {
- char *argv[ 3 ];
-
- argv[ 0 ] = "back-bdb/back-hdb monitor";
+ c.lineno = i;
argv[ 1 ] = s_oid[ i ].name;
argv[ 2 ] = s_oid[ i ].oid;
- if ( parse_oidm( argv[ 0 ], i, 3, argv, 0, NULL ) != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_monitor_initialize: unable to add "
+ if ( parse_oidm( &c, 0, NULL ) != 0 ) {
+ Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_monitor_initialize)
+ ": unable to add "
"objectIdentifier \"%s=%s\"\n",
s_oid[ i ].name, s_oid[ i ].oid, 0 );
return 1;
}
}
- for ( i = 0; s_at[ i ].name != NULL; i++ ) {
- LDAPAttributeType *at;
-
- at = ldap_str2attributetype( s_at[ i ].desc,
- &code, &err, LDAP_SCHEMA_ALLOW_ALL );
- if ( !at ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_monitor_initialize: "
- "AttributeType load failed: %s %s\n",
- ldap_scherr2str( code ), err, 0 );
- return LDAP_INVALID_SYNTAX;
- }
-
- code = at_add( at, 0, NULL, &err );
- if ( code != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_monitor_initialize: "
- "AttributeType load failed: %s %s\n",
- scherr2str( code ), err, 0 );
- code = LDAP_INVALID_SYNTAX;
- goto done_at;
- }
-
- code = slap_str2ad( s_at[ i ].name,
- s_at[ i ].ad, &err );
+ for ( i = 0; s_at[ i ].desc != NULL; i++ ) {
+ code = register_at( s_at[ i ].desc, s_at[ i ].ad, 1 );
if ( code != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_monitor_initialize: "
- "unable to find AttributeDescription "
- "\"%s\": %d (%s)\n",
- s_at[ i ].name, code, err );
- code = LDAP_UNDEFINED_TYPE;
- goto done_at;
- }
-
-done_at:;
- if ( code ) {
- ldap_attributetype_free( at );
- return code;
+ Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_monitor_initialize)
+ ": register_at failed\n",
+ 0, 0, 0 );
+ } else {
+ (*s_at[ i ].ad)->ad_type->sat_flags |= SLAP_AT_HIDE;
}
-
- ldap_memfree( at );
}
- for ( i = 0; s_oc[ i ].name != NULL; i++ ) {
- LDAPObjectClass *oc;
-
- oc = ldap_str2objectclass( s_oc[ i ].desc,
- &code, &err, LDAP_SCHEMA_ALLOW_ALL );
- if ( !oc ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_monitor_initialize: "
- "ObjectClass load failed: %s %s\n",
- ldap_scherr2str( code ), err, 0 );
- return LDAP_INVALID_SYNTAX;
- }
-
- code = oc_add( oc, 0, NULL, &err );
+ for ( i = 0; s_oc[ i ].desc != NULL; i++ ) {
+ code = register_oc( s_oc[ i ].desc, s_oc[ i ].oc, 1 );
if ( code != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY,
- "bdb_monitor_initialize: "
- "ObjectClass load failed: %s %s\n",
- scherr2str( code ), err, 0 );
- code = LDAP_INVALID_SYNTAX;
- goto done_oc;
- }
-
- *s_oc[ i ].oc = oc_find( s_oc[ i ].name );
- if ( *s_oc[ i ].oc == NULL ) {
- code = LDAP_UNDEFINED_TYPE;
- Debug( LDAP_DEBUG_ANY,
- "bdb_monitor_initialize: "
- "unable to find objectClass \"%s\"\n",
- s_oc[ i ].name, 0, 0 );
- goto done_oc;
- }
-
-done_oc:;
- if ( code != LDAP_SUCCESS ) {
- ldap_objectclass_free( oc );
- return code;
+ Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_monitor_initialize)
+ ": register_oc failed\n",
+ 0, 0, 0 );
+ } else {
+ (*s_oc[ i ].oc)->soc_flags |= SLAP_OC_HIDE;
}
-
- ldap_memfree( oc );
}
return 0;
* call from within bdb_db_init()
*/
int
-bdb_monitor_init( BackendDB *be )
+bdb_monitor_db_init( BackendDB *be )
{
- SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_MONITORING;
+ struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+
+ if ( bdb_monitor_initialize() == LDAP_SUCCESS ) {
+ /* monitoring in back-bdb is on by default */
+ SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_MONITORING;
+ }
+
+#ifdef BDB_MONITOR_IDX
+ bdb->bi_idx = NULL;
+ ldap_pvt_thread_mutex_init( &bdb->bi_idx_mutex );
+#endif /* BDB_MONITOR_IDX */
return 0;
}
* call from within bdb_db_open()
*/
int
-bdb_monitor_open( BackendDB *be )
+bdb_monitor_db_open( BackendDB *be )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
Attribute *a, *next;
- monitor_callback_t *cb;
- struct berval suffix, *filter, *base;
- char *ptr;
+ monitor_callback_t *cb = NULL;
int rc = 0;
+ BackendInfo *mi;
+ monitor_extra_t *mbe;
+ struct berval dummy = BER_BVC("");
if ( !SLAP_DBMONITORING( be ) ) {
return 0;
}
+ mi = backend_info( "monitor" );
+ if ( !mi || !mi->bi_extra ) {
+ SLAP_DBFLAGS( be ) ^= SLAP_DBFLAG_MONITORING;
+ return 0;
+ }
+ mbe = mi->bi_extra;
+
/* don't bother if monitor is not configured */
- if ( !monitor_back_is_configured() ) {
+ if ( !mbe->is_configured() ) {
static int warning = 0;
if ( warning++ == 0 ) {
- Debug( LDAP_DEBUG_ANY, "bdb_monitor_open: "
- "monitoring disabled; "
+ Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_monitor_db_open)
+ ": monitoring disabled; "
"configure monitor database to enable\n",
0, 0, 0 );
}
return 0;
}
- bdb->bi_monitor.bdm_scope = LDAP_SCOPE_SUBORDINATE;
- base = &bdb->bi_monitor.bdm_nbase;
- BER_BVSTR( base, "cn=databases,cn=monitor" );
- filter = &bdb->bi_monitor.bdm_filter;
- BER_BVZERO( filter );
-
- suffix.bv_len = ldap_bv2escaped_filter_value_len( &be->be_nsuffix[ 0 ] );
- if ( suffix.bv_len == be->be_nsuffix[ 0 ].bv_len ) {
- suffix = be->be_nsuffix[ 0 ];
-
- } else {
- ldap_bv2escaped_filter_value( &be->be_nsuffix[ 0 ], &suffix );
- }
-
- filter->bv_len = STRLENOF( "(&(monitoredInfo=" )
- + strlen( be->bd_info->bi_type )
- + STRLENOF( ")(namingContexts:distinguishedNameMatch:=" )
- + suffix.bv_len + STRLENOF( "))" );
- ptr = filter->bv_val = ch_malloc( filter->bv_len + 1 );
- ptr = lutil_strcopy( ptr, "(&(monitoredInfo=" );
- ptr = lutil_strcopy( ptr, be->bd_info->bi_type );
- ptr = lutil_strcopy( ptr, ")(namingContexts:distinguishedNameMatch:=" );
- ptr = lutil_strncopy( ptr, suffix.bv_val, suffix.bv_len );
- ptr = lutil_strcopy( ptr, "))" );
- ptr[ 0 ] = '\0';
- assert( filter->bv_len == ptr - filter->bv_val );
-
- if ( suffix.bv_val != be->be_nsuffix[ 0 ].bv_val ) {
- ch_free( suffix.bv_val );
- }
-
/* alloc as many as required (plus 1 for objectClass) */
a = attrs_alloc( 1 + 4 );
if ( a == NULL ) {
}
a->a_desc = slap_schema.si_ad_objectClass;
- value_add_one( &a->a_vals, &oc_olmBDBDatabase->soc_cname );
- a->a_nvals = a->a_vals;
+ attr_valadd( a, &oc_olmBDBDatabase->soc_cname, NULL, 1 );
next = a->a_next;
{
struct berval bv = BER_BVC( "0" );
next->a_desc = ad_olmBDBEntryCache;
- value_add_one( &next->a_vals, &bv );
- next->a_nvals = next->a_vals;
+ attr_valadd( next, &bv, NULL, 1 );
next = next->a_next;
- next->a_desc = ad_olmBDBEntryInfo;
- value_add_one( &next->a_vals, &bv );
- next->a_nvals = next->a_vals;
+ next->a_desc = ad_olmBDBDNCache;
+ attr_valadd( next, &bv, NULL, 1 );
next = next->a_next;
next->a_desc = ad_olmBDBIDLCache;
- value_add_one( &next->a_vals, &bv );
- next->a_nvals = next->a_vals;
+ attr_valadd( next, &bv, NULL, 1 );
next = next->a_next;
}
{
struct berval bv, nbv;
ber_len_t pathlen = 0, len = 0;
- char path[ PATH_MAX ] = { '\0' };
+ char path[ MAXPATHLEN ] = { '\0' };
char *fname = bdb->bi_dbenv_home,
*ptr;
next->a_desc = ad_olmDbDirectory;
next->a_vals = ch_calloc( sizeof( struct berval ), 2 );
next->a_vals[ 0 ] = bv;
+ next->a_numvals = 1;
if ( BER_BVISNULL( &nbv ) ) {
next->a_nvals = next->a_vals;
cb = ch_calloc( sizeof( monitor_callback_t ), 1 );
cb->mc_update = bdb_monitor_update;
+#if 0 /* uncomment if required */
cb->mc_modify = bdb_monitor_modify;
+#endif
cb->mc_free = bdb_monitor_free;
cb->mc_private = (void *)bdb;
- rc = monitor_back_register_entry_attrs( NULL, a, cb,
- base, LDAP_SCOPE_SUBORDINATE, filter );
+ /* make sure the database is registered; then add monitor attributes */
+ rc = mbe->register_database( be, &bdb->bi_monitor.bdm_ndn );
+ if ( rc == 0 ) {
+ rc = mbe->register_entry_attrs( &bdb->bi_monitor.bdm_ndn, a, cb,
+ &dummy, 0, &dummy );
+ }
cleanup:;
if ( rc != 0 ) {
attrs_free( a );
a = NULL;
}
-
- if ( !BER_BVISNULL( filter ) ) {
- ch_free( filter->bv_val );
- BER_BVZERO( filter );
- }
}
/* store for cleanup */
* call from within bdb_db_close()
*/
int
-bdb_monitor_close( BackendDB *be )
+bdb_monitor_db_close( BackendDB *be )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
- if ( !BER_BVISNULL( &bdb->bi_monitor.bdm_filter ) ) {
- monitor_back_unregister_entry_callback( NULL,
- (monitor_callback_t *)bdb->bi_monitor.bdm_cb,
- &bdb->bi_monitor.bdm_nbase,
- bdb->bi_monitor.bdm_scope,
- &bdb->bi_monitor.bdm_filter );
+ if ( !BER_BVISNULL( &bdb->bi_monitor.bdm_ndn ) ) {
+ BackendInfo *mi = backend_info( "monitor" );
+ monitor_extra_t *mbe;
- if ( !BER_BVISNULL( &bdb->bi_monitor.bdm_filter ) ) {
- ch_free( bdb->bi_monitor.bdm_filter.bv_val );
+ if ( mi && &mi->bi_extra ) {
+ mbe = mi->bi_extra;
+ mbe->unregister_entry_callback( &bdb->bi_monitor.bdm_ndn,
+ (monitor_callback_t *)bdb->bi_monitor.bdm_cb,
+ NULL, 0, NULL );
}
memset( &bdb->bi_monitor, 0, sizeof( bdb->bi_monitor ) );
* call from within bdb_db_destroy()
*/
int
-bdb_monitor_destroy( BackendDB *be )
+bdb_monitor_db_destroy( BackendDB *be )
+{
+#ifdef BDB_MONITOR_IDX
+ struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+
+ /* TODO: free tree */
+ ldap_pvt_thread_mutex_destroy( &bdb->bi_idx_mutex );
+ avl_free( bdb->bi_idx, ch_free );
+#endif /* BDB_MONITOR_IDX */
+
+ return 0;
+}
+
+#ifdef BDB_MONITOR_IDX
+
+#define BDB_MONITOR_IDX_TYPES (4)
+
+typedef struct monitor_idx_t monitor_idx_t;
+
+struct monitor_idx_t {
+ AttributeDescription *idx_ad;
+ unsigned long idx_count[BDB_MONITOR_IDX_TYPES];
+};
+
+static int
+bdb_monitor_bitmask2key( slap_mask_t bitmask )
+{
+ int key;
+
+ for ( key = 0; key < 8 * (int)sizeof(slap_mask_t) && !( bitmask & 0x1U );
+ key++ )
+ bitmask >>= 1;
+
+ return key;
+}
+
+static struct berval idxbv[] = {
+ BER_BVC( "present=" ),
+ BER_BVC( "equality=" ),
+ BER_BVC( "approx=" ),
+ BER_BVC( "substr=" ),
+ BER_BVNULL
+};
+
+static ber_len_t
+bdb_monitor_idx2len( monitor_idx_t *idx )
+{
+ int i;
+ ber_len_t len = 0;
+
+ for ( i = 0; i < BDB_MONITOR_IDX_TYPES; i++ ) {
+ if ( idx->idx_count[ i ] != 0 ) {
+ len += idxbv[i].bv_len;
+ }
+ }
+
+ return len;
+}
+
+static int
+monitor_idx_cmp( const void *p1, const void *p2 )
+{
+ const monitor_idx_t *idx1 = (const monitor_idx_t *)p1;
+ const monitor_idx_t *idx2 = (const monitor_idx_t *)p2;
+
+ return SLAP_PTRCMP( idx1->idx_ad, idx2->idx_ad );
+}
+
+static int
+monitor_idx_dup( void *p1, void *p2 )
+{
+ monitor_idx_t *idx1 = (monitor_idx_t *)p1;
+ monitor_idx_t *idx2 = (monitor_idx_t *)p2;
+
+ return SLAP_PTRCMP( idx1->idx_ad, idx2->idx_ad ) == 0 ? -1 : 0;
+}
+
+int
+bdb_monitor_idx_add(
+ struct bdb_info *bdb,
+ AttributeDescription *desc,
+ slap_mask_t type )
{
+ monitor_idx_t idx_dummy = { 0 },
+ *idx;
+ int rc = 0, key;
+
+ idx_dummy.idx_ad = desc;
+ key = bdb_monitor_bitmask2key( type ) - 1;
+ if ( key >= BDB_MONITOR_IDX_TYPES ) {
+ /* invalid index type */
+ return -1;
+ }
+
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idx_mutex );
+
+ idx = (monitor_idx_t *)avl_find( bdb->bi_idx,
+ (caddr_t)&idx_dummy, monitor_idx_cmp );
+ if ( idx == NULL ) {
+ idx = (monitor_idx_t *)ch_calloc( sizeof( monitor_idx_t ), 1 );
+ idx->idx_ad = desc;
+ idx->idx_count[ key ] = 1;
+
+ switch ( avl_insert( &bdb->bi_idx, (caddr_t)idx,
+ monitor_idx_cmp, monitor_idx_dup ) )
+ {
+ case 0:
+ break;
+
+ default:
+ ch_free( idx );
+ rc = -1;
+ }
+
+ } else {
+ idx->idx_count[ key ]++;
+ }
+
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idx_mutex );
+
+ return rc;
+}
+
+static int
+bdb_monitor_idx_apply( void *v_idx, void *v_valp )
+{
+ monitor_idx_t *idx = (monitor_idx_t *)v_idx;
+ BerVarray *valp = (BerVarray *)v_valp;
+
+ struct berval bv;
+ char *ptr;
+ char count_buf[ BDB_MONITOR_IDX_TYPES ][ SLAP_TEXT_BUFLEN ];
+ ber_len_t count_len[ BDB_MONITOR_IDX_TYPES ],
+ idx_len;
+ int i, num = 0;
+
+ idx_len = bdb_monitor_idx2len( idx );
+
+ bv.bv_len = 0;
+ for ( i = 0; i < BDB_MONITOR_IDX_TYPES; i++ ) {
+ if ( idx->idx_count[ i ] == 0 ) {
+ continue;
+ }
+
+ count_len[ i ] = snprintf( count_buf[ i ],
+ sizeof( count_buf[ i ] ), "%lu", idx->idx_count[ i ] );
+ bv.bv_len += count_len[ i ];
+ num++;
+ }
+
+ bv.bv_len += idx->idx_ad->ad_cname.bv_len
+ + num
+ + idx_len;
+ ptr = bv.bv_val = ch_malloc( bv.bv_len + 1 );
+ ptr = lutil_strcopy( ptr, idx->idx_ad->ad_cname.bv_val );
+ for ( i = 0; i < BDB_MONITOR_IDX_TYPES; i++ ) {
+ if ( idx->idx_count[ i ] == 0 ) {
+ continue;
+ }
+
+ ptr[ 0 ] = '#';
+ ++ptr;
+ ptr = lutil_strcopy( ptr, idxbv[ i ].bv_val );
+ ptr = lutil_strcopy( ptr, count_buf[ i ] );
+ }
+
+ ber_bvarray_add( valp, &bv );
+
+ return 0;
+}
+
+static int
+bdb_monitor_idx_entry_add(
+ struct bdb_info *bdb,
+ Entry *e )
+{
+ BerVarray vals = NULL;
+ Attribute *a;
+
+ a = attr_find( e->e_attrs, ad_olmBDBNotIndexed );
+
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idx_mutex );
+
+ avl_apply( bdb->bi_idx, bdb_monitor_idx_apply,
+ &vals, -1, AVL_INORDER );
+
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idx_mutex );
+
+ if ( vals != NULL ) {
+ if ( a != NULL ) {
+ assert( a->a_nvals == a->a_vals );
+
+ ber_bvarray_free( a->a_vals );
+
+ } else {
+ Attribute **ap;
+
+ for ( ap = &e->e_attrs; *ap != NULL; ap = &(*ap)->a_next )
+ ;
+ *ap = attr_alloc( ad_olmBDBNotIndexed );
+ a = *ap;
+ }
+ a->a_vals = vals;
+ a->a_nvals = a->a_vals;
+ }
+
return 0;
}
+#endif /* BDB_MONITOR_IDX */
projects / openldap / blobdiff