honor disclose

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

diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index e9185b5a69c60cad4d2db2fd979ea346e4d0fb26..83ba5ce522c99f8ee54c50ed3c7ebad6f29e6709 100644 (file)
--- a/servers/slapd/back-monitor/thread.c
+++ b/servers/slapd/back-monitor/thread.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2005 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -32,27 +32,26 @@
 *   */
 int
 monitor_subsys_thread_init(
-       BackendDB       *be
+       BackendDB               *be,
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
-       struct monitorentrypriv *mp;
-       Entry                   *e, **ep, *e_thread;
-       static char             buf[ BACKMONITOR_BUFSIZE ];
+       monitor_info_t  *mi;
+       monitor_entry_t *mp;
+       Entry           *e, **ep, *e_thread;
+       static char     buf[ BACKMONITOR_BUFSIZE ];
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
-       if ( monitor_cache_get( mi, 
-               &monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn, &e_thread ) )
-       {
+       if ( monitor_cache_get( mi, &ms->mss_ndn, &e_thread ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_thread_init: unable to get entry \"%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 
+                       ms->mss_ndn.bv_val, 
                        0, 0 );
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_thread->e_private;
+       mp = ( monitor_entry_t * )e_thread->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
@@ -69,11 +68,11 @@ monitor_subsys_thread_init(
                        "modifiersName: %s\n"
                        "createTimestamp: %s\n"
                        "modifyTimestamp: %s\n", 
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_dn.bv_val,
+                       ms->mss_dn.bv_val,
                        mi->mi_oc_monitoredObject->soc_cname.bv_val,
                        mi->mi_oc_monitoredObject->soc_cname.bv_val,
                        mi->mi_ad_monitoredInfo->ad_cname.bv_val,
-                       SLAPD_GLOBAL(connection_pool_max),
+                       connection_pool_max,
                        mi->mi_creatorsName.bv_val,
                        mi->mi_creatorsName.bv_val,
                        mi->mi_startTime.bv_val,
@@ -84,23 +83,24 @@ monitor_subsys_thread_init(
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_thread_init: "
                        "unable to create entry \"cn=Max,%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
        
-       mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+       mp = monitor_entrypriv_create();
+       if ( mp == NULL ) {
+               return -1;
+       }
        e->e_private = ( void * )mp;
-       mp->mp_next = NULL;
-       mp->mp_children = NULL;
-       mp->mp_info = &monitor_subsys[SLAPD_MONITOR_THREAD];
-       mp->mp_flags = monitor_subsys[SLAPD_MONITOR_THREAD].mss_flags \
+       mp->mp_info = ms;
+       mp->mp_flags = ms->mss_flags \
                | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
 
        if ( monitor_cache_add( mi, e ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_thread_init: "
                        "unable to add entry \"cn=Max,%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
        
@@ -120,7 +120,7 @@ monitor_subsys_thread_init(
                        "modifiersName: %s\n"
                        "createTimestamp: %s\n"
                        "modifyTimestamp: %s\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_dn.bv_val,
+                       ms->mss_dn.bv_val,
                        mi->mi_oc_monitoredObject->soc_cname.bv_val,
                        mi->mi_oc_monitoredObject->soc_cname.bv_val,
                        mi->mi_ad_monitoredInfo->ad_cname.bv_val,
@@ -134,23 +134,24 @@ monitor_subsys_thread_init(
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_thread_init: "
                        "unable to create entry \"cn=Backload,%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+       mp = monitor_entrypriv_create();
+       if ( mp == NULL ) {
+               return -1;
+       }
        e->e_private = ( void * )mp;
-       mp->mp_next = NULL;
-       mp->mp_children = NULL;
-       mp->mp_info = &monitor_subsys[SLAPD_MONITOR_THREAD];
-       mp->mp_flags = monitor_subsys[SLAPD_MONITOR_THREAD].mss_flags \
+       mp->mp_info = ms;
+       mp->mp_flags = ms->mss_flags \
                | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
 
        if ( monitor_cache_add( mi, e ) ) {
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_thread_init: "
                        "unable to add entry \"cn=Backload,%s\"\n",
-                       monitor_subsys[SLAPD_MONITOR_THREAD].mss_ndn.bv_val, 0, 0 );
+                       ms->mss_ndn.bv_val, 0, 0 );
                return( -1 );
        }
        
@@ -168,8 +169,7 @@ monitor_subsys_thread_update(
        Entry                   *e
 )
 {
-       struct monitorinfo      *mi =
-               (struct monitorinfo *)op->o_bd->be_private;
+       monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
        Attribute               *a;
        char                    buf[ BACKMONITOR_BUFSIZE ];
        static struct berval    backload_bv = BER_BVC( "cn=backload" );
@@ -189,7 +189,7 @@ monitor_subsys_thread_update(
        }
 
        snprintf( buf, sizeof( buf ), "%d", 
-                       ldap_pvt_thread_pool_backload( &SLAPD_GLOBAL(connection_pool) ) );
+                       ldap_pvt_thread_pool_backload( &connection_pool ) );
        len = strlen( buf );
        if ( len > a->a_vals[ 0 ].bv_len ) {
                a->a_vals[ 0 ].bv_val = ber_memrealloc( a->a_vals[ 0 ].bv_val, len + 1 );
@@ -197,6 +197,8 @@ monitor_subsys_thread_update(
        a->a_vals[ 0 ].bv_len = len;
        AC_MEMCPY( a->a_vals[ 0 ].bv_val, buf, len + 1 );
 
+       /* FIXME: touch modifyTimestamp? */
+
        return( 0 );
 }