/* operation.c - deal with operation subsystem */
-/*
- * Copyright 1998-2003 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"
BER_BVC( "Compare" ),
BER_BVC( "Search" ),
BER_BVC( "Abandon" ),
- BER_BVC( "Extended" )
+ BER_BVC( "Extended" ),
+ BER_BVNULL
};
int
struct monitorentrypriv *mp;
char buf[ BACKMONITOR_BUFSIZE ];
int i;
+ struct berval bv_zero = BER_BVC("0");
assert( be != NULL );
return( -1 );
}
+ 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 );
+
e_tmp = NULL;
for ( i = SLAP_OP_LAST; i-- > 0; ) {
"structuralObjectClass: %s\n"
"cn: %s\n"
"%s: 0\n"
- "%s: 0\n",
+ "%s: 0\n"
+ "createTimestamp: %s\n"
+ "modifyTimestamp: %s\n",
bv_op[ i ].bv_val,
monitor_subsys[SLAPD_MONITOR_OPS].mss_dn.bv_val,
- mi->oc_monitorOperation->soc_cname.bv_val,
- mi->oc_monitorOperation->soc_cname.bv_val,
+ mi->mi_oc_monitorOperation->soc_cname.bv_val,
+ mi->mi_oc_monitorOperation->soc_cname.bv_val,
bv_op[ i ].bv_val,
- mi->ad_monitorOpInitiated->ad_cname.bv_val,
- mi->ad_monitorOpCompleted->ad_cname.bv_val );
+ 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 );
e = str2entry( buf );
if ( e == NULL ) {
)
{
struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
- long nInitiated = -1, nCompleted = -1;
+ long nInitiated = 0, nCompleted = 0;
char *rdnvalue;
int i;
- ber_len_t len;
Attribute *a;
char buf[] = "+9223372036854775807L";
rdnvalue = e->e_dn + ( sizeof( "cn=" ) - 1 );
- for (i = 0; i < SLAP_OP_LAST; i++ ) {
- len = bv_op[ i ].bv_len;
-
- if ( strncmp( rdnvalue, bv_op[ i ].bv_val, len ) == 0 ) {
- nInitiated = num_ops_initiated_[ i ];
- nCompleted = num_ops_completed_[ i ];
- break;
+ if ( strncmp( rdnvalue, SLAPD_MONITOR_OPS_NAME,
+ sizeof( SLAPD_MONITOR_OPS_NAME ) - 1 ) == 0 )
+ {
+ for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+ nInitiated += num_ops_initiated_[ i ];
+ nCompleted += num_ops_completed_[ i ];
+ }
+
+ } else {
+ 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 ( i == SLAP_OP_LAST ) {
- return( 0 );
+ if ( i == SLAP_OP_LAST ) {
+ /* not found ... */
+ return( 0 );
+ }
}
- a = attr_find( e->e_attrs, mi->ad_monitorOpInitiated );
+ 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->ad_monitorOpCompleted );
+ 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 );
projects / openldap / blobdiff