Fix LBER_ERROR vs. -1 confusion.

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

diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index 04b3fb6b6cd1cd74c0ca6b63760751af801513cc..85331e597d80d34e8ee6462588d34a770e542d52 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 
@@ -41,6 +38,50 @@
 #include "slap.h"
 #include "back-monitor.h"
 
+/*
+*  * initializes log subentry
+*   */
+int
+monitor_subsys_thread_init(
+       BackendDB       *be
+)
+{
+       struct monitorinfo      *mi;
+       Entry                   *e;
+       struct berval           bv[2];
+       static char             buf[1024];
+
+       mi = ( struct monitorinfo * )be->be_private;
+
+       if ( monitor_cache_get( mi, 
+               &monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn, &e ) )
+       {
+#ifdef NEW_LOGGING
+               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",
+                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 
+                       0, 0 );
+#endif
+               return( -1 );
+       }
+
+       /* 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 );
+
+       attr_merge( e, monitor_ad_desc, bv );
+
+       monitor_cache_release( mi, e );
+
+       return( 0 );
+}
 
 int 
 monitor_subsys_thread_update( 
@@ -49,30 +90,29 @@ monitor_subsys_thread_update(
 )
 {
        Attribute               *a;
-       struct berval           *bv[2], val, **b = NULL;
+       struct berval           bv[2], *b = NULL;
        char                    buf[1024];
 
-       bv[0] = &val;
-       bv[1] = NULL;
+       bv[1].bv_val = NULL;
 
-       snprintf( buf, sizeof( buf ), "threads=%d", 
+       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, "threads=", 
-                                       sizeof( "threads=" ) - 1 ) == 0 ) {
-                               free( b[0]->bv_val );
-                               b[0] = ber_bvstrdup( buf );
+               for ( b = a->a_vals; b[0].bv_val != NULL; b++ ) {
+                       if ( strncmp( b[0].bv_val, "backload=", 
+                                       sizeof( "backload=" ) - 1 ) == 0 ) {
+                               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 );
+       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 );
        }