#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 b1e05f29d6de1dce20d2c9ae0f72bb8bf37b94d0..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,26 +49,23 @@ monitor_subsys_thread_init(
 {
        struct monitorinfo      *mi;
        Entry                   *e;
-       struct monitorentrypriv *mp;
-       struct berval           val, *bv[2] = { &val, NULL };
-       static char             buf[1024];
+       static char             buf[ BACKMONITOR_BUFSIZE ];
+       struct berval           bv;
 
        mi = ( struct monitorinfo * )be->be_private;
 
        if ( monitor_cache_get( mi, 
-                               monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn,
-                               &e ) ) {
+               &monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn, &e ) )
+       {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-                                       "monitor_subsys_thread_init: "
-                                       "unable to get entry '%s'\n",
-                                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn ));
+               LDAP_LOG( OPERATION, CRIT,
+                       "monitor_subsys_thread_init: unable to get entry '%s'\n",
+                       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%s%s",
-                               monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn,
-                               "", "" );
+                       "monitor_subsys_thread_init: unable to get entry '%s'\n",
+                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 
+                       0, 0 );
 #endif
                return( -1 );
        }
@@ -78,10 +73,10 @@ monitor_subsys_thread_init(
        /* initialize the thread number */
        snprintf( buf, sizeof( buf ), "max=%d", connection_pool_max );
 
-       val.bv_val = buf;
-       val.bv_len = strlen( val.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 );
 
@@ -90,36 +85,39 @@ 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], val, **b = NULL;
-       char                    buf[1024];
+       struct berval           *b = NULL;
+       char                    buf[ BACKMONITOR_BUFSIZE ];
 
-       bv[0] = &val;
-       bv[1] = 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 ) {
-
-               for ( b = a->a_vals; b[0] != NULL; b++ ) {
-                       if ( strncmp( b[0]->bv_val, "backload=", 
+       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 ) {
-                               ber_bvfree( b[0] );
-                               b[0] = ber_bvstrdup( buf );
+                               free( b[0].bv_val );
+                               ber_str2bv( buf, 0, 1, &b[0] );
                                break;
                        }
                }
        }
 
-       if ( b == NULL || b[0] == NULL ) {
-               val.bv_val = buf;
-               val.bv_len = strlen( buf );
-               attr_merge( e, monitor_ad_desc, bv );
+       if ( b == NULL || b[0].bv_val == NULL ) {
+               struct berval   bv;
+
+               bv.bv_val = buf;
+               bv.bv_len = strlen( buf );
+               attr_merge_normalize_one( e, mi->ad_monitoredInfo,
+                               &bv, NULL );
        }
 
        return( 0 );