#include <ac/string.h>, to get strlen(), strncmp() and strncasecmp().

[openldap] / servers / slapd / back-monitor / thread.c

diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index 763e9fa161734eeccddd102682d348d02322d7f3..2796ebbf205a937eca33ca4fc5de446718cdc2f1 100644 (file)
--- a/servers/slapd/back-monitor/thread.c
+++ b/servers/slapd/back-monitor/thread.c
@@ -1,12 +1,9 @@
 /* thread.c - deal with thread subsystem */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
- * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- * 
  * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
  * 
  * This work has beed deveolped for the OpenLDAP Foundation 
@@ -37,6 +34,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/string.h>
 
 #include "slap.h"
 #include "back-monitor.h"
@@ -51,8 +49,8 @@ monitor_subsys_thread_init(
 {
        struct monitorinfo      *mi;
        Entry                   *e;
-       struct berval           bv[2];
-       static char             buf[1024];
+       static char             buf[ BACKMONITOR_BUFSIZE ];
+       struct berval           bv;
 
        mi = ( struct monitorinfo * )be->be_private;
 
@@ -60,9 +58,9 @@ monitor_subsys_thread_init(
                &monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn, &e ) )
        {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+               LDAP_LOG( OPERATION, CRIT,
                        "monitor_subsys_thread_init: unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val ));
+                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_thread_init: unable to get entry '%s'\n",
@@ -75,11 +73,10 @@ monitor_subsys_thread_init(
        /* initialize the thread number */
        snprintf( buf, sizeof( buf ), "max=%d", connection_pool_max );
 
-       bv[1].bv_val = NULL;
-       bv[0].bv_val = buf;
-       bv[0].bv_len = strlen( bv[0].bv_val );
+       bv.bv_val = buf;
+       bv.bv_len = strlen( bv.bv_val );
 
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_merge_normalize_one( e, mi->ad_monitoredInfo, &bv, NULL );
 
        monitor_cache_release( mi, e );
 
@@ -88,21 +85,22 @@ monitor_subsys_thread_init(
 
 int 
 monitor_subsys_thread_update( 
-       struct monitorinfo      *mi,
+       Operation               *op,
        Entry                   *e
 )
 {
+       struct monitorinfo *mi = (struct monitorinfo *)op->o_bd->be_private;
        Attribute               *a;
-       struct berval           bv[2], *b = NULL;
-       char                    buf[1024];
+       struct berval           *b = NULL;
+       char                    buf[ BACKMONITOR_BUFSIZE ];
 
-       bv[1].bv_val = NULL;
+       assert( mi != NULL );
 
        snprintf( buf, sizeof( buf ), "backload=%d", 
                        ldap_pvt_thread_pool_backload( &connection_pool ) );
 
-       if ( ( a = attr_find( e->e_attrs, monitor_ad_desc ) ) != NULL ) {
-
+       a = attr_find( e->e_attrs, mi->ad_monitoredInfo );
+       if ( a != NULL ) {
                for ( b = a->a_vals; b[0].bv_val != NULL; b++ ) {
                        if ( strncmp( b[0].bv_val, "backload=", 
                                        sizeof( "backload=" ) - 1 ) == 0 ) {
@@ -114,9 +112,12 @@ monitor_subsys_thread_update(
        }
 
        if ( b == NULL || b[0].bv_val == NULL ) {
-               bv[0].bv_val = buf;
-               bv[0].bv_len = strlen( buf );
-               attr_merge( e, monitor_ad_desc, bv );
+               struct berval   bv;
+
+               bv.bv_val = buf;
+               bv.bv_len = strlen( buf );
+               attr_merge_normalize_one( e, mi->ad_monitoredInfo,
+                               &bv, NULL );
        }
 
        return( 0 );