X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Foperation.c;h=29959ac2e7a108ba2de5981bec1b28e29d3becee;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=b8a0ff4fb417004912dc69c27d1a94120de3c38f;hpb=b77298771238bff5e4758b4bf593cfb897266713;p=openldap
diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index b8a0ff4fb4..29959ac2e7 100644
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -1,47 +1,34 @@
/* operation.c - deal with operation subsystem */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2001-2003 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
+ * .
*/
-/*
- * Copyright 2001, Pierangelo Masarati, All rights reserved.
- *
- * 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
+#include
#include "slap.h"
#include "back-monitor.h"
#include "lber_pvt.h"
static struct berval
- bv_initiated = BER_BVC( "Initiated" ),
- bv_completed = BER_BVC( "Completed" ),
bv_op[] = {
BER_BVC( "Bind" ),
BER_BVC( "Unbind" ),
@@ -52,7 +39,8 @@ static struct berval
BER_BVC( "Compare" ),
BER_BVC( "Search" ),
BER_BVC( "Abandon" ),
- BER_BVC( "Extended" )
+ BER_BVC( "Extended" ),
+ { 0, NULL }
};
int
@@ -62,10 +50,9 @@ monitor_subsys_ops_init(
{
struct monitorinfo *mi;
- Entry *e, *e_tmp, *e_op, *e_children;
+ Entry *e, *e_tmp, *e_op;
struct monitorentrypriv *mp;
- char buf[1024];
- struct berval bv[2];
+ char buf[ BACKMONITOR_BUFSIZE ];
int i;
assert( be != NULL );
@@ -75,10 +62,10 @@ monitor_subsys_ops_init(
if ( monitor_cache_get( mi,
&monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn, &e_op ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_ops_init: "
"unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
+ monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_ops_init: "
@@ -91,246 +78,51 @@ monitor_subsys_ops_init(
e_tmp = NULL;
- /*
- * Initiated ops
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=%s,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: %s\n",
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val,
- bv_initiated.bv_val );
-
- e = str2entry( buf );
- if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_ops_init: "
- "unable to create entry 'cn=%s,%s'\n",
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_ops_init: "
- "unable to create entry 'cn=%s,%s'\n%s",
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
- "" );
-#endif
- return( -1 );
- }
-
- bv[1].bv_val = NULL;
- bv[0].bv_val = "0";
- bv[0].bv_len = 1;
- attr_merge( e, monitor_ad_desc, bv );
-
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
- e->e_private = ( void * )mp;
- mp->mp_next = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_OPS];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_OPS].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
-
- if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_ops_init: "
- "unable to add entry 'cn=%s,%s'\n",
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_ops_init: "
- "unable to add entry 'cn=%s,%s'\n%s",
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
- "" );
-#endif
- return( -1 );
- }
-
- e_tmp = e;
- e_children = NULL;
-
for ( i = SLAP_OP_LAST; i-- > 0; ) {
/*
* Initiated ops
*/
snprintf( buf, sizeof( buf ),
- "dn: cn=%s,cn=%s,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: %s\n",
+ "dn: cn=%s,%s\n"
+ "objectClass: %s\n"
+ "structuralObjectClass: %s\n"
+ "cn: %s\n"
+ "%s: 0\n"
+ "%s: 0\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
bv_op[ i ].bv_val,
- bv_initiated.bv_val,
monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val,
- bv_op[ i ].bv_val );
-
- e = str2entry( buf );
- if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_ops_init: "
- "unable to create entry 'cn=%s,cn=%s,%s'\n",
- bv_op[ i ].bv_val,
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_ops_init: "
- "unable to create entry 'cn=%s,cn=%s,%s'\n",
- bv_op[ i ].bv_val,
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val );
-#endif
- return( -1 );
- }
-
- bv[1].bv_val = NULL;
- bv[0].bv_val = "0";
- bv[0].bv_len = 1;
- attr_merge( e, monitor_ad_desc, bv );
-
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
- e->e_private = ( void * )mp;
- mp->mp_next = e_children;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_OPS];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_OPS].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
-
- if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_ops_init: "
- "unable to add entry 'cn=%s,cn=%s,%s'\n",
- bv_op[ i ].bv_val,
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_ops_init: "
- "unable to add entry 'cn=%s,cn=%s,%s'\n",
+ mi->mi_oc_monitorOperation->soc_cname.bv_val,
+ mi->mi_oc_monitorOperation->soc_cname.bv_val,
bv_op[ i ].bv_val,
- bv_initiated.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val );
-#endif
- return( -1 );
- }
-
- e_children = e;
- }
-
- mp = ( struct monitorentrypriv * )e_tmp->e_private;
- mp->mp_children = e_children;
-
- /*
- * Completed ops
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=%s,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: %s\n",
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val,
- bv_completed.bv_val );
-
- e = str2entry( buf );
- if ( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_ops_init: "
- "unable to create entry 'cn=%s,%s'\n",
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_ops_init: "
- "unable to create entry 'cn=%s,%s'\n%s",
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
- "" );
-#endif
- return( -1 );
- }
-
- bv[0].bv_val = "0";
- bv[0].bv_len = 1;
- attr_merge( e, monitor_ad_desc, bv );
-
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
- e->e_private = ( void * )mp;
- mp->mp_next = e_tmp;
- mp->mp_children = NULL;
- mp->mp_info = &monitor_subsys[SLAPD_MONITOR_OPS];
- mp->mp_flags = monitor_subsys[SLAPD_MONITOR_OPS].mss_flags \
- | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
-
- if ( monitor_cache_add( mi, e ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
- "monitor_subsys_ops_init: "
- "unable to add entry 'cn=%s,%s'\n",
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "monitor_subsys_ops_init: "
- "unable to add entry 'cn=%s,%s'\n%s",
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val,
- "" );
-#endif
- return( -1 );
- }
-
- e_tmp = e;
- e_children = NULL;
-
- for ( i = SLAP_OP_LAST; i-- > 0; ) {
+ mi->mi_ad_monitorOpInitiated->ad_cname.bv_val,
+ mi->mi_ad_monitorOpCompleted->ad_cname.bv_val,
+ mi->mi_startTime.bv_val,
+ mi->mi_startTime.bv_val );
- /*
- * Completed ops
- */
- snprintf( buf, sizeof( buf ),
- "dn: cn=%s,cn=%s,%s\n"
- SLAPD_MONITOR_OBJECTCLASSES
- "cn: %s\n",
- bv_op[ i ].bv_val,
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val,
- bv_op[ i ].bv_val );
-
e = str2entry( buf );
if ( e == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_ops_init: "
- "unable to create entry 'cn=%s,cn=%s,%s'\n",
+ "unable to create entry 'cn=%s,%s'\n",
bv_op[ i ].bv_val,
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
+ monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_ops_init: "
- "unable to create entry 'cn=%s,cn=%s,%s'\n",
+ "unable to create entry 'cn=%s,%s'\n",
bv_op[ i ].bv_val,
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val );
+ monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 );
#endif
return( -1 );
}
-
- bv[0].bv_val = "0";
- bv[0].bv_len = 1;
- attr_merge( e, monitor_ad_desc, bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
e->e_private = ( void * )mp;
- mp->mp_next = e_children;
+ mp->mp_next = e_tmp;
mp->mp_children = NULL;
mp->mp_info = &monitor_subsys[SLAPD_MONITOR_OPS];
mp->mp_flags = monitor_subsys[SLAPD_MONITOR_OPS].mss_flags \
@@ -338,29 +130,24 @@ monitor_subsys_ops_init(
if ( monitor_cache_add( mi, e ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_ops_init: "
- "unable to add entry 'cn=%s,cn=%s,%s'\n",
+ "unable to add entry 'cn=%s,%s'\n",
bv_op[ i ].bv_val,
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val ));
+ monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_ops_init: "
- "unable to add entry 'cn=%s,cn=%s,%s'\n",
+ "unable to add entry 'cn=%s,%s'\n",
bv_op[ i ].bv_val,
- bv_completed.bv_val,
- monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val );
+ monitor_subsys[SLAPD_MONITOR_OPS].mss_ndn.bv_val, 0 );
#endif
return( -1 );
}
- e_children = e;
+ e_tmp = e;
}
- mp = ( struct monitorentrypriv * )e_tmp->e_private;
- mp->mp_children = e_children;
-
mp = ( struct monitorentrypriv * )e_op->e_private;
mp->mp_children = e_tmp;
@@ -371,79 +158,47 @@ monitor_subsys_ops_init(
int
monitor_subsys_ops_update(
- struct monitorinfo *mi,
+ Operation *op,
Entry *e
)
{
- long n = -1;
- char *dn;
+ struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
+ long nInitiated = -1, nCompleted = -1;
+ char *rdnvalue;
+ int i;
+ Attribute *a;
+ char buf[] = "+9223372036854775807L";
assert( mi );
assert( e );
- dn = e->e_dn + 3;
-
- if ( strncmp( dn, bv_initiated.bv_val,
- bv_initiated.bv_len ) == 0 ) {
- ldap_pvt_thread_mutex_lock(&num_ops_mutex);
- n = num_ops_initiated;
- ldap_pvt_thread_mutex_unlock(&num_ops_mutex);
-
- } else if ( strncmp( dn, bv_completed.bv_val,
- bv_completed.bv_len ) == 0 ) {
- ldap_pvt_thread_mutex_lock(&num_ops_mutex);
- n = num_ops_completed;
- ldap_pvt_thread_mutex_unlock(&num_ops_mutex);
+ rdnvalue = e->e_dn + ( sizeof( "cn=" ) - 1 );
- } else {
- int i;
- ber_len_t len;
-
- for (i = 0; i < SLAP_OP_LAST; i++ ) {
- len = bv_op[ i ].bv_len;
-
- if ( strncmp( dn, bv_op[ i ].bv_val, len ) == 0 ) {
- break;
- }
- }
-
- if ( i == SLAP_OP_LAST ) {
- return( 0 );
- }
-
- dn += len + 3 + 1;
-
- if ( strncmp( dn, bv_initiated.bv_val,
- bv_initiated.bv_len ) == 0 ) {
- ldap_pvt_thread_mutex_lock(&num_ops_mutex);
- n = num_ops_initiated_[ i ];
- ldap_pvt_thread_mutex_unlock(&num_ops_mutex);
-
- } else if ( strncmp( dn, bv_completed.bv_val,
- bv_completed.bv_len ) == 0 ) {
- ldap_pvt_thread_mutex_lock(&num_ops_mutex);
- n = num_ops_completed_[ i ];
- ldap_pvt_thread_mutex_unlock(&num_ops_mutex);
-
- } else {
- assert( 0 );
+ for (i = 0; i < SLAP_OP_LAST; i++ ) {
+ if ( strncmp( rdnvalue, bv_op[ i ].bv_val,
+ bv_op[ i ].bv_len ) == 0 ) {
+ nInitiated = num_ops_initiated_[ i ];
+ nCompleted = num_ops_completed_[ i ];
+ break;
}
}
- if ( n != -1 ) {
- Attribute *a;
- char buf[16];
-
- a = attr_find( e->e_attrs, monitor_ad_desc );
- if ( a == NULL ) {
- return( -1 );
- }
-
- snprintf( buf, sizeof( buf ), "%ld", n );
- free( a->a_vals[ 0 ].bv_val );
- ber_str2bv( buf, 0, 1, a->a_vals );
+ if ( i == SLAP_OP_LAST ) {
+ return( 0 );
}
+ a = attr_find( e->e_attrs, mi->mi_ad_monitorOpInitiated );
+ assert ( a != NULL );
+ snprintf( buf, sizeof( buf ), "%ld", nInitiated );
+ free( a->a_vals[ 0 ].bv_val );
+ ber_str2bv( buf, 0, 1, &a->a_vals[ 0 ] );
+
+ a = attr_find( e->e_attrs, mi->mi_ad_monitorOpCompleted );
+ assert ( a != NULL );
+ snprintf( buf, sizeof( buf ), "%ld", nCompleted );
+ free( a->a_vals[ 0 ].bv_val );
+ ber_str2bv( buf, 0, 1, &a->a_vals[ 0 ] );
+
return( 0 );
}