/* cache.c - routines to maintain an in-core cache of entries */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- *
- * This work has beed deveolped for the OpenLDAP Foundation
- * in the hope that it may be useful to the Open Source community,
- * but WITHOUT ANY WARRANTY.
- *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- *
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- * of use of this software, no matter how awful, even if they arise from
- * flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users
- * ever read sources, credits should appear in the documentation.
- * SysNet s.n.c. cannot be responsible for the consequences of the
- * alterations.
- *
- * 4. This notice may not be removed or altered.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Pierangelo Masarati for inclusion
+ * in OpenLDAP Software.
*/
#include "portable.h"
#include <stdio.h>
+#include "ac/string.h"
#include "slap.h"
#include "back-monitor.h"
+/*
+ * The cache maps DNs to Entries.
+ * Each entry, on turn, holds the list of its children in the e_private field.
+ * This is used by search operation to perform onelevel and subtree candidate
+ * selection.
+ */
+typedef struct monitor_cache_t {
+ struct berval mc_ndn;
+ Entry *mc_e;
+} monitor_cache_t;
+
/*
* compares entries based on the dn
*/
int
monitor_cache_cmp(
- const void *c1,
- const void *c2
+ const void *c1,
+ const void *c2
)
{
- struct monitorcache *cc1 = ( struct monitorcache * )c1;
- struct monitorcache *cc2 = ( struct monitorcache * )c2;
+ monitor_cache_t *cc1 = ( monitor_cache_t * )c1;
+ monitor_cache_t *cc2 = ( monitor_cache_t * )c2;
/*
* case sensitive, because the dn MUST be normalized
*/
- return ber_bvcmp( cc1->mc_ndn, cc2->mc_ndn );
+ return ber_bvcmp( &cc1->mc_ndn, &cc2->mc_ndn );
}
/*
*/
int
monitor_cache_dup(
- void *c1,
- void *c2
+ void *c1,
+ void *c2
)
{
- struct monitorcache *cc1 = ( struct monitorcache * )c1;
- struct monitorcache *cc2 = ( struct monitorcache * )c2;
+ monitor_cache_t *cc1 = ( monitor_cache_t * )c1;
+ monitor_cache_t *cc2 = ( monitor_cache_t * )c2;
/*
* case sensitive, because the dn MUST be normalized
*/
- return ber_bvcmp( cc1->mc_ndn, cc2->mc_ndn ) == 0 ? -1 : 0;
+ return ber_bvcmp( &cc1->mc_ndn, &cc2->mc_ndn ) == 0 ? -1 : 0;
}
/*
*/
int
monitor_cache_add(
- struct monitorinfo *mi,
- Entry *e
+ monitor_info_t *mi,
+ Entry *e
)
{
- struct monitorcache *mc;
- struct monitorentrypriv *mp;
- int rc;
+ monitor_cache_t *mc;
+ monitor_entry_t *mp;
+ int rc;
assert( mi != NULL );
assert( e != NULL );
- mp = ( struct monitorentrypriv *)e->e_private;
+ mp = ( monitor_entry_t *)e->e_private;
ldap_pvt_thread_mutex_init( &mp->mp_mutex );
- mc = ( struct monitorcache * )ch_malloc( sizeof( struct monitorcache ) );
- mc->mc_ndn = &e->e_nname;
+ mc = ( monitor_cache_t * )ch_malloc( sizeof( monitor_cache_t ) );
+ mc->mc_ndn = e->e_nname;
mc->mc_e = e;
ldap_pvt_thread_mutex_lock( &mi->mi_cache_mutex );
rc = avl_insert( &mi->mi_cache, ( caddr_t )mc,
*/
int
monitor_cache_lock(
- Entry *e
+ Entry *e
)
{
- struct monitorentrypriv *mp;
+ monitor_entry_t *mp;
assert( e != NULL );
assert( e->e_private != NULL );
- mp = ( struct monitorentrypriv * )e->e_private;
+ mp = ( monitor_entry_t * )e->e_private;
ldap_pvt_thread_mutex_lock( &mp->mp_mutex );
return( 0 );
*/
int
monitor_cache_get(
- struct monitorinfo *mi,
- struct berval *ndn,
- Entry **ep
+ monitor_info_t *mi,
+ struct berval *ndn,
+ Entry **ep
)
{
- struct monitorcache tmp_mc, *mc;
+ monitor_cache_t tmp_mc, *mc;
assert( mi != NULL );
assert( ndn != NULL );
assert( ep != NULL );
- tmp_mc.mc_ndn = ndn;
+ tmp_mc.mc_ndn = *ndn;
ldap_pvt_thread_mutex_lock( &mi->mi_cache_mutex );
- mc = ( struct monitorcache * )avl_find( mi->mi_cache,
+ mc = ( monitor_cache_t * )avl_find( mi->mi_cache,
( caddr_t )&tmp_mc, monitor_cache_cmp );
if ( mc != NULL ) {
*/
int
monitor_cache_dn2entry(
- struct monitorinfo *mi,
+ Operation *op,
+ SlapReply *rs,
struct berval *ndn,
Entry **ep,
Entry **matched
)
{
- int rc;
-
- struct berval p_ndn = { 0L, NULL };
+ monitor_info_t *mi = (monitor_info_t *)op->o_bd->be_private;
+ int rc;
+ struct berval p_ndn = BER_BVNULL;
Entry *e_parent;
- struct monitorentrypriv *mp;
+ monitor_entry_t *mp;
assert( mi != NULL );
assert( ndn != NULL );
*matched = NULL;
+ if ( !dnIsSuffix( ndn, &op->o_bd->be_nsuffix[ 0 ] ) ) {
+ return( -1 );
+ }
+
rc = monitor_cache_get( mi, ndn, ep );
if ( !rc && *ep != NULL ) {
return( 0 );
}
/* try with parent/ancestors */
- if ( ndn->bv_len ) {
- dnParent( ndn, &p_ndn );
- }
+ if ( BER_BVISNULL( ndn ) ) {
+ BER_BVSTR( &p_ndn, "" );
- if ( p_ndn.bv_val == NULL ) {
- p_ndn.bv_val = "";
- p_ndn.bv_len = 0;
-
} else {
- p_ndn.bv_len = ndn->bv_len
- - ( ber_len_t ) ( p_ndn.bv_val - ndn->bv_val );
+ dnParent( ndn, &p_ndn );
}
- rc = monitor_cache_dn2entry( mi, &p_ndn, &e_parent, matched );
- if ( rc || e_parent == NULL) {
+ rc = monitor_cache_dn2entry( op, rs, &p_ndn, &e_parent, matched );
+ if ( rc || e_parent == NULL ) {
return( -1 );
}
- mp = ( struct monitorentrypriv * )e_parent->e_private;
+ mp = ( monitor_entry_t * )e_parent->e_private;
rc = -1;
if ( mp->mp_flags & MONITOR_F_VOLATILE_CH ) {
/* parent entry generates volatile children */
- rc = monitor_entry_create( mi, ndn, e_parent, ep );
+ rc = monitor_entry_create( op, rs, ndn, e_parent, ep );
}
if ( !rc ) {
*/
int
monitor_cache_release(
- struct monitorinfo *mi,
- Entry *e
+ monitor_info_t *mi,
+ Entry *e
)
{
- struct monitorentrypriv *mp;
+ monitor_entry_t *mp;
assert( mi != NULL );
assert( e != NULL );
assert( e->e_private != NULL );
- mp = ( struct monitorentrypriv * )e->e_private;
+ mp = ( monitor_entry_t * )e->e_private;
if ( mp->mp_flags & MONITOR_F_VOLATILE ) {
- struct monitorcache *mc, tmp_mc;
+ monitor_cache_t *mc, tmp_mc;
/* volatile entries do not return to cache */
ldap_pvt_thread_mutex_lock( &mi->mi_cache_mutex );
- tmp_mc.mc_ndn = &e->e_nname;
+ tmp_mc.mc_ndn = e->e_nname;
mc = avl_delete( &mi->mi_cache,
( caddr_t )&tmp_mc, monitor_cache_cmp );
ldap_pvt_thread_mutex_unlock( &mi->mi_cache_mutex );
ch_free( mc );
+ ldap_pvt_thread_mutex_unlock( &mp->mp_mutex );
ldap_pvt_thread_mutex_destroy( &mp->mp_mutex );
ch_free( mp );
e->e_private = NULL;
projects / openldap / blobdiff